Merge bbdafa9033 into 576df4092a

During the editor launch, duplicate UI banners may appear in the LimboAI tab. Maybe in some other instances too. This PR fixes this issue.

doc/source/getting-started/getting-limboai.rst

@@ -14,6 +14,10 @@ You can change your decision at any time - both versions are fully compatible.
 Get GDExtension version
 ------------------------
 
+Precompiled builds are available on the official
+`LimboAI GitHub <https://github.com/limbonaut/limboai#getting-limboai>`_ page,
+and in the Asset Library.
+
 GDExtension is the most convenient way of using the LimboAI plugin, but it comes
 with certain limitations:
 
@@ -34,8 +38,7 @@ Get module version
 -------------------
 
 Precompiled builds are available on the official
-`LimboAI GitHub <https://github.com/limbonaut/limboai#getting-limboai>`_ page,
-and in the Asset Library (coming soon!).
+`LimboAI GitHub <https://github.com/limbonaut/limboai#getting-limboai>`_ page.
 
 Installation instructions:
 
@@ -44,3 +47,5 @@ Installation instructions:
 3. Extract the pre-compiled editor and the demo project files.
 4. Launch the pre-compiled editor binary, import and open the demo project.
 5. Run the project.
+
+**Important**: To export your game using the module version of LimboAI, make sure to use the pre-compiled export templates included in the same GitHub release build.

editor/limbo_ai_editor_plugin.cpp

@@ -36,6 +36,7 @@
 #include "editor/editor_file_system.h"
 #include "editor/editor_help.h"
 #include "editor/editor_interface.h"
+#include "editor/editor_main_screen.h"
 #include "editor/editor_paths.h"
 #include "editor/editor_settings.h"
 #include "editor/filesystem_dock.h"
@@ -917,6 +918,7 @@ void LimboAIEditor::_on_visibility_changed() {
 		}
 
 		task_palette->refresh();
+		_update_banners();
 	}
 	_update_favorite_tasks();
 
@@ -1419,9 +1421,11 @@ void LimboAIEditor::_update_misc_menu() {
 }
 
 void LimboAIEditor::_update_banners() {
-	for (int i = 0; i < banners->get_child_count(); i++) {
+	for (int i = banners->get_child_count() - 1; i >= 0; i--) {
 		if (banners->get_child(i)->has_meta(LW_NAME(managed))) {
-			banners->get_child(i)->queue_free();
+			Node *banner = banners->get_child(i);
+			banners->remove_child(banner);
+			memfree(banner);
 		}
 	}
 
@@ -1435,7 +1439,7 @@ void LimboAIEditor::_update_banners() {
 			banner->add_spacer();
 			banner->add_action(TTR("Help..."), callable_mp(LimboUtility::get_singleton(), &LimboUtility::open_doc_custom_tasks));
 			banner->set_meta(LW_NAME(managed), Variant(true));
-			banners->call_deferred(LW_NAME(add_child), banner);
+			banners->add_child(banner);
 		}
 	}
 
@@ -1449,7 +1453,7 @@ void LimboAIEditor::_update_banners() {
 			banner->add_action(TTR("Remove"), callable_mp(this, &LimboAIEditor::_remove_task_from_favorite).bind(task_meta), true);
 			banner->add_action(TTR("Edit Favorite Tasks..."), callable_mp(this, &LimboAIEditor::_edit_project_settings));
 			banner->set_meta(LW_NAME(managed), Variant(true));
-			banners->call_deferred(LW_NAME(add_child), banner);
+			banners->add_child(banner);
 		}
 	}
 
@@ -1459,7 +1463,7 @@ void LimboAIEditor::_update_banners() {
 		banner->set_text(TTR("Restart required to apply changes to editor layout"));
 		banner->add_action(TTR("Save & Restart"), callable_mp(this, &LimboAIEditor::_save_and_restart), true);
 		banner->set_meta(LW_NAME(managed), Variant(true));
-		banners->call_deferred(LW_NAME(add_child), banner);
+		banners->add_child(banner);
 	}
 }
 
