From 9791aa763d5629f28cf973d1bbd1ec50978ecab8 Mon Sep 17 00:00:00 2001 From: nc5432 Date: Fri, 18 Apr 2025 14:00:41 -0400 Subject: [PATCH] Leftover changes from update --- ...lding-642cba253aa80dfa90e337225c403039.cfg | 4 +-- ...lding-3789deff2bc99b45d8277ffe1499943c.cfg | 4 +-- ...lding-635d0b17e01d45cf3560455fd777ec5e.cfg | 4 +-- ...lding-001a793bbb290e112acb0147e3ee4aa8.cfg | 4 +-- ...lding-e70872b585cbdbae66a0a376d8d42fde.cfg | 4 +-- ...lding-7235a06e74892f00915a50699b59da22.cfg | 4 +-- ...lding-f655db739716e3a466ae49855e618a96.cfg | 4 +-- ...lding-f59213224c80238b001819652edf7ded.cfg | 4 +-- ...lding-84b78cca86624274cb1c175ddf38b28e.cfg | 4 +-- ...lding-bddc628f76fc54fe7b7e80ac49841ebc.cfg | 4 +-- ...lding-f53619786d5568e19c4c78dce0dad3cb.cfg | 4 +-- ...lding-4c09e892149250bf3e7479302493ee3a.cfg | 4 +-- ...lding-7c72dcab23dd7676661a0fc4cc6d163f.cfg | 4 +-- .godot/editor/filesystem_update4 | 15 +++++++++++ ...state-10d6ba27c95124e9e2f66cb8ebb57635.cfg | 27 +++++++++++++++---- ...lding-10d6ba27c95124e9e2f66cb8ebb57635.cfg | 2 +- ...state-0271e18ecf37a36b455ad0b215994549.cfg | 27 +++++++++++++++---- ...lding-0271e18ecf37a36b455ad0b215994549.cfg | 6 ++--- Models/Hats/1.tscn | 2 +- Models/Hats/10.tscn | 2 +- Models/Hats/11.tscn | 2 +- Models/Hats/2.tscn | 2 +- Models/Hats/3.tscn | 2 +- Models/Hats/4.tscn | 2 +- Models/Hats/5.tscn | 2 +- Models/Hats/6.tscn | 2 +- Models/Hats/7.tscn | 2 +- Models/Hats/8.tscn | 2 +- Models/Hats/9.tscn | 2 +- Models/funny_rubber_chicken/chicken.tscn | 2 +- Prefabs/player.tscn | 12 ++++----- Scenes/world.tscn | 5 ++-- 32 files changed, 97 insertions(+), 73 deletions(-) create mode 100644 .godot/editor/filesystem_update4 diff --git a/.godot/editor/1.tscn-folding-642cba253aa80dfa90e337225c403039.cfg b/.godot/editor/1.tscn-folding-642cba253aa80dfa90e337225c403039.cfg index ba8fae5..e860dd4 100644 --- a/.godot/editor/1.tscn-folding-642cba253aa80dfa90e337225c403039.cfg +++ b/.godot/editor/1.tscn-folding-642cba253aa80dfa90e337225c403039.cfg @@ -1,5 +1,3 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Transform", "meshes")] -resource_unfolds=["res://Models/bag_on_the_head/scene.gltf::ArrayMesh_8kt1e", PackedStringArray("Resource")] -nodes_folded=[] +sections_unfolded=PackedStringArray() diff --git a/.godot/editor/10.tscn-folding-3789deff2bc99b45d8277ffe1499943c.cfg b/.godot/editor/10.tscn-folding-3789deff2bc99b45d8277ffe1499943c.cfg index b9531d7..e860dd4 100644 --- a/.godot/editor/10.tscn-folding-3789deff2bc99b45d8277ffe1499943c.cfg +++ b/.godot/editor/10.tscn-folding-3789deff2bc99b45d8277ffe1499943c.cfg @@ -1,5 +1,3 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Transform", "meshes"), NodePath("Sketchfab_model/Hat_Final_LoPoly_OBJ_cleaner_gles"), PackedStringArray("Transform")] -resource_unfolds=["res://Models/winter_hat/scene.gltf::ArrayMesh_v76d4", PackedStringArray("Resource")] -nodes_folded=[] +sections_unfolded=PackedStringArray() diff --git a/.godot/editor/11.tscn-folding-635d0b17e01d45cf3560455fd777ec5e.cfg b/.godot/editor/11.tscn-folding-635d0b17e01d45cf3560455fd777ec5e.cfg index 5b17aaf..e860dd4 100644 --- a/.godot/editor/11.tscn-folding-635d0b17e01d45cf3560455fd777ec5e.cfg +++ b/.godot/editor/11.tscn-folding-635d0b17e01d45cf3560455fd777ec5e.cfg @@ -1,5 +1,3 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Transform", "meshes")] -resource_unfolds=["res://Models/worn_baseball_ball/scene.gltf::ArrayMesh_xlguo", PackedStringArray("Resource")] -nodes_folded=[] +sections_unfolded=PackedStringArray() diff --git a/.godot/editor/2.tscn-folding-001a793bbb290e112acb0147e3ee4aa8.cfg b/.godot/editor/2.tscn-folding-001a793bbb290e112acb0147e3ee4aa8.cfg index 748c69e..e860dd4 100644 --- a/.godot/editor/2.tscn-folding-001a793bbb290e112acb0147e3ee4aa8.cfg +++ b/.godot/editor/2.tscn-folding-001a793bbb290e112acb0147e3ee4aa8.cfg @@ -1,5 +1,3 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Transform", "meshes")] -resource_unfolds=["res://Models/christmas_hat/scene.gltf::ArrayMesh_t0nv1", PackedStringArray("Resource")] -nodes_folded=[] +sections_unfolded=PackedStringArray() diff --git a/.godot/editor/3.tscn-folding-e70872b585cbdbae66a0a376d8d42fde.cfg b/.godot/editor/3.tscn-folding-e70872b585cbdbae66a0a376d8d42fde.cfg index e8248f1..e860dd4 100644 --- a/.godot/editor/3.tscn-folding-e70872b585cbdbae66a0a376d8d42fde.cfg +++ b/.godot/editor/3.tscn-folding-e70872b585cbdbae66a0a376d8d42fde.cfg @@ -1,5 +1,3 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Transform", "meshes")] -resource_unfolds=["res://Models/mask/scene.gltf::ArrayMesh_glnp1", PackedStringArray("Resource")] -nodes_folded=[] +sections_unfolded=PackedStringArray() diff --git a/.godot/editor/4.tscn-folding-7235a06e74892f00915a50699b59da22.cfg b/.godot/editor/4.tscn-folding-7235a06e74892f00915a50699b59da22.cfg index 661be7e..e860dd4 100644 --- a/.godot/editor/4.tscn-folding-7235a06e74892f00915a50699b59da22.cfg +++ b/.godot/editor/4.tscn-folding-7235a06e74892f00915a50699b59da22.cfg @@ -1,5 +1,3 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Transform", "meshes")] -resource_unfolds=["res://Models/pokemon_masters_cap/scene.gltf::ArrayMesh_cqfeo", PackedStringArray("Resource")] -nodes_folded=[] +sections_unfolded=PackedStringArray() diff --git a/.godot/editor/5.tscn-folding-f655db739716e3a466ae49855e618a96.cfg b/.godot/editor/5.tscn-folding-f655db739716e3a466ae49855e618a96.cfg index c9b8c30..e860dd4 100644 --- a/.godot/editor/5.tscn-folding-f655db739716e3a466ae49855e618a96.cfg +++ b/.godot/editor/5.tscn-folding-f655db739716e3a466ae49855e618a96.cfg @@ -1,5 +1,3 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Transform", "meshes")] -resource_unfolds=["res://Models/propeller_hat/scene.gltf::ArrayMesh_x7y7n", PackedStringArray("Resource"), "res://Models/propeller_hat/scene.gltf::ArrayMesh_xydcc", PackedStringArray("Resource")] -nodes_folded=[] +sections_unfolded=PackedStringArray() diff --git a/.godot/editor/6.tscn-folding-f59213224c80238b001819652edf7ded.cfg b/.godot/editor/6.tscn-folding-f59213224c80238b001819652edf7ded.cfg index c84f492..e860dd4 100644 --- a/.godot/editor/6.tscn-folding-f59213224c80238b001819652edf7ded.cfg +++ b/.godot/editor/6.tscn-folding-f59213224c80238b001819652edf7ded.cfg @@ -1,5 +1,3 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Transform", "meshes")] -resource_unfolds=["res://Models/stylized_wizard_hat/scene.gltf::ArrayMesh_4iol2", PackedStringArray("Resource")] -nodes_folded=[] +sections_unfolded=PackedStringArray() diff --git a/.godot/editor/7.tscn-folding-84b78cca86624274cb1c175ddf38b28e.cfg b/.godot/editor/7.tscn-folding-84b78cca86624274cb1c175ddf38b28e.cfg index e5ca893..e860dd4 100644 --- a/.godot/editor/7.tscn-folding-84b78cca86624274cb1c175ddf38b28e.cfg +++ b/.godot/editor/7.tscn-folding-84b78cca86624274cb1c175ddf38b28e.cfg @@ -1,5 +1,3 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Transform", "meshes")] -resource_unfolds=["res://Models/top_hat__free_download/scene.gltf::ArrayMesh_o17bw", PackedStringArray("Resource")] -nodes_folded=[] +sections_unfolded=PackedStringArray() diff --git a/.godot/editor/8.tscn-folding-bddc628f76fc54fe7b7e80ac49841ebc.cfg b/.godot/editor/8.tscn-folding-bddc628f76fc54fe7b7e80ac49841ebc.cfg index 55360dd..e860dd4 100644 --- a/.godot/editor/8.tscn-folding-bddc628f76fc54fe7b7e80ac49841ebc.cfg +++ b/.godot/editor/8.tscn-folding-bddc628f76fc54fe7b7e80ac49841ebc.cfg @@ -1,5 +1,3 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Transform", "meshes")] -resource_unfolds=["res://Models/vintage_helmet/scene.gltf::ArrayMesh_loyo4", PackedStringArray("Resource")] -nodes_folded=[] +sections_unfolded=PackedStringArray() diff --git a/.godot/editor/9.tscn-folding-f53619786d5568e19c4c78dce0dad3cb.cfg b/.godot/editor/9.tscn-folding-f53619786d5568e19c4c78dce0dad3cb.cfg index 0ae1181..e860dd4 100644 --- a/.godot/editor/9.tscn-folding-f53619786d5568e19c4c78dce0dad3cb.cfg +++ b/.godot/editor/9.tscn-folding-f53619786d5568e19c4c78dce0dad3cb.cfg @@ -1,5 +1,3 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Transform", "meshes")] -resource_unfolds=["res://Models/white_mask/scene.gltf::ArrayMesh_u2anb", PackedStringArray("Resource"), "res://Models/white_mask/scene.gltf::ArrayMesh_j2pso", PackedStringArray("Resource")] -nodes_folded=[] +sections_unfolded=PackedStringArray() diff --git a/.godot/editor/chicken.tscn-folding-4c09e892149250bf3e7479302493ee3a.cfg b/.godot/editor/chicken.tscn-folding-4c09e892149250bf3e7479302493ee3a.cfg index c532eda..e860dd4 100644 --- a/.godot/editor/chicken.tscn-folding-4c09e892149250bf3e7479302493ee3a.cfg +++ b/.godot/editor/chicken.tscn-folding-4c09e892149250bf3e7479302493ee3a.cfg @@ -1,5 +1,3 @@ [folding] -node_unfolds=[NodePath("Sketchfab_model/a2a4d0ccce7040fc8fb1faf42bcbd7b8_fbx/RootNode/chicken/chicken_Mat_0"), PackedStringArray("Geometry"), NodePath("Sketchfab_model/a2a4d0ccce7040fc8fb1faf42bcbd7b8_fbx/RootNode/chicken/MultiMeshInstance3D"), PackedStringArray("multimesh"), NodePath("Sketchfab_model/a2a4d0ccce7040fc8fb1faf42bcbd7b8_fbx/RootNode/chicken/MultiMeshInstance3D2"), PackedStringArray("multimesh")] -resource_unfolds=["res://Models/funny_rubber_chicken/scene.gltf::ArrayMesh_qrmqd", PackedStringArray("Resource"), "res://Models/funny_rubber_chicken/scene.gltf::ArrayMesh_ler3s", PackedStringArray("Resource")] -nodes_folded=[] +sections_unfolded=PackedStringArray() diff --git a/.godot/editor/environment.tscn-folding-7c72dcab23dd7676661a0fc4cc6d163f.cfg b/.godot/editor/environment.tscn-folding-7c72dcab23dd7676661a0fc4cc6d163f.cfg index 6145abb..e860dd4 100644 --- a/.godot/editor/environment.tscn-folding-7c72dcab23dd7676661a0fc4cc6d163f.cfg +++ b/.godot/editor/environment.tscn-folding-7c72dcab23dd7676661a0fc4cc6d163f.cfg @@ -1,5 +1,3 @@ [folding] -node_unfolds=[NodePath("Plane"), PackedStringArray("surface_material_override", "Global Illumination", "mesh")] -resource_unfolds=["res://Models/environment.glb::ArrayMesh_v7xn3", PackedStringArray("Resource"), "res://Scenes/environment.tscn::StandardMaterial3D_mf5c2", PackedStringArray("Albedo", "UV1"), "res://Scenes/environment.tscn::StandardMaterial3D_mikuy", PackedStringArray("Albedo", "UV1"), "res://Models/environment.glb::ConcavePolygonShape3D_kuak1", PackedStringArray("Resource")] -nodes_folded=[NodePath("Plane/StaticBody3D"), NodePath("Plane/StaticBody3D/CollisionShape3D")] +sections_unfolded=PackedStringArray() diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4 new file mode 100644 index 0000000..dadbf3a --- /dev/null +++ b/.godot/editor/filesystem_update4 @@ -0,0 +1,15 @@ +res://Models/funny_rubber_chicken/chicken.tscn +res://Models/Hats/1.tscn +res://Models/Hats/2.tscn +res://Models/Hats/3.tscn +res://Models/Hats/4.tscn +res://Models/Hats/5.tscn +res://Models/Hats/6.tscn +res://Models/Hats/7.tscn +res://Models/Hats/8.tscn +res://Models/Hats/9.tscn +res://Models/Hats/10.tscn +res://Models/Hats/11.tscn +res://Prefabs/player.tscn +res://Scenes/environment.tscn +res://Scenes/world.tscn diff --git a/.godot/editor/player.tscn-editstate-10d6ba27c95124e9e2f66cb8ebb57635.cfg b/.godot/editor/player.tscn-editstate-10d6ba27c95124e9e2f66cb8ebb57635.cfg index 14b8781..0bb588a 100644 --- a/.godot/editor/player.tscn-editstate-10d6ba27c95124e9e2f66cb8ebb57635.cfg +++ b/.godot/editor/player.tscn-editstate-10d6ba27c95124e9e2f66cb8ebb57635.cfg @@ -59,8 +59,10 @@ Anim={ "Marker3D": 0, "MeshInstance3DCustomAABB": 0, "NavigationLink3D": 0, +"NavigationObstacle3D": 0, "NavigationRegion3D": 0, "OccluderInstance3D": 0, +"Particles3DEmissionShape": 0, "Path3D": 0, "PhysicalBone3D": 0, "RayCast3D": 0, @@ -69,6 +71,8 @@ Anim={ "Skeleton3D": 0, "SoftBody3D": 0, "SpringArm3D": 0, +"SpringBoneCollision3D": 0, +"SpringBoneSimulator3D": 0, "VehicleWheel3D": 0, "VisibleOnScreenNotifier3D": 0, "VoxelGI": 0 @@ -100,17 +104,19 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 21, +"display_mode": 22, "distance": 2.90271, "doppler": false, "frame_time": false, "gizmos": true, +"grid": true, "half_res": false, "information": false, "listener": true, "lock_rotation": false, "orthogonal": false, "position": Vector3(0.0378748, 1.06381, 0.00130387), +"transform_gizmo": true, "use_environment": false, "view_type": 0, "x_rotation": 0.492259, @@ -119,17 +125,19 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 21, +"display_mode": 22, "distance": 4.0, "doppler": false, "frame_time": false, "gizmos": true, +"grid": true, "half_res": false, "information": false, "listener": false, "lock_rotation": false, "orthogonal": false, "position": Vector3(0, 0, 0), +"transform_gizmo": true, "use_environment": false, "view_type": 0, "x_rotation": 0.5, @@ -138,11 +146,12 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": true, -"display_mode": 21, +"display_mode": 22, "distance": 4.0, "doppler": false, "frame_time": false, "gizmos": true, +"grid": true, "half_res": false, "information": false, "listener": false, @@ -150,6 +159,7 @@ Anim={ "orthogonal": false, "position": Vector3(0, 0, 0), "previewing": NodePath("Camera3D"), +"transform_gizmo": true, "use_environment": false, "view_type": 0, "x_rotation": 0.5, @@ -158,17 +168,19 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 21, +"display_mode": 22, "distance": 4.0, "doppler": false, "frame_time": false, "gizmos": true, +"grid": true, "half_res": false, "information": false, "listener": false, "lock_rotation": false, "orthogonal": false, "position": Vector3(0, 0, 0), +"transform_gizmo": true, "use_environment": false, "view_type": 0, "x_rotation": 0.5, @@ -177,4 +189,9 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16907/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/World")]) +Game={ +"camera_override_mode": 2, +"hide_selection": false, +"select_mode": 0 +} +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@21290/@Panel@14/@VBoxContainer@15/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@26/DockVSplitCenter/@VSplitContainer@54/@VBoxContainer@55/@EditorMainScreen@102/MainScreen/@CanvasItemEditor@11482/@VSplitContainer@11134/@HSplitContainer@11136/@HSplitContainer@11138/@Control@11139/@SubViewportContainer@11140/@SubViewport@11141/Player")]) diff --git a/.godot/editor/player.tscn-folding-10d6ba27c95124e9e2f66cb8ebb57635.cfg b/.godot/editor/player.tscn-folding-10d6ba27c95124e9e2f66cb8ebb57635.cfg index 9cc5259..634cb35 100644 --- a/.godot/editor/player.tscn-folding-10d6ba27c95124e9e2f66cb8ebb57635.cfg +++ b/.godot/editor/player.tscn-folding-10d6ba27c95124e9e2f66cb8ebb57635.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Collision"), NodePath("chicken"), PackedStringArray("Transform"), NodePath("CollisionShape3D"), PackedStringArray("Transform"), NodePath("Camera3D"), PackedStringArray("Transform"), NodePath("Camera3D/gun"), PackedStringArray("Transform"), NodePath("Camera3D/gun/MuzzleFlash"), PackedStringArray("Drawing", "Process Material", "process_material", "Draw Passes", "draw_pass_1", "Time"), NodePath("Camera3D/RayCast3D"), PackedStringArray("Transform"), NodePath("Username"), PackedStringArray("Text", "Flags"), NodePath("AudioListener3D"), PackedStringArray("Transform"), NodePath("CanvasLayer"), PackedStringArray("Layer", "Transform", "Follow Viewport")] +node_unfolds=[] resource_unfolds=["res://Prefabs/player.tscn::CapsuleShape3D_ruebo", PackedStringArray(), "res://Prefabs/player.tscn::ParticleProcessMaterial_qufyg", PackedStringArray(), "res://Prefabs/player.tscn::PlaneMesh_yxv4l", PackedStringArray()] nodes_folded=[] diff --git a/.godot/editor/world.tscn-editstate-0271e18ecf37a36b455ad0b215994549.cfg b/.godot/editor/world.tscn-editstate-0271e18ecf37a36b455ad0b215994549.cfg index 271e1a1..3a795be 100644 --- a/.godot/editor/world.tscn-editstate-0271e18ecf37a36b455ad0b215994549.cfg +++ b/.godot/editor/world.tscn-editstate-0271e18ecf37a36b455ad0b215994549.cfg @@ -59,8 +59,10 @@ Anim={ "Marker3D": 0, "MeshInstance3DCustomAABB": 0, "NavigationLink3D": 0, +"NavigationObstacle3D": 0, "NavigationRegion3D": 0, "OccluderInstance3D": 0, +"Particles3DEmissionShape": 0, "Path3D": 0, "PhysicalBone3D": 0, "RayCast3D": 0, @@ -69,6 +71,8 @@ Anim={ "Skeleton3D": 0, "SoftBody3D": 0, "SpringArm3D": 0, +"SpringBoneCollision3D": 0, +"SpringBoneSimulator3D": 0, "VehicleWheel3D": 0, "VisibleOnScreenNotifier3D": 0, "VoxelGI": 0 @@ -100,17 +104,19 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 21, +"display_mode": 22, "distance": 29.5855, "doppler": false, "frame_time": false, "gizmos": true, +"grid": true, "half_res": false, "information": false, "listener": true, "lock_rotation": false, "orthogonal": false, "position": Vector3(-10.9724, -6.21596, -8.25517), +"transform_gizmo": true, "use_environment": false, "view_type": 0, "x_rotation": 0.626538, @@ -119,17 +125,19 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 21, +"display_mode": 22, "distance": 4.0, "doppler": false, "frame_time": false, "gizmos": true, +"grid": true, "half_res": false, "information": false, "listener": false, "lock_rotation": false, "orthogonal": false, "position": Vector3(0, 0, 0), +"transform_gizmo": true, "use_environment": false, "view_type": 0, "x_rotation": 0.5, @@ -138,17 +146,19 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 21, +"display_mode": 22, "distance": 4.0, "doppler": false, "frame_time": false, "gizmos": true, +"grid": true, "half_res": false, "information": false, "listener": false, "lock_rotation": false, "orthogonal": false, "position": Vector3(0, 0, 0), +"transform_gizmo": true, "use_environment": false, "view_type": 0, "x_rotation": 0.5, @@ -157,17 +167,19 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 21, +"display_mode": 22, "distance": 4.0, "doppler": false, "frame_time": false, "gizmos": true, +"grid": true, "half_res": false, "information": false, "listener": false, "lock_rotation": false, "orthogonal": false, "position": Vector3(0, 0, 0), +"transform_gizmo": true, "use_environment": false, "view_type": 0, "x_rotation": 0.5, @@ -176,4 +188,9 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16907/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/World")]) +Game={ +"camera_override_mode": 2, +"hide_selection": false, +"select_mode": 0 +} +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@21290/@Panel@14/@VBoxContainer@15/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@26/DockVSplitCenter/@VSplitContainer@54/@VBoxContainer@55/@EditorMainScreen@102/MainScreen/@CanvasItemEditor@11482/@VSplitContainer@11134/@HSplitContainer@11136/@HSplitContainer@11138/@Control@11139/@SubViewportContainer@11140/@SubViewport@11141/Player")]) diff --git a/.godot/editor/world.tscn-folding-0271e18ecf37a36b455ad0b215994549.cfg b/.godot/editor/world.tscn-folding-0271e18ecf37a36b455ad0b215994549.cfg index 66e095b..054cc73 100644 --- a/.godot/editor/world.tscn-folding-0271e18ecf37a36b455ad0b215994549.cfg +++ b/.godot/editor/world.tscn-folding-0271e18ecf37a36b455ad0b215994549.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("environment"), PackedStringArray("Transform"), NodePath("DirectionalLight3D"), PackedStringArray("Shadow", "Light"), NodePath("CanvasLayer"), PackedStringArray("Layer", "Follow Viewport", "Transform"), NodePath("CanvasLayer/MainMenu"), PackedStringArray("Theme Overrides", "Theme Overrides/styles"), NodePath("CanvasLayer/MainMenu/MarginContainer"), PackedStringArray("Theme Overrides", "Theme Overrides/constants"), NodePath("CanvasLayer/MainMenu/MarginContainer/VBoxContainer"), PackedStringArray("Theme Overrides", "Theme Overrides/constants"), NodePath("CanvasLayer/MainMenu/MarginContainer/VBoxContainer/OptionMenu/Reset"), PackedStringArray("Text Behavior", "Theme Overrides", "Theme Overrides/font_sizes"), NodePath("CanvasLayer/HUD"), PackedStringArray("Mouse"), NodePath("CanvasLayer/HUD/TextureRect"), PackedStringArray("Layout", "Layout/Transform"), NodePath("CanvasLayer/HUD/HealthBar"), PackedStringArray("Theme Overrides", "Theme Overrides/styles", "theme_override_styles/fill", "theme_override_styles/background"), NodePath("MultiplayerSpawner"), PackedStringArray("_spawnable_scene_count_array"), NodePath("WorldEnvironment"), PackedStringArray("environment")] -resource_unfolds=["res://Scenes/world.tscn::StyleBoxFlat_cdng2", PackedStringArray(), "res://Scenes/world.tscn::StyleBoxFlat_ufa2v", PackedStringArray(), "res://Scenes/world.tscn::Environment_8h625", PackedStringArray("Background", "Fog", "Reflected Light", "Adjustments", "Glow", "SDFGI", "SSIL", "SSAO", "SSR", "Tonemap", "Volumetric Fog")] -nodes_folded=[NodePath("CanvasLayer"), NodePath("CanvasLayer/MainMenu/MarginContainer/VBoxContainer/Hosting"), NodePath("CanvasLayer/MainMenu/MarginContainer/VBoxContainer/Joining"), NodePath("CanvasLayer/MainMenu/MarginContainer/VBoxContainer/BaseMenu"), NodePath("CanvasLayer/HUD"), NodePath("CanvasLayer/PauseMenu")] +node_unfolds=[] +resource_unfolds=["res://Scenes/world.tscn::StyleBoxFlat_cdng2", PackedStringArray(), "res://Scenes/world.tscn::StyleBoxFlat_ufa2v", PackedStringArray(), "res://Scenes/world.tscn::Environment_8h625", PackedStringArray()] +nodes_folded=[] diff --git a/Models/Hats/1.tscn b/Models/Hats/1.tscn index 87ccd19..1077290 100644 --- a/Models/Hats/1.tscn +++ b/Models/Hats/1.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://b7asuc4cmt2mv"] [ext_resource type="PackedScene" uid="uid://11ijaox7vxiu" path="res://Models/bag_on_the_head/scene.gltf" id="1_iug7w"] -[ext_resource type="Script" path="res://Scripts/HatHider.gd" id="2_xcppy"] +[ext_resource type="Script" uid="uid://1kxulq6j7j07" path="res://Scripts/HatHider.gd" id="2_xcppy"] [node name="bag_on_the_head" node_paths=PackedStringArray("meshes") instance=ExtResource("1_iug7w")] transform = Transform3D(-2.42077, 3.36929e-08, -3.81727e-07, -6.02693e-08, 1.89662, 0.751056, 3.47621e-07, 0.56346, -2.52807, 0, 1.714, 0) diff --git a/Models/Hats/10.tscn b/Models/Hats/10.tscn index 6bf7a9a..937c778 100644 --- a/Models/Hats/10.tscn +++ b/Models/Hats/10.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://cr7567whc0cow"] [ext_resource type="PackedScene" uid="uid://cgts35q6i48q" path="res://Models/winter_hat/scene.gltf" id="1_mg275"] -[ext_resource type="Script" path="res://Scripts/HatHider.gd" id="2_ab5l6"] +[ext_resource type="Script" uid="uid://1kxulq6j7j07" path="res://Scripts/HatHider.gd" id="2_ab5l6"] [node name="winter_hat" node_paths=PackedStringArray("meshes") instance=ExtResource("1_mg275")] transform = Transform3D(-0.20265, 0, -3.79226e-08, 0, 0.227206, 0, 3.05993e-08, 0, -0.25115, 0.0105914, 1.97822, 0.038739) diff --git a/Models/Hats/11.tscn b/Models/Hats/11.tscn index 6ee08e2..49ae6b0 100644 --- a/Models/Hats/11.tscn +++ b/Models/Hats/11.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://bjn1dwgx0sgp1"] [ext_resource type="PackedScene" uid="uid://n70gb1n6316k" path="res://Models/worn_baseball_ball/scene.gltf" id="1_hygvt"] -[ext_resource type="Script" path="res://Scripts/HatHider.gd" id="2_bakty"] +[ext_resource type="Script" uid="uid://1kxulq6j7j07" path="res://Scripts/HatHider.gd" id="2_bakty"] [node name="scene" node_paths=PackedStringArray("meshes") instance=ExtResource("1_hygvt")] transform = Transform3D(0.614393, 0, 0, 0, 0.614393, 0, 0, 0, 0.614393, 0, 1.78671, 0.0260369) diff --git a/Models/Hats/2.tscn b/Models/Hats/2.tscn index be13565..45a7b2f 100644 --- a/Models/Hats/2.tscn +++ b/Models/Hats/2.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://cr7wek14136qo"] [ext_resource type="PackedScene" uid="uid://dhsc3iy03ivnm" path="res://Models/christmas_hat/scene.gltf" id="1_v5m7x"] -[ext_resource type="Script" path="res://Scripts/HatHider.gd" id="2_os52h"] +[ext_resource type="Script" uid="uid://1kxulq6j7j07" path="res://Scripts/HatHider.gd" id="2_os52h"] [node name="christmas_hat" node_paths=PackedStringArray("meshes") instance=ExtResource("1_v5m7x")] transform = Transform3D(-1.57339, -0.049065, -0.372905, -0.0997067, 1.96592, 0.463433, 0.262876, 0.45199, -2.05617, -0.0696718, 1.94646, 0.0717383) diff --git a/Models/Hats/3.tscn b/Models/Hats/3.tscn index b9031df..9abd6be 100644 --- a/Models/Hats/3.tscn +++ b/Models/Hats/3.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://bj5n582dxey72"] [ext_resource type="PackedScene" uid="uid://06cjtpwfher7" path="res://Models/mask/scene.gltf" id="1_dy8nf"] -[ext_resource type="Script" path="res://Scripts/HatHider.gd" id="2_m70eb"] +[ext_resource type="Script" uid="uid://1kxulq6j7j07" path="res://Scripts/HatHider.gd" id="2_m70eb"] [node name="mask" node_paths=PackedStringArray("meshes") instance=ExtResource("1_dy8nf")] transform = Transform3D(-0.165, -7.16266e-10, -2.82203e-08, -8.87041e-09, 0.17755, 0.0712074, 2.15347e-08, 0.067647, -0.186894, 0, 1.69261, 0) diff --git a/Models/Hats/4.tscn b/Models/Hats/4.tscn index 18f4eea..d7c42eb 100644 --- a/Models/Hats/4.tscn +++ b/Models/Hats/4.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://sp8djkh1glgx"] [ext_resource type="PackedScene" uid="uid://s0n1hxn4gxfc" path="res://Models/pokemon_masters_cap/scene.gltf" id="1_55tv4"] -[ext_resource type="Script" path="res://Scripts/HatHider.gd" id="2_2slac"] +[ext_resource type="Script" uid="uid://1kxulq6j7j07" path="res://Scripts/HatHider.gd" id="2_2slac"] [node name="pokemon_masters_cap" node_paths=PackedStringArray("meshes") instance=ExtResource("1_55tv4")] transform = Transform3D(0.000274786, 0, 0, 0, 0.00025841, 0, 0, 0, 0.000296384, 0, 1.78709, 0) diff --git a/Models/Hats/5.tscn b/Models/Hats/5.tscn index f996a3c..7009009 100644 --- a/Models/Hats/5.tscn +++ b/Models/Hats/5.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://bkkr3mm4bfdwi"] [ext_resource type="PackedScene" uid="uid://nsyxaulf1ylw" path="res://Models/propeller_hat/scene.gltf" id="1_pwy3l"] -[ext_resource type="Script" path="res://Scripts/HatHider.gd" id="2_kq5ue"] +[ext_resource type="Script" uid="uid://1kxulq6j7j07" path="res://Scripts/HatHider.gd" id="2_kq5ue"] [node name="propeller_hat" node_paths=PackedStringArray("meshes") instance=ExtResource("1_pwy3l")] transform = Transform3D(-0.182144, -2.6844e-10, -3.45164e-08, -6.95311e-09, 0.202639, 0.0597313, 2.56862e-08, 0.0529498, -0.228592, 0, 1.853, 0) diff --git a/Models/Hats/6.tscn b/Models/Hats/6.tscn index 7e77592..aec11a3 100644 --- a/Models/Hats/6.tscn +++ b/Models/Hats/6.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://dqha0ejxwqexe"] [ext_resource type="PackedScene" uid="uid://bjr8cts018f8k" path="res://Models/stylized_wizard_hat/scene.gltf" id="1_k0mmh"] -[ext_resource type="Script" path="res://Scripts/HatHider.gd" id="2_0dp14"] +[ext_resource type="Script" uid="uid://1kxulq6j7j07" path="res://Scripts/HatHider.gd" id="2_0dp14"] [node name="scene" node_paths=PackedStringArray("meshes") instance=ExtResource("1_k0mmh")] transform = Transform3D(-0.311491, -5.385e-09, 0.0931687, -0.011425, 0.476421, -0.0568391, -0.0755176, -0.0720774, -0.375698, -0.0225068, -0.0897104, 0.419518) diff --git a/Models/Hats/7.tscn b/Models/Hats/7.tscn index cd62584..2433ae6 100644 --- a/Models/Hats/7.tscn +++ b/Models/Hats/7.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://cuj8bcdwga64y"] [ext_resource type="PackedScene" uid="uid://bo3noe8hcgwy1" path="res://Models/top_hat__free_download/scene.gltf" id="1_dw2sn"] -[ext_resource type="Script" path="res://Scripts/HatHider.gd" id="2_b5d4v"] +[ext_resource type="Script" uid="uid://1kxulq6j7j07" path="res://Scripts/HatHider.gd" id="2_b5d4v"] [node name="tophat" node_paths=PackedStringArray("meshes") instance=ExtResource("1_dw2sn")] transform = Transform3D(0.22, 0, 0, 0, 0.227015, -0.0728829, 0, 0.0621212, 0.266342, 0, 1.87115, 0.0404469) diff --git a/Models/Hats/8.tscn b/Models/Hats/8.tscn index bef7f40..e602cf4 100644 --- a/Models/Hats/8.tscn +++ b/Models/Hats/8.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://cew0qy024scng"] [ext_resource type="PackedScene" uid="uid://b5kwhin0tcp5k" path="res://Models/vintage_helmet/scene.gltf" id="1_xm8pu"] -[ext_resource type="Script" path="res://Scripts/HatHider.gd" id="2_a6bob"] +[ext_resource type="Script" uid="uid://1kxulq6j7j07" path="res://Scripts/HatHider.gd" id="2_a6bob"] [node name="vintage_helmet" node_paths=PackedStringArray("meshes") instance=ExtResource("1_xm8pu")] transform = Transform3D(-0.00190932, 5.27858e-11, -2.83426e-10, 0, 0.00187705, 0.000349584, 2.88299e-10, 0.000349584, -0.00187705, 6.2026e-09, 1.83662, 0.0709494) diff --git a/Models/Hats/9.tscn b/Models/Hats/9.tscn index 71b19e5..6252a6c 100644 --- a/Models/Hats/9.tscn +++ b/Models/Hats/9.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://c5r625huwaisf"] [ext_resource type="PackedScene" uid="uid://b3hnc8dr5t0wn" path="res://Models/white_mask/scene.gltf" id="1_7nxjs"] -[ext_resource type="Script" path="res://Scripts/HatHider.gd" id="2_uepx6"] +[ext_resource type="Script" uid="uid://1kxulq6j7j07" path="res://Scripts/HatHider.gd" id="2_uepx6"] [node name="white_mask" node_paths=PackedStringArray("meshes") instance=ExtResource("1_7nxjs")] transform = Transform3D(-1.80111, -1.20039e-07, -2.48553e-07, 7.07313e-15, 1.99832, -0.654861, 2.71961e-07, -0.794985, -1.64609, -0.00340742, 1.75572, -0.0535585) diff --git a/Models/funny_rubber_chicken/chicken.tscn b/Models/funny_rubber_chicken/chicken.tscn index 7474f83..a3733e5 100644 --- a/Models/funny_rubber_chicken/chicken.tscn +++ b/Models/funny_rubber_chicken/chicken.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://d164amgdtaa5k"] [ext_resource type="PackedScene" uid="uid://dbdwccvwm0mw1" path="res://Models/funny_rubber_chicken/scene.gltf" id="1_yfcfs"] -[ext_resource type="Script" path="res://Scripts/chicken.gd" id="2_iaunv"] +[ext_resource type="Script" uid="uid://dxngbdbpknyf6" path="res://Scripts/chicken.gd" id="2_iaunv"] [node name="chicken" instance=ExtResource("1_yfcfs")] script = ExtResource("2_iaunv") diff --git a/Prefabs/player.tscn b/Prefabs/player.tscn index 3252756..e591fbe 100644 --- a/Prefabs/player.tscn +++ b/Prefabs/player.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=18 format=3 uid="uid://b4lc7asimanmh"] -[ext_resource type="Script" path="res://Scripts/Player.gd" id="1_iv0wx"] +[ext_resource type="Script" uid="uid://c2sb3rub5di0c" path="res://Scripts/Player.gd" id="1_iv0wx"] [ext_resource type="PackedScene" uid="uid://da1qh4xri24f2" path="res://Models/kimber_1911/scene.gltf" id="2_0x8c2"] [ext_resource type="PackedScene" uid="uid://d164amgdtaa5k" path="res://Models/funny_rubber_chicken/chicken.tscn" id="2_607tw"] [ext_resource type="Texture2D" uid="uid://bx0esoasfh733" path="res://addons/kenney_particle_pack/star_06.png" id="3_cnxpw"] @@ -141,10 +141,10 @@ tracks/1/keys = { [sub_resource type="AnimationLibrary" id="AnimationLibrary_md1xh"] _data = { -"RESET": SubResource("Animation_11xgn"), -"idle": SubResource("Animation_fltxy"), -"move": SubResource("Animation_18kkl"), -"shoot": SubResource("Animation_ph2nj") +&"RESET": SubResource("Animation_11xgn"), +&"idle": SubResource("Animation_fltxy"), +&"move": SubResource("Animation_18kkl"), +&"shoot": SubResource("Animation_ph2nj") } [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_nfq0k"] @@ -205,7 +205,7 @@ billboard = 1 [node name="AnimationPlayer" type="AnimationPlayer" parent="."] libraries = { -"": SubResource("AnimationLibrary_md1xh") +&"": SubResource("AnimationLibrary_md1xh") } [node name="MultiplayerSynchronizer" type="MultiplayerSynchronizer" parent="."] diff --git a/Scenes/world.tscn b/Scenes/world.tscn index 72954a6..c5f1618 100644 --- a/Scenes/world.tscn +++ b/Scenes/world.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=7 format=3 uid="uid://10vifa1pd4gb"] -[ext_resource type="Script" path="res://Scripts/world.gd" id="1_iice2"] +[ext_resource type="Script" uid="uid://wm08uf5j20m4" path="res://Scripts/world.gd" id="1_iice2"] [ext_resource type="PackedScene" uid="uid://dpvy7sm57pjn7" path="res://Scenes/environment.tscn" id="1_jscbm"] [ext_resource type="Texture2D" uid="uid://dhytg0w8gqdob" path="res://addons/kenney_particle_pack/circle_05.png" id="3_q45p6"] @@ -219,6 +219,7 @@ grow_vertical = 0 selected = 0 item_count = 12 popup/item_0/text = "None" +popup/item_0/id = 0 popup/item_1/text = "Bag" popup/item_1/id = 1 popup/item_2/text = "Santa Hat" @@ -628,7 +629,7 @@ theme_override_font_sizes/font_size = 30 text = "Quit" [node name="MultiplayerSpawner" type="MultiplayerSpawner" parent="."] -_spawnable_scenes = PackedStringArray("res://Prefabs/player.tscn") +_spawnable_scenes = PackedStringArray("uid://b4lc7asimanmh") spawn_path = NodePath("..") [node name="Music" type="AudioStreamPlayer" parent="."]