From 32b67516197bc81eb8dd12bb271d72a2a1401101 Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 10 Oct 2022 13:24:01 +0200 Subject: [PATCH] Updated the engine to the latest. --- HEADS | 2 +- game/addons/world_generator/ui/RectView.gd | 8 ++++---- .../world_generator/widgets/EditorZoomWidget.gd | 12 ++++++------ game/tilesets/Terrain.tscn | 4 ++-- game/tilesets/tileset.tres | 2 +- game/ui/numbers/Number.gd | 2 +- game/world/WorldLayer.tscn | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/HEADS b/HEADS index f84022a..692d244 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "64a9e86c5c20bd4bd5833f0563457d0126617489", "3.x": "cdd4f2722a7c16d9e36521d7180cc80715591554"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3c334566ff05a74e913cd5c5ff38ae45aba5f5d2"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "c401b7a027248158dae3fbce20d637d34eaaedb9"}, "mesh_data_resource": {"master": "2bf76b8d07c2821161886ea4ea6edc788ec2ee51"}, "mesh_utils": {"master": "902dae29797789d406faf256a22aa73b7f6d5261"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "terraman_2d": {"master": "b547515ae3817b0088e2cf499af59c8f1dee7189"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}, "pandemonium_engine": {"master": "91bba51de634a778772bf4c58b5b05aa250d3e56"}} \ No newline at end of file +{"engine": {"3.2": "64a9e86c5c20bd4bd5833f0563457d0126617489", "3.x": "cdd4f2722a7c16d9e36521d7180cc80715591554"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3c334566ff05a74e913cd5c5ff38ae45aba5f5d2"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "c401b7a027248158dae3fbce20d637d34eaaedb9"}, "mesh_data_resource": {"master": "2bf76b8d07c2821161886ea4ea6edc788ec2ee51"}, "mesh_utils": {"master": "902dae29797789d406faf256a22aa73b7f6d5261"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "terraman_2d": {"master": "b547515ae3817b0088e2cf499af59c8f1dee7189"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}, "pandemonium_engine": {"master": "54643bc1fc76248bc03d5ecdaaaa4c10616a2f61"}} \ No newline at end of file diff --git a/game/addons/world_generator/ui/RectView.gd b/game/addons/world_generator/ui/RectView.gd index 61b2b4a..3a75372 100644 --- a/game/addons/world_generator/ui/RectView.gd +++ b/game/addons/world_generator/ui/RectView.gd @@ -44,10 +44,10 @@ func apply_zoom() -> void: var p : MarginContainer = get_parent() as MarginContainer - p.add_constant_override("margin_left", min(rect.size.x / 4.0, 50 * _rect_scale)) - p.add_constant_override("margin_right", min(rect.size.x / 4.0, 50 * _rect_scale)) - p.add_constant_override("margin_top", min(rect.size.y / 4.0, 50 * _rect_scale)) - p.add_constant_override("margin_bottom", min(rect.size.y / 4.0, 50 * _rect_scale)) + p.add_theme_constant_override("margin_left", min(rect.size.x / 4.0, 50 * _rect_scale)) + p.add_theme_constant_override("margin_right", min(rect.size.x / 4.0, 50 * _rect_scale)) + p.add_theme_constant_override("margin_top", min(rect.size.y / 4.0, 50 * _rect_scale)) + p.add_theme_constant_override("margin_bottom", min(rect.size.y / 4.0, 50 * _rect_scale)) for c in get_children(): c.set_editor_rect_scale(_rect_scale) diff --git a/game/addons/world_generator/widgets/EditorZoomWidget.gd b/game/addons/world_generator/widgets/EditorZoomWidget.gd index c0579b6..994977c 100644 --- a/game/addons/world_generator/widgets/EditorZoomWidget.gd +++ b/game/addons/world_generator/widgets/EditorZoomWidget.gd @@ -49,9 +49,9 @@ func _init() -> void: zoom_reset = Button.new() zoom_reset.set_flat(true) add_child(zoom_reset) - zoom_reset.add_constant_override("outline_size", 1) - zoom_reset.add_color_override("font_outline_color", Color(0, 0, 0)) - zoom_reset.add_color_override("font_color", Color(1, 1, 1)) + zoom_reset.add_theme_constant_override("outline_size", 1) + zoom_reset.add_theme_color_override("font_outline_color", Color(0, 0, 0)) + zoom_reset.add_theme_color_override("font_color", Color(1, 1, 1)) zoom_reset.connect("pressed", self, "_button_zoom_reset") zoom_reset.set_shortcut(ED_SHORTCUT("canvas_item_editor/zoom_reset", tr("Zoom Reset"), KEY_MASK_CMD | KEY_0)) zoom_reset.set_focus_mode(FOCUS_NONE) @@ -67,7 +67,7 @@ func _init() -> void: _update_zoom_label() - add_constant_override("separation", round(-8)) + add_theme_constant_override("separation", round(-8)) func get_zoom() -> float: return zoom @@ -173,8 +173,8 @@ func _button_zoom_plus() -> void: func _notification(p_what : int) -> void: if (p_what == NOTIFICATION_ENTER_TREE || p_what == NOTIFICATION_THEME_CHANGED): - zoom_minus.icon = get_icon("ZoomLess", "EditorIcons") - zoom_plus.icon = get_icon("ZoomMore", "EditorIcons") + zoom_minus.icon = get_theme_icon("ZoomLess", "EditorIcons") + zoom_plus.icon = get_theme_icon("ZoomMore", "EditorIcons") #from godot editor/editor_Settings.cpp func ED_SHORTCUT(p_path : String, p_name : String, p_keycode : int, editor_settings : EditorSettings = null) -> ShortCut: diff --git a/game/tilesets/Terrain.tscn b/game/tilesets/Terrain.tscn index 9e88ff9..01a55fc 100644 --- a/game/tilesets/Terrain.tscn +++ b/game/tilesets/Terrain.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://tilesets/tileset.tres" type="RTileSet" id=1] +[ext_resource path="res://tilesets/tileset.tres" type="TileSet" id=1] -[node name="Terrain" type="RTileMap"] +[node name="Terrain" type="TileMap"] z_index = -10 tile_set = ExtResource( 1 ) cell_size = Vector2( 16, 16 ) diff --git a/game/tilesets/tileset.tres b/game/tilesets/tileset.tres index ed8d39c..a0a24e8 100644 --- a/game/tilesets/tileset.tres +++ b/game/tilesets/tileset.tres @@ -1,4 +1,4 @@ -[gd_resource type="RTileSet" load_steps=7 format=2] +[gd_resource type="TileSet" load_steps=7 format=2] [ext_resource path="res://tilesets/tiles.png" type="Texture" id=1] [ext_resource path="res://tilesets/new_atlastexture.tres" type="Texture" id=2] diff --git a/game/ui/numbers/Number.gd b/game/ui/numbers/Number.gd index 6bd67d2..89bc7ef 100644 --- a/game/ui/numbers/Number.gd +++ b/game/ui/numbers/Number.gd @@ -74,7 +74,7 @@ func setup(pos : Vector3, color : Color, value : int, crit : bool) -> void: camera = get_tree().get_root().get_camera() as Camera text = str(value) - add_color_override("font_color", color) + add_theme_color_override("font_color", color) if crit: animation_player.play("crit") diff --git a/game/world/WorldLayer.tscn b/game/world/WorldLayer.tscn index 58aa235..a590613 100644 --- a/game/world/WorldLayer.tscn +++ b/game/world/WorldLayer.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://tilesets/tileset.tres" type="RTileSet" id=1] +[ext_resource path="res://tilesets/tileset.tres" type="TileSet" id=1] [ext_resource path="res://world/WorldLayer.gd" type="Script" id=2]