Updated the engine and the data manager addon.

This commit is contained in:
Relintai 2022-12-02 18:47:06 +01:00
parent bef0c58d8e
commit b62e4f2a2b
6 changed files with 14 additions and 10 deletions

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "f15f5b45781eb3de8e5811400f654e3e49580149", "3.x": "a76316c0f06ef63f9b818d1ee8fd8771f73e4f3f"}, "world_generator": {"master": "d12ab222a2387e20164b3e7c6236983223ca88ef"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}, "pandemonium_engine": {"master": "54643bc1fc76248bc03d5ecdaaaa4c10616a2f61"}}
{"engine": {"3.2": "f15f5b45781eb3de8e5811400f654e3e49580149", "3.x": "a76316c0f06ef63f9b818d1ee8fd8771f73e4f3f"}, "world_generator": {"master": "d12ab222a2387e20164b3e7c6236983223ca88ef"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}, "pandemonium_engine": {"master": "47e2a193c4d1ef86028ea02cbe267d7e9fcac3bb"}}

View File

@ -2,9 +2,9 @@ tool
extends EditorPlugin
const DataManagerAddonSettings = preload("res://addons/data_manager/resources/data_manager_addon_settings.gd")
const _main_panel : PackedScene = preload("res://addons/data_manager/panels/MainPanel.tscn")
const _script_icon : Texture = preload("res://addons/data_manager/icons/icon_multi_line.png")
var _script_icon : Texture = null
var settings : DataManagerAddonSettings = null
@ -34,6 +34,9 @@ func make_visible(visible):
_main_panel_instance.hide()
func get_plugin_icon():
if !_script_icon:
_script_icon = get_editor_interface().get_base_control().get_theme_icon("ThemeSelectAll", "EditorIcons")
return _script_icon
func get_plugin_name():

View File

@ -17,6 +17,6 @@ container_path = NodePath("Viewport")
[node name="Viewport" type="Viewport" parent="."]
size = Vector2( 500, 500 )
own_world = true
own_world_3d = true
handle_input_locally = false
render_target_update_mode = 3

View File

@ -17,7 +17,7 @@ container_path = NodePath("Viewport")
[node name="Viewport" type="Viewport" parent="."]
size = Vector2( 500, 500 )
own_world = true
own_world_3d = true
handle_input_locally = false
render_target_update_mode = 3

View File

@ -17,7 +17,7 @@ container_path = NodePath("Viewport")
[node name="Viewport" type="Viewport" parent="."]
size = Vector2( 60, 60 )
size_override_stretch = true
own_world = true
own_world_3d = true
handle_input_locally = false
render_target_update_mode = 3

View File

@ -223,6 +223,7 @@ func save_to_project_settings() -> void:
ProjectSettings.set("addons/data_manager/folder_settings", get_as_json())
func load_from_project_settings() -> void:
if ProjectSettings.has_setting("addons/data_manager/folder_settings"):
var d : String = ProjectSettings.get("addons/data_manager/folder_settings")
if d != "":