diff --git a/.github/ISSUE_TEMPLATE/BUG.yml b/.github/ISSUE_TEMPLATE/BUG.yml index b01fe54..2a1171f 100644 --- a/.github/ISSUE_TEMPLATE/BUG.yml +++ b/.github/ISSUE_TEMPLATE/BUG.yml @@ -23,6 +23,7 @@ body: label: Version description: What version of our software are you running? options: + - 2.4 - 2.3 - 2.2 - 2.1 diff --git a/project/addons/discord-sdk-gd/bin/linux/libdiscord_game_sdk_binding.so b/project/addons/discord-sdk-gd/bin/linux/libdiscord_game_sdk_binding.so index 9304b0a..d157868 100755 Binary files a/project/addons/discord-sdk-gd/bin/linux/libdiscord_game_sdk_binding.so and b/project/addons/discord-sdk-gd/bin/linux/libdiscord_game_sdk_binding.so differ diff --git a/project/addons/discord-sdk-gd/bin/linux/libdiscord_game_sdk_binding_debug.so b/project/addons/discord-sdk-gd/bin/linux/libdiscord_game_sdk_binding_debug.so index e11d6ab..2173359 100755 Binary files a/project/addons/discord-sdk-gd/bin/linux/libdiscord_game_sdk_binding_debug.so and b/project/addons/discord-sdk-gd/bin/linux/libdiscord_game_sdk_binding_debug.so differ 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 36ed344..7f9c787 100644 Binary files a/project/addons/discord-sdk-gd/bin/windows/discord_game_sdk_binding.dll and b/project/addons/discord-sdk-gd/bin/windows/discord_game_sdk_binding.dll differ 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 a7278a5..2d23261 100644 Binary files a/project/addons/discord-sdk-gd/bin/windows/discord_game_sdk_binding_debug.dll and b/project/addons/discord-sdk-gd/bin/windows/discord_game_sdk_binding_debug.dll differ diff --git a/project/addons/discord-sdk-gd/discord-rpc-gd.gdextension b/project/addons/discord-sdk-gd/discord-rpc-gd.gdextension index abe5d9b..ad454ef 100644 --- a/project/addons/discord-sdk-gd/discord-rpc-gd.gdextension +++ b/project/addons/discord-sdk-gd/discord-rpc-gd.gdextension @@ -1,6 +1,7 @@ [configuration] entry_symbol = "discordsdkgd_library_init" +compatibility_minimum = 4.1 [libraries] diff --git a/project/addons/discord-sdk-gd/plugin.cfg b/project/addons/discord-sdk-gd/plugin.cfg index 825a047..a7b06ab 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="2.3" +version="2.4" script="plugin.gd" diff --git a/project/project.godot b/project/project.godot index e0c93bb..5916d7b 100644 --- a/project/project.godot +++ b/project/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="GDExtension DiscordSDK Test Project" run/main_scene="res://main.tscn" -config/features=PackedStringArray("4.0") +config/features=PackedStringArray("4.1") boot_splash/bg_color=Color(0.25098, 0.305882, 0.929412, 1) boot_splash/image="res://assets/Banner_v1.png" boot_splash/fullsize=false diff --git a/src/lib/godot-cpp b/src/lib/godot-cpp index feaba55..d627942 160000 --- a/src/lib/godot-cpp +++ b/src/lib/godot-cpp @@ -1 +1 @@ -Subproject commit feaba551b5a5b2d13ad1c3fdd8c90e67c67ff37c +Subproject commit d627942b647105aff600225a59dffa65de206247 diff --git a/src/register_types.cpp b/src/register_types.cpp index 5ac453b..37f3fc6 100644 --- a/src/register_types.cpp +++ b/src/register_types.cpp @@ -11,7 +11,7 @@ using namespace godot; static discord_sdk *discordsdk; -void gdextension_initialize(ModuleInitializationLevel p_level) +void initialize_discordsdk_module(ModuleInitializationLevel p_level) { if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) { @@ -21,7 +21,7 @@ void gdextension_initialize(ModuleInitializationLevel p_level) } } -void gdextension_terminate(ModuleInitializationLevel p_level) +void uninitialize_discordsdk_module(ModuleInitializationLevel p_level) { if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) { @@ -32,12 +32,12 @@ void gdextension_terminate(ModuleInitializationLevel p_level) extern "C" { - GDExtensionBool GDE_EXPORT discordsdkgd_library_init(const GDExtensionInterface *p_interface, GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) + GDExtensionBool GDE_EXPORT discordsdkgd_library_init(GDExtensionInterfaceGetProcAddress p_get_proc_address, GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) { - godot::GDExtensionBinding::InitObject init_obj(p_interface, p_library, r_initialization); + godot::GDExtensionBinding::InitObject init_obj(p_get_proc_address, p_library, r_initialization); - init_obj.register_initializer(gdextension_initialize); - init_obj.register_terminator(gdextension_terminate); + init_obj.register_initializer(initialize_discordsdk_module); + init_obj.register_terminator(uninitialize_discordsdk_module); init_obj.set_minimum_library_initialization_level(MODULE_INITIALIZATION_LEVEL_SCENE); return init_obj.init();