From 0c9e4123b7d29fef6ac3b6d92c648409eeefef78 Mon Sep 17 00:00:00 2001 From: Yannik <80621863+vaporvee@users.noreply.github.com> Date: Sat, 13 May 2023 01:40:36 +0200 Subject: [PATCH 1/3] fixed #18 --- .github/ISSUE_TEMPLATE/BUG.yml | 2 ++ .../bin/windows/discord_game_sdk_binding.dll | Bin 169984 -> 169984 bytes .../discord_game_sdk_binding_debug.dll | Bin 171520 -> 171520 bytes project/addons/discord-sdk-gd/export.gd | 10 +++++----- project/addons/discord-sdk-gd/plugin.cfg | 2 +- project/addons/discord-sdk-gd/plugin.gd | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/BUG.yml b/.github/ISSUE_TEMPLATE/BUG.yml index e995459..d7ae21d 100644 --- a/.github/ISSUE_TEMPLATE/BUG.yml +++ b/.github/ISSUE_TEMPLATE/BUG.yml @@ -23,6 +23,8 @@ body: label: Version description: What version of our software are you running? options: + - 1.5 + - 1.4 - 1.3 - 1.2 - 1.1 diff --git a/project/addons/discord-sdk-gd/bin/windows/discord_game_sdk_binding.dll b/project/addons/discord-sdk-gd/bin/windows/discord_game_sdk_binding.dll index acad3a2afcc1bc153692423b4680fa535dbc6653..afe23f54326171b618ec228071841fa321334248 100644 GIT binary patch delta 34 ocmZqJz}2vUYl8qI)6rASLX7P~jEvib7@3k}f&A@da!g&70LA?aBme*a delta 34 ocmZqJz}2vUYl8qI(}A33A;xwgM#k+zj7&+gK>qeJIi{{k0J>QUUH||9 diff --git a/project/addons/discord-sdk-gd/bin/windows/discord_game_sdk_binding_debug.dll b/project/addons/discord-sdk-gd/bin/windows/discord_game_sdk_binding_debug.dll index fcb96f576ed0df2d584e2bdc2abe309de3c53d86..6f47c380b65f284eccb20adf0daf6926e23d5717 100644 GIT binary patch delta 34 ocmZqJ!_}~dYl8qI)813fLX7P~jEvib7@35Wf&A@iDonR30mJ1A=l}o! delta 34 ocmZqJ!_}~dYl8qI)6Se`A;xwgM#k+zj7&nxK>l_$6{cI20JvcaBme*a diff --git a/project/addons/discord-sdk-gd/export.gd b/project/addons/discord-sdk-gd/export.gd index 6790839..2c6e265 100644 --- a/project/addons/discord-sdk-gd/export.gd +++ b/project/addons/discord-sdk-gd/export.gd @@ -4,11 +4,11 @@ extends EditorExportPlugin func _export_file(path, type, features): if features[2] == "windows": if features[4] == "x86_64": - add_shared_object("bin/windows/discord_game_sdk.dll",[],"/") + add_shared_object("res://addons/discord-sdk-gd/bin/windows/discord_game_sdk.dll",[],"/") elif features[4] == "x86": - add_shared_object("bin/windows/discord_game_sdk_x86.dll",[],"/") + add_shared_object("res://addons/discord-sdk-gd/bin/windows/discord_game_sdk_x86.dll",[],"/") elif features[2] == "linux": - add_shared_object("bin/linux/libdiscord_game_sdk.so",[],"/") + add_shared_object("res://addons/discord-sdk-gd/bin/linux/libdiscord_game_sdk.so",[],"/") elif features[2] == "macos": - add_shared_object("bin/macos/libdiscord_game_sdk.dylib",[],"/") - add_shared_object("bin/macos/libdiscord_game_sdk_aarch64.dylib",[],"/") + add_shared_object("res://addons/discord-sdk-gd/bin/macos/libdiscord_game_sdk.dylib",[],"/") + add_shared_object("res://addons/discord-sdk-gd/bin/macos/libdiscord_game_sdk_aarch64.dylib",[],"/") diff --git a/project/addons/discord-sdk-gd/plugin.cfg b/project/addons/discord-sdk-gd/plugin.cfg index 2dc0a11..0b98cc2 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="1.4" +version="1.5" script="plugin.gd" diff --git a/project/addons/discord-sdk-gd/plugin.gd b/project/addons/discord-sdk-gd/plugin.gd index 8cc3ecb..12cf41b 100644 --- a/project/addons/discord-sdk-gd/plugin.gd +++ b/project/addons/discord-sdk-gd/plugin.gd @@ -5,7 +5,7 @@ const ExportPlugin = preload("export.gd") var loaded_exportplugin = ExportPlugin.new() func _enter_tree(): - add_autoload_singleton("updater_discordsdk", "sdk_utility.gd") + add_autoload_singleton("updater_discordsdk", "res://addons/discord-sdk-gd/sdk_utility.gd") add_export_plugin(loaded_exportplugin) func disable_plugin(): From 5e080bc8467a160fe74d1dab84d0ff8ac6308613 Mon Sep 17 00:00:00 2001 From: Yannik <80621863+vaporvee@users.noreply.github.com> Date: Sun, 14 May 2023 12:01:32 +0200 Subject: [PATCH 2/3] Updated GitHub stuff --- .github/ISSUE_TEMPLATE/BUG.yml | 12 ++++++++- README.md | 49 +++++++--------------------------- 2 files changed, 20 insertions(+), 41 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/BUG.yml b/.github/ISSUE_TEMPLATE/BUG.yml index d7ae21d..c278711 100644 --- a/.github/ISSUE_TEMPLATE/BUG.yml +++ b/.github/ISSUE_TEMPLATE/BUG.yml @@ -49,6 +49,14 @@ body: render: gdscript validations: required: true + - type: textarea + id: log + attributes: + label: Godot output + description: The output log from Godot + render: shell + validations: + required: false - type: textarea id: additional attributes: @@ -63,5 +71,7 @@ body: label: Checks description: Common mistakes (Adding more in the future sorry btw) options: - - label: I tried reinstalling the addon in a new project. + - label: I tried reinstalling the addon or tried to fix it myself with other methods. + required: true + - label: I tried restarting Discord and Godot completely. required: true diff --git a/README.md b/README.md index 2e1ee63..7a0583b 100644 --- a/README.md +++ b/README.md @@ -1,52 +1,21 @@ Project Banner -![HitCount](https://hits.dwyl.com/vaporvee/discord-sdk-godot.svg) -### :warning: This is an early version! MacOS support still doesn't work! In future versions there also will be invites, user info etc. very soon! -Don't forget to run the following command **if you clone this project** or files will be missing - -```sh -python setup.py -``` -# Addon Usage :rocket: -1. [Download the addon](https://github.com/vaporvee/discord-sdk-godot/releases/latest/download/ADDON-Discord-SDK-Godot.zip/) -2. Put the `addons/` folder in your Godot project -3. Enable the addon in your Project Settings under "Plugins" and "DiscordSDK". (if it doesn't show up restart your project and try again) -4. Restart your project -5. Create an Application under https://discord.com/developers/applications and get the Application ID -6. (optional) Set images under "Rich Presence" and "Art Assets" and remember the keys -```gdscript -extends Node - -func _ready(): - Discord_Activity.app_id = 1099618430065324082 # Application ID - print("Discord working: " + str(Discord_Activity.get_is_discord_working())) # A boolean if everything worked - Discord_Activity.details = "A demo activity by vaporvee#1231" - Discord_Activity.state = "Checkpoint 23/23" - - Discord_Activity.large_image = "game" # Image key from "Art Assets" - Discord_Activity.large_image_text = "Try it now!" - Discord_Activity.small_image = "boss" # Image key from "Art Assets" - Discord_Activity.small_image_text = "Fighting the end boss! D:" - - Discord_Activity.start_timestamp = int(Time.get_unix_time_from_system()) # "02:46 elapsed" - # Discord_Activity.end_timestamp = int(Time.get_unix_time_from_system()) + 3600 # +1 hour in unix time / "01:00 remaining" - - Discord_Activity.refresh() # Always refresh after changing the values! - -``` -#### Then it will look similar to this: -Activity Preview - -### [Try a built demo](https://github.com/vaporvee/discord-sdk-godot/releases/latest/download/Demo-Export.zip) -:incoming_envelope: Still questions? write an [issue](https://github.com/vaporvee/discord-sdk-godot/issues)! I'll answer very fast :) +**:warning: This is an early version! MacOS support still doesn't work! In future versions there also will be invites, user info etc. very soon!** +**Discord Game SDK support for GDScript in Godot Engine 4.0. with the easiest code pattern!**

