4 Commits
1.3 ... 1.4

Author SHA1 Message Date
Yannik
ad1dee23db added linux builds 2023-05-12 20:23:32 +02:00
Yannik
7c09847331 reverted app_id "fix" and fixed addon file location issues 2023-05-12 18:47:28 +02:00
Yannik
ded4f14ab6 bumped addon version to 1.3 2023-05-12 14:51:44 +02:00
Yannik
bad8733929 Create BUG.yml 2023-05-12 14:50:13 +02:00
9 changed files with 89 additions and 33 deletions

65
.github/ISSUE_TEMPLATE/BUG.yml vendored Normal file
View File

@@ -0,0 +1,65 @@
name: Bug Report
description: File a bug report
title: "[Bug/Crash]: "
labels: ["bug"]
assignees:
- vaporvee
body:
- type: markdown
attributes:
value: Thanks for taking the time to fill out this bug/crash report!
- type: textarea
id: what-happened
attributes:
label: What happened?
description: Also tell us, what did you expect to happen?
placeholder: Tell us what you see!
value: "A bug happened!"
validations:
required: true
- type: dropdown
id: version
attributes:
label: Version
description: What version of our software are you running?
options:
- 1.3
- 1.2
- 1.1
- 1.0
- Custom build
validations:
required: true
- type: input
id: gd-version
attributes:
label: Godot Version
description: This addon is ONLY for 4.0 and above!
placeholder: e.g. 4.0.2-stable
validations:
required: true
- type: textarea
id: gdscript
attributes:
label: GDScript
description: A place for any GDScript to be formatted
placeholder: Put in your GDScript code here and make comments with `#` to tell where wich file ends
render: gdscript
validations:
required: true
- type: textarea
id: additional
attributes:
label: Additional information
description: If you have anything else tell me here
placeholder: Anything else.
validations:
required: false
- type: checkboxes
id: reinstalling
attributes:
label: Checks
description: Common mistakes (Adding more in the future sorry btw)
options:
- label: I tried reinstalling the addon in a new project.
required: true

View File

@@ -4,11 +4,11 @@ extends EditorExportPlugin
func _export_file(path, type, features): func _export_file(path, type, features):
if features[2] == "windows": if features[2] == "windows":
if features[4] == "x86_64": if features[4] == "x86_64":
add_shared_object("res://addons/discord-sdk-gd/bin/windows/discord_game_sdk.dll",[],"/") add_shared_object("bin/windows/discord_game_sdk.dll",[],"/")
elif features[4] == "x86": elif features[4] == "x86":
add_shared_object("res://addons/discord-sdk-gd/bin/windows/discord_game_sdk_x86.dll",[],"/") add_shared_object("bin/windows/discord_game_sdk_x86.dll",[],"/")
elif features[2] == "linux": elif features[2] == "linux":
add_shared_object("res://addons/discord-sdk-gd/bin/linux/libdiscord_game_sdk.so",[],"/") add_shared_object("bin/linux/libdiscord_game_sdk.so",[],"/")
elif features[2] == "macos": elif features[2] == "macos":
add_shared_object("res://addons/discord-sdk-gd/bin/macos/libdiscord_game_sdk.dylib",[],"/") add_shared_object("bin/macos/libdiscord_game_sdk.dylib",[],"/")
add_shared_object("res://addons/discord-sdk-gd/bin/macos/libdiscord_game_sdk_aarch64.dylib",[],"/") add_shared_object("bin/macos/libdiscord_game_sdk_aarch64.dylib",[],"/")

View File

@@ -1,11 +1,11 @@
@tool @tool
extends EditorPlugin extends EditorPlugin
const ExportPlugin = preload("res://addons/discord-sdk-gd/export.gd") const ExportPlugin = preload("export.gd")
var loaded_exportplugin = ExportPlugin.new() var loaded_exportplugin = ExportPlugin.new()
func _enter_tree(): func _enter_tree():
add_autoload_singleton("updater_discordsdk", "res://addons/discord-sdk-gd/sdk_utility.gd") add_autoload_singleton("updater_discordsdk", "sdk_utility.gd")
add_export_plugin(loaded_exportplugin) add_export_plugin(loaded_exportplugin)
func disable_plugin(): func disable_plugin():

View File

