From db62502b8a0d0f42f9d6718cb34bfbfbe728b6fe Mon Sep 17 00:00:00 2001 From: Jaap Marsman Date: Sun, 6 Aug 2023 04:38:10 +0800 Subject: [PATCH] began conversion to Godot 4.1 --- godot/Main.tscn | 35 ++--------------------------------- godot/project.godot | 8 ++++---- 2 files changed, 6 insertions(+), 37 deletions(-) diff --git a/godot/Main.tscn b/godot/Main.tscn index d979aee..260b5e5 100644 --- a/godot/Main.tscn +++ b/godot/Main.tscn @@ -15,9 +15,6 @@ [sub_resource type="FontFile" id="1"] fallbacks = Array[Font]([ExtResource("9")]) -face_index = null -embolden = null -transform = null cache/0/16/0/ascent = 0.0 cache/0/16/0/descent = 0.0 cache/0/16/0/underline_position = 0.0 @@ -27,9 +24,6 @@ cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) [sub_resource type="FontFile" id="2"] fallbacks = Array[Font]([ExtResource("9")]) -face_index = null -embolden = null -transform = null cache/0/16/0/ascent = 0.0 cache/0/16/0/descent = 0.0 cache/0/16/0/underline_position = 0.0 @@ -39,9 +33,6 @@ cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) [sub_resource type="FontFile" id="3"] fallbacks = Array[Font]([ExtResource("9")]) -face_index = null -embolden = null -transform = null cache/0/16/0/ascent = 0.0 cache/0/16/0/descent = 0.0 cache/0/16/0/underline_position = 0.0 @@ -51,9 +42,6 @@ cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) [sub_resource type="FontFile" id="4"] fallbacks = Array[Font]([ExtResource("9")]) -face_index = null -embolden = null -transform = null cache/0/16/0/ascent = 0.0 cache/0/16/0/descent = 0.0 cache/0/16/0/underline_position = 0.0 @@ -63,9 +51,6 @@ cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) [sub_resource type="FontFile" id="5"] fallbacks = Array[Font]([ExtResource("9")]) -face_index = null -embolden = null -transform = null cache/0/16/0/ascent = 0.0 cache/0/16/0/descent = 0.0 cache/0/16/0/underline_position = 0.0 @@ -75,9 +60,6 @@ cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) [sub_resource type="FontFile" id="6"] fallbacks = Array[Font]([ExtResource("9")]) -face_index = null -embolden = null -transform = null cache/0/16/0/ascent = 0.0 cache/0/16/0/descent = 0.0 cache/0/16/0/underline_position = 0.0 @@ -87,9 +69,6 @@ cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) [sub_resource type="FontFile" id="8"] fallbacks = Array[Font]([ExtResource("9")]) -face_index = null -embolden = null -transform = null cache/0/16/0/ascent = 0.0 cache/0/16/0/descent = 0.0 cache/0/16/0/underline_position = 0.0 @@ -172,9 +151,6 @@ func _on_ButtonB_pressed(): [sub_resource type="FontFile" id="9"] fallbacks = Array[Font]([ExtResource("18")]) -face_index = null -embolden = null -transform = null cache/0/16/0/ascent = 0.0 cache/0/16/0/descent = 0.0 cache/0/16/0/underline_position = 0.0 @@ -184,9 +160,6 @@ cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) [sub_resource type="FontFile" id="10"] fallbacks = Array[Font]([ExtResource("18")]) -face_index = null -embolden = null -transform = null cache/0/16/0/ascent = 0.0 cache/0/16/0/descent = 0.0 cache/0/16/0/underline_position = 0.0 @@ -196,9 +169,6 @@ cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) [sub_resource type="FontFile" id="11"] fallbacks = Array[Font]([ExtResource("18")]) -face_index = null -embolden = null -transform = null cache/0/16/0/ascent = 0.0 cache/0/16/0/descent = 0.0 cache/0/16/0/underline_position = 0.0 @@ -208,9 +178,6 @@ cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) [sub_resource type="FontFile" id="13"] fallbacks = Array[Font]([ExtResource("18")]) -face_index = null -embolden = null -transform = null cache/0/16/0/ascent = 0.0 cache/0/16/0/descent = 0.0 cache/0/16/0/underline_position = 0.0 @@ -1421,6 +1388,8 @@ _import_path = NodePath("") unique_name_in_owner = false process_mode = 0 process_priority = 0 +process_physics_priority = 0 +process_thread_group = 0 editor_description = "" script = null diff --git a/godot/project.godot b/godot/project.godot index 1453943..3457a57 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="School Simulator" run/main_scene="res://Main.tscn" -config/features=PackedStringArray("4.0") +config/features=PackedStringArray("4.1") config/icon="res://icon.png" [autoload] @@ -43,19 +43,19 @@ import/fbx/enabled=false cam_drag={ "deadzone": 0.5, -"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"pressed":false,"double_click":false,"script":null) +"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"canceled":false,"pressed":false,"double_click":false,"script":null) ] } cam_zoom_in={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":4,"pressed":false,"double_click":false,"script":null) +, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":4,"canceled":false,"pressed":false,"double_click":false,"script":null) ] } cam_zoom_out={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":5,"pressed":false,"double_click":false,"script":null) +, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":5,"canceled":false,"pressed":false,"double_click":false,"script":null) ] }