+**Please leave a star that would really help! And thanks to all the people that already starred this project! ❤️**
+
+# [Quick start :rocket: (click here)](https://github.com/vaporvee/discord-sdk-godot/wiki/Quick-start) +
+ +**A small donation with the sponsor button would be nice if you sell your project with this addon but is of course not mandatory!** +
### Credit [@Pukimaa](https://github.com/pukimaa) - Designer
-[@koyuawsmbrtn](https://github.com/koyuawsmbrtn) - Getting it to work on MacOS (shes giving her best)
*This project is not endorsed or affiliated with Discord Inc. or the Godot Foundation.* From edf3e7fab654a9a54cab79ddc50700cec60f42d1 Mon Sep 17 00:00:00 2001 From: Yannik <80621863+vaporvee@users.noreply.github.com> Date: Mon, 15 May 2023 18:38:30 +0200 Subject: [PATCH 3/3] fixed error when exporting project #20 --- project/addons/discord-sdk-gd/export.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/addons/discord-sdk-gd/export.gd b/project/addons/discord-sdk-gd/export.gd index 2c6e265..b7e815d 100644 --- a/project/addons/discord-sdk-gd/export.gd +++ b/project/addons/discord-sdk-gd/export.gd @@ -1,7 +1,7 @@ @tool extends EditorExportPlugin -func _export_file(path, type, features): +func _export_file(_path, _type, features): if features[2] == "windows": if features[4] == "x86_64": add_shared_object("res://addons/discord-sdk-gd/bin/windows/discord_game_sdk.dll",[],"/")