From a57c78146e1dc3a412c09880d19d1a825e7beeca Mon Sep 17 00:00:00 2001 From: Yannik <80621863+vaporvee@users.noreply.github.com> Date: Tue, 29 Aug 2023 12:45:08 +0200 Subject: [PATCH] fixed plugin not enabling #36 --- .github/ISSUE_TEMPLATE/BUG.yml | 1 + .../{nodes/assets => }/Debug.svg | 0 .../{nodes/assets => }/Debug.svg.import | 6 +-- project/addons/discord-sdk-gd/plugin.cfg | 2 +- project/addons/discord-sdk-gd/plugin.gd | 2 +- project/export_presets.cfg | 42 ++++++++++++++++++- 6 files changed, 47 insertions(+), 6 deletions(-) rename project/addons/discord-sdk-gd/{nodes/assets => }/Debug.svg (100%) rename project/addons/discord-sdk-gd/{nodes/assets => }/Debug.svg.import (74%) diff --git a/.github/ISSUE_TEMPLATE/BUG.yml b/.github/ISSUE_TEMPLATE/BUG.yml index 455d6e8..2ba0d7d 100644 --- a/.github/ISSUE_TEMPLATE/BUG.yml +++ b/.github/ISSUE_TEMPLATE/BUG.yml @@ -23,6 +23,7 @@ body: label: Version description: What version of the Discord Game SDK Godot plugin are you running? options: + - 3.2 - 3.1 - 3.0 - 2.4 diff --git a/project/addons/discord-sdk-gd/nodes/assets/Debug.svg b/project/addons/discord-sdk-gd/Debug.svg similarity index 100% rename from project/addons/discord-sdk-gd/nodes/assets/Debug.svg rename to project/addons/discord-sdk-gd/Debug.svg diff --git a/project/addons/discord-sdk-gd/nodes/assets/Debug.svg.import b/project/addons/discord-sdk-gd/Debug.svg.import similarity index 74% rename from project/addons/discord-sdk-gd/nodes/assets/Debug.svg.import rename to project/addons/discord-sdk-gd/Debug.svg.import index 8326210..708694a 100644 --- a/project/addons/discord-sdk-gd/nodes/assets/Debug.svg.import +++ b/project/addons/discord-sdk-gd/Debug.svg.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://ufh1hha1ehui" -path="res://.godot/imported/Debug.svg-c87ff9d4b4b0e718ec457560f6c420dc.ctex" +path="res://.godot/imported/Debug.svg-97b25f5d09dbf04212867cd1a46cf368.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://addons/discord-sdk-gd/nodes/assets/Debug.svg" -dest_files=["res://.godot/imported/Debug.svg-c87ff9d4b4b0e718ec457560f6c420dc.ctex"] +source_file="res://addons/discord-sdk-gd/Debug.svg" +dest_files=["res://.godot/imported/Debug.svg-97b25f5d09dbf04212867cd1a46cf368.ctex"] [params] diff --git a/project/addons/discord-sdk-gd/plugin.cfg b/project/addons/discord-sdk-gd/plugin.cfg index 174bf53..db87b1e 100644 --- a/project/addons/discord-sdk-gd/plugin.cfg +++ b/project/addons/discord-sdk-gd/plugin.cfg @@ -3,5 +3,5 @@ name="DiscordSDK" description="Discord Game SDK support for GDScript in Godot" author="vaporvee" -version="3.1" +version="3.2" script="plugin.gd" diff --git a/project/addons/discord-sdk-gd/plugin.gd b/project/addons/discord-sdk-gd/plugin.gd index 3acc7db..b732ca8 100644 --- a/project/addons/discord-sdk-gd/plugin.gd +++ b/project/addons/discord-sdk-gd/plugin.gd @@ -2,7 +2,7 @@ extends EditorPlugin const DiscordSDKDebug = preload("res://addons/discord-sdk-gd/nodes/debug.gd") -const DiscordSDKDebug_icon = preload("res://addons/discord-sdk-gd/nodes/assets/Debug.svg") +const DiscordSDKDebug_icon = preload("res://addons/discord-sdk-gd/Debug.svg") var loaded_DiscordSDKDebug = DiscordSDKDebug.new() var restart_window: Control = preload("res://addons/discord-sdk-gd/restart_window.tscn").instantiate() diff --git a/project/export_presets.cfg b/project/export_presets.cfg index ccf6593..c4b71d7 100644 --- a/project/export_presets.cfg +++ b/project/export_presets.cfg @@ -8,7 +8,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../../testexpoort/discord_sdk_demo.exe" +export_path="../../eexport/windows/discord-sdk-godot-demo.exe" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false @@ -59,3 +59,43 @@ Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorActi ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue Remove-Item -Recurse -Force '{temp_dir}'" + +[preset.1] + +name="Linux/X11" +platform="Linux/X11" +runnable=true +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="../../eexport/linux/discord-sdk-godot-demo.x86_64" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false + +[preset.1.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=1 +binary_format/embed_pck=true +texture_format/bptc=true +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=false +binary_format/architecture="x86_64" +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="#!/usr/bin/env bash +export DISPLAY=:0 +unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" +\"{temp_dir}/{exe_name}\" {cmd_args}" +ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash +kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") +rm -rf \"{temp_dir}\""