From affe6646bb3c90ec009254e9d5892e48889f0f9e Mon Sep 17 00:00:00 2001 From: Nolan A Casey Date: Fri, 1 Dec 2023 23:40:48 -0500 Subject: [PATCH] Updated to Godot 4.2 --- .godot/editor/editor_layout.cfg | 2 +- .godot/editor/filesystem_cache8 | 18 ++++++++---------- .godot/editor/filesystem_update4 | 4 +--- ...tstate-10d6ba27c95124e9e2f66cb8ebb57635.cfg | 4 ++-- .godot/editor/project_metadata.cfg | 4 ++-- ...tstate-0271e18ecf37a36b455ad0b215994549.cfg | 4 ++-- Prefabs/player.tscn | 17 ++++++----------- project.godot | 2 +- 8 files changed, 23 insertions(+), 32 deletions(-) diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg index 42a6b55..5b5c406 100644 --- a/.godot/editor/editor_layout.cfg +++ b/.godot/editor/editor_layout.cfg @@ -20,7 +20,7 @@ dock_filesystem_display_mode=0 dock_filesystem_file_sort=0 dock_filesystem_file_list_display_mode=1 dock_filesystem_selected_paths=PackedStringArray("res://") -dock_filesystem_uncollapsed_paths=PackedStringArray("res://", "res://addons/kenney_particle_pack/") +dock_filesystem_uncollapsed_paths=PackedStringArray("res://addons/kenney_particle_pack/") dock_3="Scene,Import" dock_4="FileSystem" dock_5="Inspector,Node,History" diff --git a/.godot/editor/filesystem_cache8 b/.godot/editor/filesystem_cache8 index c684b03..20bfdf8 100644 --- a/.godot/editor/filesystem_cache8 +++ b/.godot/editor/filesystem_cache8 @@ -1,5 +1,5 @@ ea4bc82a6ad023ab7ee23ee620429895 -::res://::1701488440 +::res://::1701491923 export_presets.cfg::TextFile::-1::1699984723::0::1::::<><>:: icon.svg::CompressedTexture2D::8963615070695796116::1699485144::1699485149::1::::<><>:: ::res://addons/::1699501524 @@ -310,17 +310,15 @@ lambert1_metallicRoughness.png::CompressedTexture2D::8931258458639185901::169966 lambert1_normal.png::CompressedTexture2D::3998376482152544164::1699662585::1699662585::1::::<><>:: ::res://Occlusion Data/::1699669336 environment.occ::ArrayOccluder3D::2660494726846166203::1699668360::0::1::::<><>:: -::res://Prefabs/::1700184003 -player.tscn::PackedScene::4444783912067201683::1700184003::0::1::::<><>::res://Scripts/Player.gd<>uid://da1qh4xri24f2::::res://Models/kimber_1911/scene.gltf<>uid://d164amgdtaa5k::::res://Models/funny_rubber_chicken/chicken.tscn<>uid://bx0esoasfh733::::res://addons/kenney_particle_pack/star_06.png<>uid://cfwx1moklfkfj::::res://Sound Effects/weapon_gun_1911_A_41.ogg -::res://Saves/::1701461604 -options.res::::-1::1701461604::0::1::::<><>:: -::res://Scenes/::1701461604 +::res://Prefabs/::1701490162 +player.tscn::PackedScene::4444783912067201683::1701490162::0::1::::<><>::res://Scripts/Player.gd<>uid://da1qh4xri24f2::::res://Models/kimber_1911/scene.gltf<>uid://d164amgdtaa5k::::res://Models/funny_rubber_chicken/chicken.tscn<>uid://bx0esoasfh733::::res://addons/kenney_particle_pack/star_06.png<>uid://cfwx1moklfkfj::::res://Sound Effects/weapon_gun_1911_A_41.ogg +::res://Scenes/::1701490152 environment.tscn::PackedScene::8256961957080777526::1699669972::0::1::::<><>::uid://ca0iv4endjdmn::::res://Models/environment.glb<>uid://ckhpjran4mily::::res://addons/kenney_prototype_textures/dark/texture_04.png<>uid://c4nnm6ptome8x::::res://addons/kenney_prototype_textures/red/texture_10.png<>uid://bd507vee6ic1p::::res://Occlusion Data/environment.occ -world.tscn::PackedScene::1877808985457939721::1701461604::0::1::::<><>::res://Scripts/world.gd<>uid://dpvy7sm57pjn7::::res://Scenes/environment.tscn<>uid://dhytg0w8gqdob::::res://addons/kenney_particle_pack/circle_05.png -::res://Scripts/::1701461604 +world.tscn::PackedScene::1877808985457939721::1701490152::0::1::::<><>::res://Scripts/world.gd<>uid://dpvy7sm57pjn7::::res://Scenes/environment.tscn<>uid://dhytg0w8gqdob::::res://addons/kenney_particle_pack/circle_05.png +::res://Scripts/::1701489694 chicken.gd::GDScript::-1::1699544273::0::1::::<>Node3D<>:: HatHider.gd::GDScript::-1::1699664681::0::1::::<>Node3D<>:: -Player.gd::GDScript::-1::1700183755::0::1::::<>CharacterBody3D<>:: -world.gd::GDScript::-1::1701461604::0::1::::<>Node<>:: +Player.gd::GDScript::-1::1701489123::0::1::::<>CharacterBody3D<>:: +world.gd::GDScript::-1::1701489694::0::1::::<>Node<>:: ::res://Sound Effects/::1699751713 weapon_gun_1911_A_41.ogg::AudioStreamOggVorbis::5170645470017560819::1699751712::1699751713::1::::<><>:: diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4 index ada954f..0c8d0ac 100644 --- a/.godot/editor/filesystem_update4 +++ b/.godot/editor/filesystem_update4 @@ -1,4 +1,2 @@ -res://Prefabs/player.tscn -res://Scripts/Player.gd -res://Scripts/world.gd res://Scenes/world.tscn +res://Prefabs/player.tscn diff --git a/.godot/editor/player.tscn-editstate-10d6ba27c95124e9e2f66cb8ebb57635.cfg b/.godot/editor/player.tscn-editstate-10d6ba27c95124e9e2f66cb8ebb57635.cfg index 36b8eff..4fa950c 100644 --- a/.godot/editor/player.tscn-editstate-10d6ba27c95124e9e2f66cb8ebb57635.cfg +++ b/.godot/editor/player.tscn-editstate-10d6ba27c95124e9e2f66cb8ebb57635.cfg @@ -9,7 +9,7 @@ Anim={ "grid_step": Vector2(8, 8), "grid_visibility": 1, "ofs": Vector2(379, 289), -"primary_grid_steps": 8, +"primary_grid_step": Vector2i(8, 8), "show_edit_locks": true, "show_guides": true, "show_helpers": false, @@ -174,4 +174,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17665/@Control@697/@Panel@698/@VBoxContainer@706/@HSplitContainer@709/@HSplitContainer@717/@HSplitContainer@725/@VBoxContainer@726/@VSplitContainer@728/@VSplitContainer@754/@VBoxContainer@755/@PanelContainer@800/MainScreen/@CanvasItemEditor@10090/@VSplitContainer@9915/@HSplitContainer@9917/@HSplitContainer@9919/@Control@9920/@SubViewportContainer@9921/@SubViewport@9922/Player")]) +selected_nodes=Array[NodePath]([]) diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg index 868ffdf..5c4c0ca 100644 --- a/.godot/editor/project_metadata.cfg +++ b/.godot/editor/project_metadata.cfg @@ -1,13 +1,13 @@ [editor_metadata] -executable_path="/home/nc543/Documents/Godot/Versions/Godot_v4.1.3-stable_mono_linux_x86_64/Godot_v4.1.3-stable_mono_linux.x86_64" +executable_path="/home/nc543/Documents/Godot/Versions/Godot_v4.2-stable_mono_linux_x86_64/Godot_v4.2-stable_mono_linux.x86_64" use_advanced_connections=false [debug_options] run_live_debug=true run_reload_scripts=true -run_debug_instances=1 +run_debug_instances=2 [dialog_bounds] diff --git a/.godot/editor/world.tscn-editstate-0271e18ecf37a36b455ad0b215994549.cfg b/.godot/editor/world.tscn-editstate-0271e18ecf37a36b455ad0b215994549.cfg index 076561d..9c97640 100644 --- a/.godot/editor/world.tscn-editstate-0271e18ecf37a36b455ad0b215994549.cfg +++ b/.godot/editor/world.tscn-editstate-0271e18ecf37a36b455ad0b215994549.cfg @@ -9,7 +9,7 @@ Anim={ "grid_step": Vector2(8, 8), "grid_visibility": 1, "ofs": Vector2(-23.9029, -9.53478), -"primary_grid_steps": 8, +"primary_grid_step": Vector2i(8, 8), "show_edit_locks": true, "show_guides": true, "show_helpers": false, @@ -173,4 +173,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17665/@Control@697/@Panel@698/@VBoxContainer@706/@HSplitContainer@709/@HSplitContainer@717/@HSplitContainer@725/@VBoxContainer@726/@VSplitContainer@728/@VSplitContainer@754/@VBoxContainer@755/@PanelContainer@800/MainScreen/@CanvasItemEditor@10090/@VSplitContainer@9915/@HSplitContainer@9917/@HSplitContainer@9919/@Control@9920/@SubViewportContainer@9921/@SubViewport@9922/Player")]) +selected_nodes=Array[NodePath]([]) diff --git a/Prefabs/player.tscn b/Prefabs/player.tscn index fdffca2..815be6c 100644 --- a/Prefabs/player.tscn +++ b/Prefabs/player.tscn @@ -17,9 +17,9 @@ colors = PackedColorArray(1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0) gradient = SubResource("Gradient_0qhfw") [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_qufyg"] -gravity = Vector3(0, 0, 0) angle_min = -122.1 angle_max = 122.0 +gravity = Vector3(0, 0, 0) color_ramp = SubResource("GradientTexture1D_gqsi8") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5vymy"] @@ -150,24 +150,19 @@ _data = { [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_nfq0k"] properties/0/path = NodePath(".:position") properties/0/spawn = true -properties/0/sync = true -properties/0/watch = false +properties/0/replication_mode = 1 properties/1/path = NodePath(".:rotation") properties/1/spawn = true -properties/1/sync = true -properties/1/watch = false +properties/1/replication_mode = 1 properties/2/path = NodePath("Camera3D:rotation") properties/2/spawn = false -properties/2/sync = false -properties/2/watch = true +properties/2/replication_mode = 2 properties/3/path = NodePath("Username:text") properties/3/spawn = false -properties/3/sync = false -properties/3/watch = true +properties/3/replication_mode = 2 properties/4/path = NodePath(".:hat") properties/4/spawn = false -properties/4/sync = false -properties/4/watch = true +properties/4/replication_mode = 2 [node name="Player" type="CharacterBody3D"] collision_layer = 3 diff --git a/project.godot b/project.godot index 61ae4aa..97ae3fa 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="Fowl Play" run/main_scene="res://Scenes/world.tscn" -config/features=PackedStringArray("4.1", "Forward Plus") +config/features=PackedStringArray("4.2", "Forward Plus") config/icon="res://icon.svg" [display]