@@ -1508,7 +1512,6 @@ void LimboAIEditor::_notification(int p_what) {
 			task_tree->connect("task_activated", callable_mp(this, &LimboAIEditor::_on_tree_task_activated));
 			task_tree->connect("probability_clicked", callable_mp(this, &LimboAIEditor::_action_selected).bind(ACTION_EDIT_PROBABILITY));
 			task_tree->connect("visibility_changed", callable_mp(this, &LimboAIEditor::_on_visibility_changed));
-			task_tree->connect("visibility_changed", callable_mp(this, &LimboAIEditor::_update_banners));
 			save_btn->connect(LW_NAME(pressed), callable_mp(this, &LimboAIEditor::_on_save_pressed));
 			misc_btn->connect(LW_NAME(pressed), callable_mp(this, &LimboAIEditor::_update_misc_menu));
 			misc_btn->get_popup()->connect("id_pressed", callable_mp(this, &LimboAIEditor::_misc_option_selected));

limboai_version.py

@@ -1,10 +1,10 @@
 # Edit the following variables to change version info
 
 major = 1
-minor = 4
-patch = 0
-status = "dev"
-doc_branch = "latest"
+minor = 3
+patch = 1
+status = ""
+doc_branch = "v1.3.1"
 godot_cpp_ref = "godot-4.3-stable"
 
 # Code that generates version header

util/limbo_compat.cpp

@@ -17,6 +17,7 @@
 #include "core/io/resource.h"
 #include "core/variant/variant.h"
 #include "editor/editor_node.h"
+#include "editor/editor_main_screen.h"
 #include "editor/plugins/script_editor_plugin.h"
 #endif // TOOLS_ENABLED
 
@@ -213,7 +214,7 @@ Variant VARIANT_DEFAULT(Variant::Type p_type) {
 void SHOW_BUILTIN_DOC(const String &p_topic) {
 #ifdef LIMBOAI_MODULE
 	ScriptEditor::get_singleton()->goto_help(p_topic);
-	EditorNode::get_singleton()->set_visible_editor(EditorNode::EDITOR_SCRIPT);
+	EditorNode::get_singleton()->get_editor_main_screen()->select(EditorMainScreen::EDITOR_SCRIPT);
 #elif LIMBOAI_GDEXTENSION
 	TypedArray<ScriptEditorBase> open_editors = EditorInterface::get_singleton()->get_script_editor()->get_open_script_editors();
 	ERR_FAIL_COND_MSG(open_editors.size() == 0, "Can't open help page. Need at least one script open in the script editor.");

util/limbo_compat.h

@@ -28,7 +28,7 @@
 #define EDITOR_FILE_SYSTEM() (EditorFileSystem::get_singleton())
 #define EDITOR_SETTINGS() (EditorSettings::get_singleton())
 #define BASE_CONTROL() (EditorNode::get_singleton()->get_gui_base())
-#define MAIN_SCREEN_CONTROL() (EditorNode::get_singleton()->get_main_screen_control())
+#define MAIN_SCREEN_CONTROL() (EditorNode::get_singleton()->get_editor_main_screen()->get_control())
 #define SCENE_TREE() (SceneTree::get_singleton())
 #define IS_DEBUGGER_ACTIVE() (EngineDebugger::is_active())
 #define FS_DOCK_SELECT_FILE(m_path) FileSystemDock::get_singleton()->select_file(m_path)
@@ -47,7 +47,7 @@
 #define GET_PROJECT_SETTINGS_DIR() EditorPaths::get_singleton()->get_project_settings_dir()
 #define EDIT_RESOURCE(m_res) EditorNode::get_singleton()->edit_resource(m_res)
 #define INSPECTOR_GET_EDITED_OBJECT() (InspectorDock::get_inspector_singleton()->get_edited_object())
-#define SET_MAIN_SCREEN_EDITOR(m_name) (EditorNode::get_singleton()->select_editor_by_name(m_name))
+#define SET_MAIN_SCREEN_EDITOR(m_name) (EditorNode::get_singleton()->get_editor_main_screen()->select_by_name(m_name))
 #define FILE_EXISTS(m_path) FileAccess::exists(m_path)
 #define DIR_ACCESS_CREATE() DirAccess::create(DirAccess::ACCESS_RESOURCES)
 #define PERFORMANCE_ADD_CUSTOM_MONITOR(m_id, m_callable) (Performance::get_singleton()->add_custom_monitor(m_id, m_callable, Variant()))
@@ -85,7 +85,7 @@ using namespace godot;
 #define EDITOR_FILE_SYSTEM() (EditorInterface::get_singleton()->get_resource_filesystem())
 #define EDITOR_SETTINGS() (EditorInterface::get_singleton()->get_editor_settings())
 #define BASE_CONTROL() (EditorInterface::get_singleton()->get_base_control())
-#define MAIN_SCREEN_CONTROL() (EditorInterface::get_singleton()->get_editor_main_screen())
+#define MAIN_SCREEN_CONTROL() (EditorInterface::get_singleton()->get_editor_main_screen()->get_control())
 #define SCENE_TREE() ((SceneTree *)(Engine::get_singleton()->get_main_loop()))
 #define IS_DEBUGGER_ACTIVE() (EngineDebugger::get_singleton()->is_active())
 #define FS_DOCK_SELECT_FILE(m_path) EditorInterface::get_singleton()->get_file_system_dock()->navigate_to_path(m_path)

util/limbo_utility.cpp

@@ -416,6 +416,12 @@ String LimboUtility::get_property_hint_text(PropertyHint p_hint) const {
 		case PROPERTY_HINT_MAX: {
 			return "MAX";
 		}
+		case PROPERTY_HINT_DICTIONARY_TYPE: {
+			return "DICTIONARY_TYPE";
+		}
+		case PROPERTY_HINT_TOOL_BUTTON: {
+			return "TOOL_BUTTON";
+		}
 	}
 	return "";
 }