diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg index 7d935fc..bfb0868 100644 --- a/.godot/editor/editor_layout.cfg +++ b/.godot/editor/editor_layout.cfg @@ -10,13 +10,28 @@ dock_hsplit_1=0 dock_hsplit_2=682 dock_hsplit_3=-140 dock_hsplit_4=0 +dock_1_selected_tab_idx=0 +dock_2_selected_tab_idx=0 +dock_3_selected_tab_idx=0 +dock_4_selected_tab_idx=0 +dock_5_selected_tab_idx=0 +dock_6_selected_tab_idx=0 +dock_7_selected_tab_idx=0 +dock_8_selected_tab_idx=0 +dock_floating={} +dock_filesystem_selected_paths=PackedStringArray("res://") +dock_filesystem_uncollapsed_paths=PackedStringArray("res://") dock_3="Scene,Import" dock_4="FileSystem" -dock_5="Inspector,Node" +dock_5="Inspector,Node,History" [EditorNode] -open_scenes=["res://platform_character.tscn", "res://main.tscn"] +open_scenes=PackedStringArray("res://platform_character.tscn", "res://main.tscn") +current_scene="res://main.tscn" +center_split_offset=0 +selected_default_debugger_tab_idx=0 +selected_main_editor_idx=0 [ScriptEditor] @@ -24,3 +39,10 @@ open_scripts=["res://platform_character.gd"] open_help=[] script_split_offset=140 list_split_offset=0 +selected_script="res://platform_character.gd" + +[ShaderEditor] + +open_shaders=[] +split_offset=0 +selected_shader="" diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4 index f362d4e..4cfafeb 100644 --- a/.godot/editor/filesystem_update4 +++ b/.godot/editor/filesystem_update4 @@ -1,3 +1,2 @@ res://platform_character.tscn res://main.tscn -res://platform_character.gd diff --git a/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg b/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg index 3d54da3..d524bef 100644 --- a/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg +++ b/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg @@ -35,7 +35,7 @@ Anim={ "zoom": 0.709377 } 3D={ -"fov": 70.0, +"fov": 70.01, "gizmos_status": { "AudioListener3D": 0, "AudioStreamPlayer3D": 0, @@ -96,7 +96,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 19, +"display_mode": 20, "distance": 4.0, "doppler": false, "frame_time": false, @@ -104,9 +104,10 @@ Anim={ "half_res": false, "information": false, "listener": true, +"lock_rotation": false, +"orthogonal": false, "position": Vector3(0, 0, 0), "use_environment": false, -"use_orthogonal": false, "view_type": 0, "x_rotation": 0.5, "y_rotation": -0.5 @@ -114,7 +115,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 19, +"display_mode": 20, "distance": 4.0, "doppler": false, "frame_time": false, @@ -122,9 +123,10 @@ Anim={ "half_res": false, "information": false, "listener": false, +"lock_rotation": false, +"orthogonal": false, "position": Vector3(0, 0, 0), "use_environment": false, -"use_orthogonal": false, "view_type": 0, "x_rotation": 0.5, "y_rotation": -0.5 @@ -132,7 +134,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 19, +"display_mode": 20, "distance": 4.0, "doppler": false, "frame_time": false, @@ -140,9 +142,10 @@ Anim={ "half_res": false, "information": false, "listener": false, +"lock_rotation": false, +"orthogonal": false, "position": Vector3(0, 0, 0), "use_environment": false, -"use_orthogonal": false, "view_type": 0, "x_rotation": 0.5, "y_rotation": -0.5 @@ -150,7 +153,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 19, +"display_mode": 20, "distance": 4.0, "doppler": false, "frame_time": false, @@ -158,13 +161,15 @@ Anim={ "half_res": false, "information": false, "listener": false, +"lock_rotation": false, +"orthogonal": false, "position": Vector3(0, 0, 0), "use_environment": false, -"use_orthogonal": false, "view_type": 0, "x_rotation": 0.5, "y_rotation": -0.5 }], -"zfar": 4000.0, +"zfar": 4000.01, "znear": 0.05 } +selected_nodes=Array[NodePath]([]) diff --git a/.godot/editor/platform_character.tscn-editstate-20f0e217fd33d1eb63fbed82a45b9635.cfg b/.godot/editor/platform_character.tscn-editstate-20f0e217fd33d1eb63fbed82a45b9635.cfg index fb34358..b9733b7 100644 --- a/.godot/editor/platform_character.tscn-editstate-20f0e217fd33d1eb63fbed82a45b9635.cfg +++ b/.godot/editor/platform_character.tscn-editstate-20f0e217fd33d1eb63fbed82a45b9635.cfg @@ -35,7 +35,7 @@ Anim={ "zoom": 0.733294 } 3D={ -"fov": 70.0, +"fov": 70.01, "gizmos_status": { "AudioListener3D": 0, "AudioStreamPlayer3D": 0, @@ -96,7 +96,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 19, +"display_mode": 20, "distance": 4.0, "doppler": false, "frame_time": false, @@ -104,9 +104,10 @@ Anim={ "half_res": false, "information": false, "listener": true, +"lock_rotation": false, +"orthogonal": false, "position": Vector3(0, 0, 0), "use_environment": false, -"use_orthogonal": false, "view_type": 0, "x_rotation": 0.5, "y_rotation": -0.5 @@ -114,7 +115,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 19, +"display_mode": 20, "distance": 4.0, "doppler": false, "frame_time": false, @@ -122,9 +123,10 @@ Anim={ "half_res": false, "information": false, "listener": false, +"lock_rotation": false, +"orthogonal": false, "position": Vector3(0, 0, 0), "use_environment": false, -"use_orthogonal": false, "view_type": 0, "x_rotation": 0.5, "y_rotation": -0.5 @@ -132,7 +134,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 19, +"display_mode": 20, "distance": 4.0, "doppler": false, "frame_time": false, @@ -140,9 +142,10 @@ Anim={ "half_res": false, "information": false, "listener": false, +"lock_rotation": false, +"orthogonal": false, "position": Vector3(0, 0, 0), "use_environment": false, -"use_orthogonal": false, "view_type": 0, "x_rotation": 0.5, "y_rotation": -0.5 @@ -150,7 +153,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 19, +"display_mode": 20, "distance": 4.0, "doppler": false, "frame_time": false, @@ -158,13 +161,15 @@ Anim={ "half_res": false, "information": false, "listener": false, +"lock_rotation": false, +"orthogonal": false, "position": Vector3(0, 0, 0), "use_environment": false, -"use_orthogonal": false, "view_type": 0, "x_rotation": 0.5, "y_rotation": -0.5 }], -"zfar": 4000.0, +"zfar": 4000.01, "znear": 0.05 } +selected_nodes=Array[NodePath]([]) diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg index baf4c72..69a9900 100644 --- a/.godot/editor/project_metadata.cfg +++ b/.godot/editor/project_metadata.cfg @@ -1,6 +1,6 @@ [editor_metadata] -executable_path="/private/var/folders/19/4rvls29j0hq1w0z5wfvn5_dc0000gp/T/AppTranslocation/74C55242-C6BD-47E3-A084-D42993299F4C/d/Godot.app/Contents/MacOS/Godot" +executable_path="/Applications/Godot4.app/Contents/MacOS/Godot" tile_source_sort=0 [debug_options] @@ -25,3 +25,8 @@ editor_settings=Rect2(6300, 900, 1800, 1400) [project_settings] advanced_mode=true + +[linked_properties] + +CharacterBody2D:scale=true +Node2D:scale=true diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg index e54ed4a..4d2ad30 100644 --- a/.godot/editor/script_editor_cache.cfg +++ b/.godot/editor/script_editor_cache.cfg @@ -4,7 +4,7 @@ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), "column": 35, -"folded_lines": [], +"folded_lines": Array[int]([]), "h_scroll_position": 0, "row": 15, "scroll_position": 0.0, diff --git a/platform_character.tscn b/platform_character.tscn index f9bf058..1b455ca 100644 --- a/platform_character.tscn +++ b/platform_character.tscn @@ -14,7 +14,6 @@ rotation = 1.5708 texture = ExtResource("2_b0bm5") [node name="Camera2D" type="Camera2D" parent="."] -current = true zoom = Vector2(1.5, 1.5) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] diff --git a/project.godot b/project.godot index 6b47a1c..9158b65 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="2d_platform_basic" run/main_scene="res://main.tscn" -config/features=PackedStringArray("4.0") +config/features=PackedStringArray("4.1") config/icon="res://icon.png" [display] @@ -23,21 +23,21 @@ window/dpi/allow_hidpi=false move_right={ "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":16777233,"unicode":0,"echo":false,"script":null) -, 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":68,"unicode":0,"echo":false,"script":null) +"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":16777233,"key_label":0,"unicode":0,"echo":false,"script":null) +, 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":68,"key_label":0,"unicode":0,"echo":false,"script":null) ] } move_left={ "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":65,"unicode":0,"echo":false,"script":null) -, 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":16777231,"unicode":0,"echo":false,"script":null) +"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":65,"key_label":0,"unicode":0,"echo":false,"script":null) +, 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":16777231,"key_label":0,"unicode":0,"echo":false,"script":null) ] } jump={ "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":16777232,"unicode":0,"echo":false,"script":null) -, 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":32,"unicode":0,"echo":false,"script":null) -, 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":87,"unicode":0,"echo":false,"script":null) +"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":16777232,"key_label":0,"unicode":0,"echo":false,"script":null) +, 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":32,"key_label":0,"unicode":0,"echo":false,"script":null) +, 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":87,"key_label":0,"unicode":0,"echo":false,"script":null) ] }