From bf8f2b58064209c2d8b731d950da1f5bb6050f1c Mon Sep 17 00:00:00 2001 From: Fireye Date: Tue, 16 Sep 2025 22:31:48 -0700 Subject: [PATCH 1/2] Update to godot 4.5 --- Dialogue Manager.csproj | 2 +- project.godot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dialogue Manager.csproj b/Dialogue Manager.csproj index c3d39dd9..73efce5d 100644 --- a/Dialogue Manager.csproj +++ b/Dialogue Manager.csproj @@ -1,4 +1,4 @@ - + net8.0 true diff --git a/project.godot b/project.godot index b4f951eb..b52f065c 100644 --- a/project.godot +++ b/project.godot @@ -13,7 +13,7 @@ config_version=5 config/name="Dialogue Manager" config/tags=PackedStringArray("addon") run/main_scene="res://tests/tests.tscn" -config/features=PackedStringArray("4.4", "C#") +config/features=PackedStringArray("4.5", "C#") config/icon="res://icon.svg" [autoload] From b76edb6b79201c03b2b8cc569d7e20eb46d725a4 Mon Sep 17 00:00:00 2001 From: Fireye Date: Tue, 16 Sep 2025 22:39:18 -0700 Subject: [PATCH 2/2] Revert "Fix custom test scene failing to run from UID (#885)" This reverts commit e5694576f006f00f9527cb47bdb15b21749c5d23. --- addons/dialogue_manager/views/main_view.gd | 25 ++++++++++------------ 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/addons/dialogue_manager/views/main_view.gd b/addons/dialogue_manager/views/main_view.gd index cfcccd1b..0a881a2e 100644 --- a/addons/dialogue_manager/views/main_view.gd +++ b/addons/dialogue_manager/views/main_view.gd @@ -836,16 +836,6 @@ func show_search_form(is_enabled: bool) -> void: search_and_replace.focus_line_edit() -func run_test_scene(from_key: String) -> void: - DMSettings.set_user_value("run_title", from_key) - DMSettings.set_user_value("is_running_test_scene", true) - DMSettings.set_user_value("run_resource_path", current_file_path) - var test_scene_path: String = DMSettings.get_setting(DMSettings.CUSTOM_TEST_SCENE_PATH, "res://addons/dialogue_manager/test_scene.tscn") - if ResourceUID.has_id(ResourceUID.text_to_id(test_scene_path)): - test_scene_path = ResourceUID.get_id_path(ResourceUID.text_to_id(test_scene_path)) - EditorInterface.play_custom_scene(test_scene_path) - - ### Signals @@ -1082,7 +1072,11 @@ func _on_test_button_pressed() -> void: errors_dialog.popup_centered() return - run_test_scene("") + DMSettings.set_user_value("run_title", "") + DMSettings.set_user_value("is_running_test_scene", true) + DMSettings.set_user_value("run_resource_path", current_file_path) + var test_scene_path: String = DMSettings.get_setting(DMSettings.CUSTOM_TEST_SCENE_PATH, "res://addons/dialogue_manager/test_scene.tscn") + EditorInterface.play_custom_scene(test_scene_path) func _on_test_line_button_pressed() -> void: @@ -1097,9 +1091,12 @@ func _on_test_line_button_pressed() -> void: for i in range(code_edit.get_cursor().y, code_edit.get_line_count()): if not code_edit.get_line(i).is_empty(): line_to_run = i - break - - run_test_scene(str(line_to_run)) + break; + DMSettings.set_user_value("run_title", str(line_to_run)) + DMSettings.set_user_value("is_running_test_scene", true) + DMSettings.set_user_value("run_resource_path", current_file_path) + var test_scene_path: String = DMSettings.get_setting(DMSettings.CUSTOM_TEST_SCENE_PATH, "res://addons/dialogue_manager/test_scene.tscn") + EditorInterface.play_custom_scene(test_scene_path) func _on_support_button_pressed() -> void: