Relintai/broken_seals_2ds
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals_2ds.git synced 2024-11-18 12:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated the engine to the latest.

Browse Source
This commit is contained in:
Relintai 2022-10-10 13:24:01 +02:00
parent 675bec77c8
commit 32b6751619
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -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"}} {"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"}}

8
game/addons/world_generator/ui/RectView.gd
View File

@ -44,10 +44,10 @@ func apply_zoom() -> void:
var p : MarginContainer = get_parent() as MarginContainer var p : MarginContainer = get_parent() as MarginContainer
p.add_constant_override("margin_left", min(rect.size.x / 4.0, 50 * _rect_scale)) p.add_theme_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_theme_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_theme_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_bottom", min(rect.size.y / 4.0, 50 * _rect_scale))
for c in get_children(): for c in get_children():
c.set_editor_rect_scale(_rect_scale) c.set_editor_rect_scale(_rect_scale)

12
game/addons/world_generator/widgets/EditorZoomWidget.gd
View File

@ -49,9 +49,9 @@ func _init() -> void:
zoom_reset = Button.new() zoom_reset = Button.new()
zoom_reset.set_flat(true) zoom_reset.set_flat(true)
add_child(zoom_reset) add_child(zoom_reset)
zoom_reset.add_constant_override("outline_size", 1) zoom_reset.add_theme_constant_override("outline_size", 1)
zoom_reset.add_color_override("font_outline_color", Color(0, 0, 0)) zoom_reset.add_theme_color_override("font_outline_color", Color(0, 0, 0))
zoom_reset.add_color_override("font_color", Color(1, 1, 1)) zoom_reset.add_theme_color_override("font_color", Color(1, 1, 1))
zoom_reset.connect("pressed", self, "_button_zoom_reset") 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_shortcut(ED_SHORTCUT("canvas_item_editor/zoom_reset", tr("Zoom Reset"), KEY_MASK_CMD | KEY_0))
zoom_reset.set_focus_mode(FOCUS_NONE) zoom_reset.set_focus_mode(FOCUS_NONE)
@ -67,7 +67,7 @@ func _init() -> void:
_update_zoom_label() _update_zoom_label()
add_constant_override("separation", round(-8)) add_theme_constant_override("separation", round(-8))
func get_zoom() -> float: func get_zoom() -> float:
return zoom return zoom
@ -173,8 +173,8 @@ func _button_zoom_plus() -> void:
func _notification(p_what : int) -> void: func _notification(p_what : int) -> void:
if (p_what == NOTIFICATION_ENTER_TREE || p_what == NOTIFICATION_THEME_CHANGED): if (p_what == NOTIFICATION_ENTER_TREE || p_what == NOTIFICATION_THEME_CHANGED):
zoom_minus.icon = get_icon("ZoomLess", "EditorIcons") zoom_minus.icon = get_theme_icon("ZoomLess", "EditorIcons")
zoom_plus.icon = get_icon("ZoomMore", "EditorIcons") zoom_plus.icon = get_theme_icon("ZoomMore", "EditorIcons")
#from godot editor/editor_Settings.cpp #from godot editor/editor_Settings.cpp
func ED_SHORTCUT(p_path : String, p_name : String, p_keycode : int, editor_settings : EditorSettings = null) -> ShortCut: func ED_SHORTCUT(p_path : String, p_name : String, p_keycode : int, editor_settings : EditorSettings = null) -> ShortCut:

4
game/tilesets/Terrain.tscn
View File

@ -1,8 +1,8 @@
[gd_scene load_steps=2 format=2] [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 z_index = -10
tile_set = ExtResource( 1 ) tile_set = ExtResource( 1 )
cell_size = Vector2( 16, 16 ) cell_size = Vector2( 16, 16 )

2
game/tilesets/tileset.tres
View File

@ -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/tiles.png" type="Texture" id=1]
[ext_resource path="res://tilesets/new_atlastexture.tres" type="Texture" id=2] [ext_resource path="res://tilesets/new_atlastexture.tres" type="Texture" id=2]

2
game/ui/numbers/Number.gd
View File

@ -74,7 +74,7 @@ func setup(pos : Vector3, color : Color, value : int, crit : bool) -> void:
camera = get_tree().get_root().get_camera() as Camera camera = get_tree().get_root().get_camera() as Camera
text = str(value) text = str(value)
add_color_override("font_color", color) add_theme_color_override("font_color", color)
if crit: if crit:
animation_player.play("crit") animation_player.play("crit")

2
game/world/WorldLayer.tscn
View File

@ -1,6 +1,6 @@
[gd_scene load_steps=3 format=2] [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] [ext_resource path="res://world/WorldLayer.gd" type="Script" id=2]