@@ -1,20 +1,18 @@
extends Node extends Node
func _ready(): func _ready():
# Discord_Activity.app_id = 1099618430065324082 Discord_Activity.app_id = 1099618430065324082
# Discord_Activity.debug() Discord_Activity.details = "A demo activity by vaporvee#1231"
# Discord_Activity.app_id = 1099618430065324082 Discord_Activity.state = "Checkpoint 23/23"
# Discord_Activity.details = "A demo activity by vaporvee#1231"
# Discord_Activity.state = "Checkpoint 23/23" Discord_Activity.large_image = "game"
# Discord_Activity.large_image_text = "Try it now!"
# Discord_Activity.large_image = "game" Discord_Activity.small_image = "boss"
# Discord_Activity.large_image_text = "Try it now!" Discord_Activity.small_image_text = "Fighting the end boss! D:"
# Discord_Activity.small_image = "boss"
# Discord_Activity.small_image_text = "Fighting the end boss! D:" #Discord_Activity.start_timestamp = int(Time.get_unix_time_from_system())
# Discord_Activity.end_timestamp = int(Time.get_unix_time_from_system()) + 3600 # +1 hour in unix time
# #Discord_Activity.start_timestamp = int(Time.get_unix_time_from_system())
# Discord_Activity.end_timestamp = int(Time.get_unix_time_from_system()) + 3600 # +1 hour in unix time Discord_Activity.refresh()
#
# Discord_Activity.refresh()
#
$Info.text = $Info.text.replace("{discordinfo}",str(Discord_Activity.get_is_discord_working())).replace("{id}",str(Discord_Activity.app_id)).replace("{details}",Discord_Activity.details).replace("{state}",Discord_Activity.state).replace("{lkey}",Discord_Activity.large_image).replace("{ltext}",Discord_Activity.large_image_text).replace("{skey}",Discord_Activity.small_image).replace("{stext}",Discord_Activity.small_image_text).replace("{stimestamp}",str(Discord_Activity.start_timestamp)).replace("{etimestamp}",str(Discord_Activity.end_timestamp)) $Info.text = $Info.text.replace("{discordinfo}",str(Discord_Activity.get_is_discord_working())).replace("{id}",str(Discord_Activity.app_id)).replace("{details}",Discord_Activity.details).replace("{state}",Discord_Activity.state).replace("{lkey}",Discord_Activity.large_image).replace("{ltext}",Discord_Activity.large_image_text).replace("{skey}",Discord_Activity.small_image).replace("{stext}",Discord_Activity.small_image_text).replace("{stimestamp}",str(Discord_Activity.start_timestamp)).replace("{etimestamp}",str(Discord_Activity.end_timestamp))

View File

@@ -65,10 +65,6 @@ Discord_Activity::Discord_Activity()
{ {
ERR_FAIL_COND(singleton != nullptr); ERR_FAIL_COND(singleton != nullptr);
singleton = this; singleton = this;
// intitalize core with discord's dummy application ID to make "is_discord_working" work anytime
app_id = 461618159171141643;
result = discord::Core::Create(app_id, DiscordCreateFlags_NoRequireDiscord, &core);
} }
Discord_Activity::~Discord_Activity() Discord_Activity::~Discord_Activity()
@@ -79,7 +75,7 @@ Discord_Activity::~Discord_Activity()
void Discord_Activity::coreupdate() void Discord_Activity::coreupdate()
{ {
if (result == discord::Result::Ok && app_id > 0 && app_id != 461618159171141643) if (result == discord::Result::Ok && app_id > 0)
{ {
::core->RunCallbacks(); ::core->RunCallbacks();
} }
@@ -111,10 +107,7 @@ void Discord_Activity::set_app_id(int64_t value)
} }
int64_t Discord_Activity::get_app_id() int64_t Discord_Activity::get_app_id()
{ {
if (app_id = 461618159171141643) return app_id;
return 0;
else
return app_id;
} }
void Discord_Activity::set_state(String value) void Discord_Activity::set_state(String value)
@@ -138,7 +131,7 @@ String Discord_Activity::get_details()
void Discord_Activity::refresh() void Discord_Activity::refresh()
{ {
if (result == discord::Result::Ok && app_id > 0 && app_id != 461618159171141643) if (result == discord::Result::Ok && app_id > 0)
{ {
core->ActivityManager().UpdateActivity(activity, [](discord::Result result) {}); core->ActivityManager().UpdateActivity(activity, [](discord::Result result) {});
core->UserManager().OnCurrentUserUpdate.Connect([]() core->UserManager().OnCurrentUserUpdate.Connect([]()