diff --git a/XROrigin.tscn b/Prefabs/XROrigin.tscn similarity index 100% rename from XROrigin.tscn rename to Prefabs/XROrigin.tscn diff --git a/Scenes/AlgoScene.tscn b/Scenes/AlgoScene.tscn index 59ed711..c430442 100644 --- a/Scenes/AlgoScene.tscn +++ b/Scenes/AlgoScene.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://22shbqdvnwgo"] -[ext_resource type="Script" uid="uid://b4ldkd3ngs0vp" path="res://main.gd" id="1_m3h4l"] -[ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://XROrigin.tscn" id="2_8pfaf"] +[ext_resource type="Script" path="res://main.gd" id="1_m3h4l"] +[ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://prefabs/XROrigin.tscn" id="2_8pfaf"] [ext_resource type="Material" uid="uid://cmia50cfqxxo4" path="res://textures/dev_material_3d.tres" id="3_gatbn"] [ext_resource type="PackedScene" uid="uid://j7caslh27nor" path="res://stations/Hob.tscn" id="4_3lufs"] [ext_resource type="Sky" uid="uid://c1abtpwhdm2d5" path="res://textures/sky/NightSkyHDRI009_16K.tres" id="5_kh26v"] diff --git a/Scenes/JonScene.tscn b/Scenes/JonScene.tscn index 6392b21..d95f9fb 100644 --- a/Scenes/JonScene.tscn +++ b/Scenes/JonScene.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://do6mrslyqe5qe"] [ext_resource type="Script" uid="uid://d1cefhe3yyyds" path="res://scenes/multiplayer_world.gd" id="1_57ppd"] -[ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://XROrigin.tscn" id="2_o1b3t"] +[ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://prefabs/XROrigin.tscn" id="2_o1b3t"] [ext_resource type="Material" uid="uid://cmia50cfqxxo4" path="res://textures/dev_material_3d.tres" id="3_irf4n"] [ext_resource type="Sky" uid="uid://c1abtpwhdm2d5" path="res://textures/sky/NightSkyHDRI009_16K.tres" id="7_n8fyw"] [ext_resource type="PackedScene" uid="uid://q37nqadkibbp" path="res://scenes/door.tscn" id="10_l51r2"] @@ -79,7 +79,7 @@ transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, -1.8 transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 1.8000001, 0, 1.8000001) [node name="ItemsSpawner" type="MultiplayerSpawner" parent="." unique_id=2051771581] -_spawnable_scenes = PackedStringArray("uid://cwwnbx5uat3fw") +_spawnable_scenes = PackedStringArray("res://stations/csg_box_3d.tscn") spawn_path = NodePath("../WorldContent") [node name="PlayersSpawner" type="MultiplayerSpawner" parent="." unique_id=619815427] diff --git a/Scenes/mainMenu.tscn b/Scenes/mainMenu.tscn index cb985b0..e491716 100644 --- a/Scenes/mainMenu.tscn +++ b/Scenes/mainMenu.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://c1nv4w33fedj6"] -[ext_resource type="Script" uid="uid://b4ldkd3ngs0vp" path="res://main.gd" id="1_72gy5"] -[ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://XROrigin.tscn" id="2_8wkh3"] +[ext_resource type="Script" path="res://main.gd" id="1_72gy5"] +[ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://prefabs/XROrigin.tscn" id="2_8wkh3"] [ext_resource type="Material" uid="uid://cmia50cfqxxo4" path="res://textures/dev_material_3d.tres" id="3_m56cs"] [ext_resource type="PackedScene" uid="uid://j7caslh27nor" path="res://stations/Hob.tscn" id="4_5kvh0"] [ext_resource type="Sky" uid="uid://c1abtpwhdm2d5" path="res://textures/sky/NightSkyHDRI009_16K.tres" id="5_l1qm6"] diff --git a/Scenes/multiPlayer.tscn b/Scenes/multiPlayer.tscn index 40daac5..6561d9d 100644 --- a/Scenes/multiPlayer.tscn +++ b/Scenes/multiPlayer.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://c30i6h32w8p47"] [ext_resource type="Script" uid="uid://d1cefhe3yyyds" path="res://scenes/multiplayer_world.gd" id="1_kdan8"] -[ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://XROrigin.tscn" id="2_g30gi"] +[ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://prefabs/XROrigin.tscn" id="2_g30gi"] [ext_resource type="Material" uid="uid://cmia50cfqxxo4" path="res://textures/dev_material_3d.tres" id="3_75ecy"] [ext_resource type="Sky" uid="uid://c1abtpwhdm2d5" path="res://textures/sky/NightSkyHDRI009_16K.tres" id="5_c3xgf"] [ext_resource type="Script" uid="uid://fyd2rjramhbb" path="res://prefabs/kitchen_instantiator.gd" id="6_pw2j5"] diff --git a/Scenes/test_small.tscn b/Scenes/test_small.tscn index e3e2882..7f1d43e 100644 --- a/Scenes/test_small.tscn +++ b/Scenes/test_small.tscn @@ -1,8 +1,8 @@ [gd_scene format=3 uid="uid://dbgu4r127ke5v"] -[ext_resource type="Script" uid="uid://b4ldkd3ngs0vp" path="res://main.gd" id="1_1ymas"] +[ext_resource type="Script" path="res://main.gd" id="1_1ymas"] [ext_resource type="Sky" uid="uid://c1abtpwhdm2d5" path="res://textures/sky/NightSkyHDRI009_16K.tres" id="2_1jq86"] -[ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://XROrigin.tscn" id="3_bryd6"] +[ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://prefabs/XROrigin.tscn" id="3_bryd6"] [ext_resource type="Material" uid="uid://cmia50cfqxxo4" path="res://textures/dev_material_3d.tres" id="4_kpgm6"] [ext_resource type="PackedScene" uid="uid://j7caslh27nor" path="res://stations/Hob.tscn" id="5_gfdi7"] [ext_resource type="PackedScene" uid="uid://dvrk268s7gkxh" path="res://stations/sink.tscn" id="6_fmmg3"] diff --git a/Stations/csg_box_3d.tscn b/Stations/csg_box_3d.tscn deleted file mode 100644 index 3c17705..0000000 --- a/Stations/csg_box_3d.tscn +++ /dev/null @@ -1,3 +0,0 @@ -[gd_scene format=3 uid="uid://cwwnbx5uat3fw"] - -[node name="CSGBox3D" type="CSGBox3D" unique_id=725518829] diff --git a/RecipeManager.md b/documentation/RecipeManager.md similarity index 100% rename from RecipeManager.md rename to documentation/RecipeManager.md diff --git a/library_changes.md b/documentation/library_changes.md similarity index 100% rename from library_changes.md rename to documentation/library_changes.md diff --git a/GameManager.gd b/global/GameManager.gd similarity index 100% rename from GameManager.gd rename to global/GameManager.gd diff --git a/GameManager.gd.uid b/global/GameManager.gd.uid similarity index 100% rename from GameManager.gd.uid rename to global/GameManager.gd.uid diff --git a/RecipeManager.gd b/global/RecipeManager.gd similarity index 100% rename from RecipeManager.gd rename to global/RecipeManager.gd diff --git a/RecipeManager.gd.uid b/global/RecipeManager.gd.uid similarity index 100% rename from RecipeManager.gd.uid rename to global/RecipeManager.gd.uid diff --git a/Signals.gd b/global/Signals.gd similarity index 100% rename from Signals.gd rename to global/Signals.gd diff --git a/Signals.gd.uid b/global/Signals.gd.uid similarity index 100% rename from Signals.gd.uid rename to global/Signals.gd.uid diff --git a/global_key_events.gd b/global/global_key_events.gd similarity index 100% rename from global_key_events.gd rename to global/global_key_events.gd diff --git a/global_key_events.gd.uid b/global/global_key_events.gd.uid similarity index 100% rename from global_key_events.gd.uid rename to global/global_key_events.gd.uid diff --git a/helper.gd b/global/helper.gd similarity index 100% rename from helper.gd rename to global/helper.gd diff --git a/helper.gd.uid b/global/helper.gd.uid similarity index 100% rename from helper.gd.uid rename to global/helper.gd.uid diff --git a/test/multiPlayerTest.tscn b/test/multiPlayerTest.tscn index fe69c2e..ce0e892 100644 --- a/test/multiPlayerTest.tscn +++ b/test/multiPlayerTest.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://bodj8op527o2c"] [ext_resource type="Script" uid="uid://d1cefhe3yyyds" path="res://scenes/multiplayer_world.gd" id="1_6uucx"] -[ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://XROrigin.tscn" id="2_j7vd1"] +[ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://prefabs/XROrigin.tscn" id="2_j7vd1"] [ext_resource type="Material" uid="uid://cmia50cfqxxo4" path="res://textures/dev_material_3d.tres" id="3_ssbaf"] [ext_resource type="Sky" uid="uid://c1abtpwhdm2d5" path="res://textures/sky/NightSkyHDRI009_16K.tres" id="4_081u3"] [ext_resource type="PackedScene" uid="uid://j7caslh27nor" path="res://stations/Hob.tscn" id="5_t1fa7"]