diff --git a/Assets/Escape Room Engine/Desert.meta b/Assets/Desert.meta similarity index 100% rename from Assets/Escape Room Engine/Desert.meta rename to Assets/Desert.meta diff --git a/Assets/Desert/Assets.meta b/Assets/Desert/Assets.meta new file mode 100644 index 0000000..730b369 --- /dev/null +++ b/Assets/Desert/Assets.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2ef3a3f442154e3b9dfd9b5d481da2f3 +timeCreated: 1668944890 \ No newline at end of file diff --git a/Assets/Escape Room Engine/Desert/Desert.asset b/Assets/Desert/Assets/Desert.asset similarity index 100% rename from Assets/Escape Room Engine/Desert/Desert.asset rename to Assets/Desert/Assets/Desert.asset diff --git a/Assets/Escape Room Engine/Desert/Desert.asset.meta b/Assets/Desert/Assets/Desert.asset.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Desert.asset.meta rename to Assets/Desert/Assets/Desert.asset.meta diff --git a/Assets/Escape Room Engine/Desert/Materials.meta b/Assets/Desert/Assets/Materials.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials.meta rename to Assets/Desert/Assets/Materials.meta diff --git a/Assets/Escape Room Engine/Desert/Materials/Desert Floor.mat b/Assets/Desert/Assets/Materials/Desert Floor.mat similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Desert Floor.mat rename to Assets/Desert/Assets/Materials/Desert Floor.mat diff --git a/Assets/Escape Room Engine/Desert/Materials/Desert Floor.mat.meta b/Assets/Desert/Assets/Materials/Desert Floor.mat.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Desert Floor.mat.meta rename to Assets/Desert/Assets/Materials/Desert Floor.mat.meta diff --git a/Assets/Escape Room Engine/Desert/Materials/Skybox.mat b/Assets/Desert/Assets/Materials/Skybox.mat similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Skybox.mat rename to Assets/Desert/Assets/Materials/Skybox.mat diff --git a/Assets/Escape Room Engine/Desert/Materials/Skybox.mat.meta b/Assets/Desert/Assets/Materials/Skybox.mat.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Skybox.mat.meta rename to Assets/Desert/Assets/Materials/Skybox.mat.meta diff --git a/Assets/Escape Room Engine/Desert/Materials/Space Floor.mat b/Assets/Desert/Assets/Materials/Space Floor.mat similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Space Floor.mat rename to Assets/Desert/Assets/Materials/Space Floor.mat diff --git a/Assets/Escape Room Engine/Desert/Materials/Space Floor.mat.meta b/Assets/Desert/Assets/Materials/Space Floor.mat.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Space Floor.mat.meta rename to Assets/Desert/Assets/Materials/Space Floor.mat.meta diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures.meta b/Assets/Desert/Assets/Materials/Textures.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Textures.meta rename to Assets/Desert/Assets/Materials/Textures.meta diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor.meta b/Assets/Desert/Assets/Materials/Textures/Desert Floor.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor.meta rename to Assets/Desert/Assets/Materials/Textures/Desert Floor.meta diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_AlbedoTransparency.png b/Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_AlbedoTransparency.png new file mode 100644 index 0000000..5afa8a9 --- /dev/null +++ b/Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_AlbedoTransparency.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5134c7b6dd51623bfcef7bb1d0b99c11adf43d76571366cbb0c7adab4960847 +size 14199534 diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_AlbedoTransparency.png.meta b/Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_AlbedoTransparency.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_AlbedoTransparency.png.meta rename to Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_AlbedoTransparency.png.meta diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Height.png b/Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Height.png new file mode 100644 index 0000000..d623ce8 --- /dev/null +++ b/Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Height.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4716f9b534fb3496b047caa4a8078ebf6262ab107edf017761281f1ac64d071 +size 2814094 diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Height.png.meta b/Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Height.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Height.png.meta rename to Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Height.png.meta diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_MetallicSmoothness.png b/Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_MetallicSmoothness.png new file mode 100644 index 0000000..a4270a2 --- /dev/null +++ b/Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_MetallicSmoothness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dde5b8ea9b44ee50e362666cd21299035c6ad318398b305d89c4a5f4f5ed68d1 +size 10763421 diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_MetallicSmoothness.png.meta b/Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_MetallicSmoothness.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_MetallicSmoothness.png.meta rename to Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_MetallicSmoothness.png.meta diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Normal.png b/Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Normal.png new file mode 100644 index 0000000..32f4db2 --- /dev/null +++ b/Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b71d169c828930ea578a8180abf293f1ba6bc661a552b2edf3386a787bc181ff +size 22426292 diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Normal.png.meta b/Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Normal.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Normal.png.meta rename to Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Normal.png.meta diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Occlusion.png b/Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Occlusion.png new file mode 100644 index 0000000..431e89e --- /dev/null +++ b/Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Occlusion.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ed7123d5178464f94bcd6f53ec88f498eaf09b4167003c058cae89684e5c3cf +size 25415 diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Occlusion.png.meta b/Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Occlusion.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Occlusion.png.meta rename to Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Occlusion.png.meta diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor.meta b/Assets/Desert/Assets/Materials/Textures/Space Floor.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor.meta rename to Assets/Desert/Assets/Materials/Textures/Space Floor.meta diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_AlbedoTransparency.png b/Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_AlbedoTransparency.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_AlbedoTransparency.png rename to Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_AlbedoTransparency.png diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_AlbedoTransparency.png.meta b/Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_AlbedoTransparency.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_AlbedoTransparency.png.meta rename to Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_AlbedoTransparency.png.meta diff --git a/Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Height.png b/Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Height.png new file mode 100644 index 0000000..951b04a --- /dev/null +++ b/Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Height.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b0372da1adfd4bc45136eed04849ce1f6d35d845ac690adf9450669848471e6 +size 25415 diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_Height.png.meta b/Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Height.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_Height.png.meta rename to Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Height.png.meta diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_MetallicSmoothness.png b/Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_MetallicSmoothness.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_MetallicSmoothness.png rename to Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_MetallicSmoothness.png diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_MetallicSmoothness.png.meta b/Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_MetallicSmoothness.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_MetallicSmoothness.png.meta rename to Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_MetallicSmoothness.png.meta diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_Normal.png b/Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Normal.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_Normal.png rename to Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Normal.png diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_Normal.png.meta b/Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Normal.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_Normal.png.meta rename to Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Normal.png.meta diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_Occlusion.png b/Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Occlusion.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_Occlusion.png rename to Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Occlusion.png diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_Occlusion.png.meta b/Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Occlusion.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_Occlusion.png.meta rename to Assets/Desert/Assets/Materials/Textures/Space Floor/Space Floor_pewter_striped_Occlusion.png.meta diff --git a/Assets/Desert/Assets/Materials/Textures/skybox.hdr b/Assets/Desert/Assets/Materials/Textures/skybox.hdr new file mode 100644 index 0000000..c5379b8 --- /dev/null +++ b/Assets/Desert/Assets/Materials/Textures/skybox.hdr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47a9713ed3e0d0f4d84e3bb8642749ca7744dbd347ec68b13e6edccdd3cc0cbf +size 175491753 diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/skybox.hdr.meta b/Assets/Desert/Assets/Materials/Textures/skybox.hdr.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Textures/skybox.hdr.meta rename to Assets/Desert/Assets/Materials/Textures/skybox.hdr.meta diff --git a/Assets/Desert/Assets/Materials/Textures/skybox_4k.hdr b/Assets/Desert/Assets/Materials/Textures/skybox_4k.hdr new file mode 100644 index 0000000..3120c05 --- /dev/null +++ b/Assets/Desert/Assets/Materials/Textures/skybox_4k.hdr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a7431d4831e71d8690ab1be0a9baaec181962918166395cf14cbe1add6a84a9 +size 15257521 diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/skybox_4k.hdr.meta b/Assets/Desert/Assets/Materials/Textures/skybox_4k.hdr.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Materials/Textures/skybox_4k.hdr.meta rename to Assets/Desert/Assets/Materials/Textures/skybox_4k.hdr.meta diff --git a/Assets/Escape Room Engine/Desert/Models.meta b/Assets/Desert/Assets/Models.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Models.meta rename to Assets/Desert/Assets/Models.meta diff --git a/Assets/Desert/Assets/Models/Desert Floor.blend b/Assets/Desert/Assets/Models/Desert Floor.blend new file mode 100644 index 0000000..456be98 --- /dev/null +++ b/Assets/Desert/Assets/Models/Desert Floor.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0cd9ea48e54d46b9ae56ddd9ba24c091a0e5f6cb7fa79e79ed27198c638f32cf +size 2174956 diff --git a/Assets/Escape Room Engine/Desert/Models/Desert Floor.blend.meta b/Assets/Desert/Assets/Models/Desert Floor.blend.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Desert Floor.blend.meta rename to Assets/Desert/Assets/Models/Desert Floor.blend.meta diff --git a/Assets/Escape Room Engine/Desert/Models/Desert Floor.blend1 b/Assets/Desert/Assets/Models/Desert Floor.blend1 similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Desert Floor.blend1 rename to Assets/Desert/Assets/Models/Desert Floor.blend1 diff --git a/Assets/Escape Room Engine/Desert/Models/Desert Floor.blend1.meta b/Assets/Desert/Assets/Models/Desert Floor.blend1.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Desert Floor.blend1.meta rename to Assets/Desert/Assets/Models/Desert Floor.blend1.meta diff --git a/Assets/Desert/Assets/Models/Desert Floor.fbx b/Assets/Desert/Assets/Models/Desert Floor.fbx new file mode 100644 index 0000000..f362901 --- /dev/null +++ b/Assets/Desert/Assets/Models/Desert Floor.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:377b01508785204704944ac48ec1888823f2efdf2f1e00a19a5144379f1c2a52 +size 243228 diff --git a/Assets/Escape Room Engine/Desert/Models/Desert Floor.fbx.meta b/Assets/Desert/Assets/Models/Desert Floor.fbx.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Desert Floor.fbx.meta rename to Assets/Desert/Assets/Models/Desert Floor.fbx.meta diff --git a/Assets/Desert/Assets/Models/Space Floor.blend b/Assets/Desert/Assets/Models/Space Floor.blend new file mode 100644 index 0000000..65287e3 --- /dev/null +++ b/Assets/Desert/Assets/Models/Space Floor.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7daa62af76dbeebe4bcc271c7cb96d1a0a5f612b814ff1bf1166f256bcf71be +size 1250416 diff --git a/Assets/Escape Room Engine/Desert/Models/Space Floor.blend.meta b/Assets/Desert/Assets/Models/Space Floor.blend.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Space Floor.blend.meta rename to Assets/Desert/Assets/Models/Space Floor.blend.meta diff --git a/Assets/Escape Room Engine/Desert/Models/Space Floor.blend1 b/Assets/Desert/Assets/Models/Space Floor.blend1 similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Space Floor.blend1 rename to Assets/Desert/Assets/Models/Space Floor.blend1 diff --git a/Assets/Escape Room Engine/Desert/Models/Space Floor.blend1.meta b/Assets/Desert/Assets/Models/Space Floor.blend1.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Space Floor.blend1.meta rename to Assets/Desert/Assets/Models/Space Floor.blend1.meta diff --git a/Assets/Desert/Assets/Models/Space Floor.fbx b/Assets/Desert/Assets/Models/Space Floor.fbx new file mode 100644 index 0000000..d81d292 --- /dev/null +++ b/Assets/Desert/Assets/Models/Space Floor.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63c82aff64188ac51ab948df97235af04f5bae751eba62eb585b9abcf8d90ce2 +size 68396 diff --git a/Assets/Escape Room Engine/Desert/Models/Space Floor.fbx.meta b/Assets/Desert/Assets/Models/Space Floor.fbx.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Space Floor.fbx.meta rename to Assets/Desert/Assets/Models/Space Floor.fbx.meta diff --git a/Assets/Escape Room Engine/Desert/Models/Space Floor.meta b/Assets/Desert/Assets/Models/Space Floor.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Space Floor.meta rename to Assets/Desert/Assets/Models/Space Floor.meta diff --git a/Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData.meta b/Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData.meta rename to Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData.meta diff --git a/Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped.meta b/Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped.meta rename to Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped.meta diff --git a/Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Base Color.tga b/Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Base Color.tga similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Base Color.tga rename to Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Base Color.tga diff --git a/Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Base Color.tga.meta b/Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Base Color.tga.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Base Color.tga.meta rename to Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Base Color.tga.meta diff --git a/Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Displacement.tga b/Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Displacement.tga similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Displacement.tga rename to Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Displacement.tga diff --git a/Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Displacement.tga.meta b/Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Displacement.tga.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Displacement.tga.meta rename to Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Displacement.tga.meta diff --git a/Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Metallic.tga b/Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Metallic.tga similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Metallic.tga rename to Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Metallic.tga diff --git a/Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Metallic.tga.meta b/Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Metallic.tga.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Metallic.tga.meta rename to Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Metallic.tga.meta diff --git a/Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Normal.tga b/Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Normal.tga similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Normal.tga rename to Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Normal.tga diff --git a/Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Normal.tga.meta b/Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Normal.tga.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Normal.tga.meta rename to Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Normal.tga.meta diff --git a/Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Roughness.tga b/Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Roughness.tga similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Roughness.tga rename to Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Roughness.tga diff --git a/Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Roughness.tga.meta b/Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Roughness.tga.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Roughness.tga.meta rename to Assets/Desert/Assets/Models/Space Floor/Substance3DInBlenderData/pewter_striped/Roughness.tga.meta diff --git a/Assets/Escape Room Engine/Desert/Modules.meta b/Assets/Desert/Assets/Modules.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules.meta rename to Assets/Desert/Assets/Modules.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A Ball.asset b/Assets/Desert/Assets/Modules/Puzzle A Ball.asset similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A Ball.asset rename to Assets/Desert/Assets/Modules/Puzzle A Ball.asset diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A Ball.asset.meta b/Assets/Desert/Assets/Modules/Puzzle A Ball.asset.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A Ball.asset.meta rename to Assets/Desert/Assets/Modules/Puzzle A Ball.asset.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A Terminal.asset b/Assets/Desert/Assets/Modules/Puzzle A Terminal.asset similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A Terminal.asset rename to Assets/Desert/Assets/Modules/Puzzle A Terminal.asset diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A Terminal.asset.meta b/Assets/Desert/Assets/Modules/Puzzle A Terminal.asset.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A Terminal.asset.meta rename to Assets/Desert/Assets/Modules/Puzzle A Terminal.asset.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A.meta b/Assets/Desert/Assets/Modules/Puzzle A.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A.meta rename to Assets/Desert/Assets/Modules/Puzzle A.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations.meta b/Assets/Desert/Assets/Modules/Puzzle A/Animations.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Animations.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Ball.controller b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Ball.controller similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Ball.controller rename to Assets/Desert/Assets/Modules/Puzzle A/Animations/Ball.controller diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Ball.controller.meta b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Ball.controller.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Ball.controller.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Animations/Ball.controller.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Crystal Rotation.anim b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Crystal Rotation.anim similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Crystal Rotation.anim rename to Assets/Desert/Assets/Modules/Puzzle A/Animations/Crystal Rotation.anim diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Crystal Rotation.anim.meta b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Crystal Rotation.anim.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Crystal Rotation.anim.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Animations/Crystal Rotation.anim.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Hover.anim b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Hover.anim similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Hover.anim rename to Assets/Desert/Assets/Modules/Puzzle A/Animations/Hover.anim diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Hover.anim.meta b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Hover.anim.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Hover.anim.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Animations/Hover.anim.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Light Flash.anim b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Light Flash.anim similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Light Flash.anim rename to Assets/Desert/Assets/Modules/Puzzle A/Animations/Light Flash.anim diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Light Flash.anim.meta b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Light Flash.anim.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Light Flash.anim.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Animations/Light Flash.anim.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Light On.anim b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Light On.anim similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Light On.anim rename to Assets/Desert/Assets/Modules/Puzzle A/Animations/Light On.anim diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Light On.anim.meta b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Light On.anim.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Light On.anim.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Animations/Light On.anim.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Ring Rotation.anim b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Ring Rotation.anim similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Ring Rotation.anim rename to Assets/Desert/Assets/Modules/Puzzle A/Animations/Ring Rotation.anim diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Ring Rotation.anim.meta b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Ring Rotation.anim.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Ring Rotation.anim.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Animations/Ring Rotation.anim.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Terminal.controller b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Terminal.controller similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Terminal.controller rename to Assets/Desert/Assets/Modules/Puzzle A/Animations/Terminal.controller diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Terminal.controller.meta b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Terminal.controller.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Animations/Terminal.controller.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Animations/Terminal.controller.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Holo.mat b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Holo.mat similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Holo.mat rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Holo.mat diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Holo.mat.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Holo.mat.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Holo.mat.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Holo.mat.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Holo.shadergraph b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Holo.shadergraph similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Holo.shadergraph rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Holo.shadergraph diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Holo.shadergraph.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Holo.shadergraph.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Holo.shadergraph.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Holo.shadergraph.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Light.mat b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Light.mat similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Light.mat rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Light.mat diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Light.mat.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Light.mat.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Light.mat.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Light.mat.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Ring and Crystal.mat b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Ring and Crystal.mat similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Ring and Crystal.mat rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Ring and Crystal.mat diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Ring and Crystal.mat.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Ring and Crystal.mat.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Ring and Crystal.mat.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Ring and Crystal.mat.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Sphere.mat b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Sphere.mat similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Sphere.mat rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Sphere.mat diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Sphere.mat.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Sphere.mat.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Sphere.mat.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Sphere.mat.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Terminal.mat b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Terminal.mat similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Terminal.mat rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Terminal.mat diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Terminal.mat.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Terminal.mat.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Terminal.mat.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Terminal.mat.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_AlbedoTransparency.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_AlbedoTransparency.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_AlbedoTransparency.png rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_AlbedoTransparency.png diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_AlbedoTransparency.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_AlbedoTransparency.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_AlbedoTransparency.png.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_AlbedoTransparency.png.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_MetallicSmoothness.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_MetallicSmoothness.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_MetallicSmoothness.png rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_MetallicSmoothness.png diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_MetallicSmoothness.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_MetallicSmoothness.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_MetallicSmoothness.png.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_MetallicSmoothness.png.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Normal.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Normal.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Normal.png rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Normal.png diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Normal.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Normal.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Normal.png.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Normal.png.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Occlusion.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Occlusion.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Occlusion.png rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Occlusion.png diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Occlusion.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Occlusion.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Occlusion.png.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Occlusion.png.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_AlbedoTransparency.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_AlbedoTransparency.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_AlbedoTransparency.png rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_AlbedoTransparency.png diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_AlbedoTransparency.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_AlbedoTransparency.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_AlbedoTransparency.png.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_AlbedoTransparency.png.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_MetallicSmoothness.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_MetallicSmoothness.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_MetallicSmoothness.png rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_MetallicSmoothness.png diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_MetallicSmoothness.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_MetallicSmoothness.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_MetallicSmoothness.png.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_MetallicSmoothness.png.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Normal.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Normal.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Normal.png rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Normal.png diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Normal.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Normal.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Normal.png.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Normal.png.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Occlusion.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Occlusion.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Occlusion.png rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Occlusion.png diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Occlusion.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Occlusion.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Occlusion.png.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Occlusion.png.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_AlbedoTransparency.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_AlbedoTransparency.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_AlbedoTransparency.png rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_AlbedoTransparency.png diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_AlbedoTransparency.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_AlbedoTransparency.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_AlbedoTransparency.png.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_AlbedoTransparency.png.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_MetallicSmoothness.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_MetallicSmoothness.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_MetallicSmoothness.png rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_MetallicSmoothness.png diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_MetallicSmoothness.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_MetallicSmoothness.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_MetallicSmoothness.png.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_MetallicSmoothness.png.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Normal.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Normal.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Normal.png rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Normal.png diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Normal.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Normal.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Normal.png.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Normal.png.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Occlusion.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Occlusion.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Occlusion.png rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Occlusion.png diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Occlusion.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Occlusion.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Occlusion.png.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Occlusion.png.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Holo Lines.psd b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Holo Lines.psd similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Holo Lines.psd rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Holo Lines.psd diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Holo Lines.psd.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Holo Lines.psd.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Holo Lines.psd.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Holo Lines.psd.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_AlbedoTransparency.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_AlbedoTransparency.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_AlbedoTransparency.png rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_AlbedoTransparency.png diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_AlbedoTransparency.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_AlbedoTransparency.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_AlbedoTransparency.png.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_AlbedoTransparency.png.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Emission.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Emission.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Emission.png rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Emission.png diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Emission.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Emission.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Emission.png.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Emission.png.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_MetallicSmoothness.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_MetallicSmoothness.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_MetallicSmoothness.png rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_MetallicSmoothness.png diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_MetallicSmoothness.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_MetallicSmoothness.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_MetallicSmoothness.png.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_MetallicSmoothness.png.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Normal.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Normal.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Normal.png rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Normal.png diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Normal.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Normal.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Normal.png.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Normal.png.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Occlusion.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Occlusion.png similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Occlusion.png rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Occlusion.png diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Occlusion.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Occlusion.png.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Occlusion.png.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Terminal/Terminal_Terminal_Occlusion.png.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models.meta b/Assets/Desert/Assets/Modules/Puzzle A/Models.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Models.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Ball.blend b/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.blend similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Ball.blend rename to Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.blend diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Ball.blend.meta b/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.blend.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Ball.blend.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.blend.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Ball.blend1 b/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.blend1 similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Ball.blend1 rename to Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.blend1 diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Ball.blend1.meta b/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.blend1.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Ball.blend1.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.blend1.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Ball.fbx b/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.fbx similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Ball.fbx rename to Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.fbx diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Ball.fbx.meta b/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.fbx.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Ball.fbx.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.fbx.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Terminal.blend b/Assets/Desert/Assets/Modules/Puzzle A/Models/Terminal.blend similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Terminal.blend rename to Assets/Desert/Assets/Modules/Puzzle A/Models/Terminal.blend diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Terminal.blend.meta b/Assets/Desert/Assets/Modules/Puzzle A/Models/Terminal.blend.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Terminal.blend.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Models/Terminal.blend.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Terminal.blend1 b/Assets/Desert/Assets/Modules/Puzzle A/Models/Terminal.blend1 similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Terminal.blend1 rename to Assets/Desert/Assets/Modules/Puzzle A/Models/Terminal.blend1 diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Terminal.blend1.meta b/Assets/Desert/Assets/Modules/Puzzle A/Models/Terminal.blend1.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Terminal.blend1.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Models/Terminal.blend1.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Terminal.fbx b/Assets/Desert/Assets/Modules/Puzzle A/Models/Terminal.fbx similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Terminal.fbx rename to Assets/Desert/Assets/Modules/Puzzle A/Models/Terminal.fbx diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Terminal.fbx.meta b/Assets/Desert/Assets/Modules/Puzzle A/Models/Terminal.fbx.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Models/Terminal.fbx.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Models/Terminal.fbx.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Prefabs.meta b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Prefabs.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Prefabs.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Prefabs/Ball.prefab b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ball.prefab similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Prefabs/Ball.prefab rename to Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ball.prefab diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Prefabs/Ball.prefab.meta b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ball.prefab.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Prefabs/Ball.prefab.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ball.prefab.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Prefabs/Terminal.prefab.meta b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Terminal.prefab.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Prefabs/Terminal.prefab.meta rename to Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Terminal.prefab.meta diff --git a/Assets/Escape Room Engine/Desert/Prefabs.meta b/Assets/Desert/Assets/Prefabs.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Prefabs.meta rename to Assets/Desert/Assets/Prefabs.meta diff --git a/Assets/Escape Room Engine/Desert/Prefabs/Desert Environment.prefab b/Assets/Desert/Assets/Prefabs/Desert Environment.prefab similarity index 100% rename from Assets/Escape Room Engine/Desert/Prefabs/Desert Environment.prefab rename to Assets/Desert/Assets/Prefabs/Desert Environment.prefab diff --git a/Assets/Escape Room Engine/Desert/Prefabs/Desert Environment.prefab.meta b/Assets/Desert/Assets/Prefabs/Desert Environment.prefab.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Prefabs/Desert Environment.prefab.meta rename to Assets/Desert/Assets/Prefabs/Desert Environment.prefab.meta diff --git a/Assets/Escape Room Engine/Desert/Prefabs/Desert Floor Tile.prefab b/Assets/Desert/Assets/Prefabs/Desert Floor Tile.prefab similarity index 100% rename from Assets/Escape Room Engine/Desert/Prefabs/Desert Floor Tile.prefab rename to Assets/Desert/Assets/Prefabs/Desert Floor Tile.prefab diff --git a/Assets/Escape Room Engine/Desert/Prefabs/Desert Floor Tile.prefab.meta b/Assets/Desert/Assets/Prefabs/Desert Floor Tile.prefab.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Prefabs/Desert Floor Tile.prefab.meta rename to Assets/Desert/Assets/Prefabs/Desert Floor Tile.prefab.meta diff --git a/Assets/Escape Room Engine/Desert/Prefabs/Desert Space Tile.prefab b/Assets/Desert/Assets/Prefabs/Desert Space Tile.prefab similarity index 100% rename from Assets/Escape Room Engine/Desert/Prefabs/Desert Space Tile.prefab rename to Assets/Desert/Assets/Prefabs/Desert Space Tile.prefab diff --git a/Assets/Escape Room Engine/Desert/Prefabs/Desert Space Tile.prefab.meta b/Assets/Desert/Assets/Prefabs/Desert Space Tile.prefab.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Prefabs/Desert Space Tile.prefab.meta rename to Assets/Desert/Assets/Prefabs/Desert Space Tile.prefab.meta diff --git a/Assets/Desert/CHANGELOG.md b/Assets/Desert/CHANGELOG.md new file mode 100644 index 0000000..ed146ca --- /dev/null +++ b/Assets/Desert/CHANGELOG.md @@ -0,0 +1,13 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +### Added + +- Desert space and environment +- Puzzle A, press buttons when their symbols light up diff --git a/Assets/Desert/CHANGELOG.md.meta b/Assets/Desert/CHANGELOG.md.meta new file mode 100644 index 0000000..ebacb09 --- /dev/null +++ b/Assets/Desert/CHANGELOG.md.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5c40d0f295594f1bb8fcff1eafc17107 +timeCreated: 1668939744 \ No newline at end of file diff --git a/Assets/Desert/README.md b/Assets/Desert/README.md new file mode 100644 index 0000000..2f0a655 --- /dev/null +++ b/Assets/Desert/README.md @@ -0,0 +1,3 @@ +# Desert + +A desert theme for the VR escape room engine. \ No newline at end of file diff --git a/Assets/Desert/README.md.meta b/Assets/Desert/README.md.meta new file mode 100644 index 0000000..6ce97fc --- /dev/null +++ b/Assets/Desert/README.md.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 22c108ee7cba4c8da59abc65012143ea +timeCreated: 1668940013 \ No newline at end of file diff --git a/Assets/Escape Room Engine/Desert/Scripts.meta b/Assets/Desert/Runtime.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Scripts.meta rename to Assets/Desert/Runtime.meta diff --git a/Assets/Escape Room Engine/Desert/Scripts/Button.cs b/Assets/Desert/Runtime/Button.cs similarity index 96% rename from Assets/Escape Room Engine/Desert/Scripts/Button.cs rename to Assets/Desert/Runtime/Button.cs index 120991d..6bdaa68 100644 --- a/Assets/Escape Room Engine/Desert/Scripts/Button.cs +++ b/Assets/Desert/Runtime/Button.cs @@ -1,7 +1,7 @@ using NaughtyAttributes; using UnityEngine; -namespace Escape_Room_Engine.Desert.Scripts +namespace EscapeRoomEngine.Desert.Runtime { public class Button : MonoBehaviour { diff --git a/Assets/Escape Room Engine/Desert/Scripts/Button.cs.meta b/Assets/Desert/Runtime/Button.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Scripts/Button.cs.meta rename to Assets/Desert/Runtime/Button.cs.meta diff --git a/Assets/Desert/Runtime/Desert.asmdef b/Assets/Desert/Runtime/Desert.asmdef new file mode 100644 index 0000000..a085e66 --- /dev/null +++ b/Assets/Desert/Runtime/Desert.asmdef @@ -0,0 +1,17 @@ +{ + "name": "Desert", + "rootNamespace": "EscapeRoomEngine", + "references": [ + "GUID:2d68e204354e44f2a2ecf3cfa9213c5f", + "GUID:776d03a35f1b52c4a9aed9f56d7b4229" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/Desert/Runtime/Desert.asmdef.meta b/Assets/Desert/Runtime/Desert.asmdef.meta new file mode 100644 index 0000000..cee3a8b --- /dev/null +++ b/Assets/Desert/Runtime/Desert.asmdef.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 20d0c4bd521546c7859e37019a165e38 +timeCreated: 1668940232 \ No newline at end of file diff --git a/Assets/Escape Room Engine/Desert/Scripts/DesertFloor.cs b/Assets/Desert/Runtime/DesertFloor.cs similarity index 94% rename from Assets/Escape Room Engine/Desert/Scripts/DesertFloor.cs rename to Assets/Desert/Runtime/DesertFloor.cs index f119fb7..58883dd 100644 --- a/Assets/Escape Room Engine/Desert/Scripts/DesertFloor.cs +++ b/Assets/Desert/Runtime/DesertFloor.cs @@ -2,7 +2,7 @@ using NaughtyAttributes; using UnityEditor; using UnityEngine; -namespace Escape_Room_Engine.Desert.Scripts +namespace EscapeRoomEngine.Desert.Runtime { public class DesertFloor : MonoBehaviour { diff --git a/Assets/Escape Room Engine/Desert/Scripts/DesertFloor.cs.meta b/Assets/Desert/Runtime/DesertFloor.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Scripts/DesertFloor.cs.meta rename to Assets/Desert/Runtime/DesertFloor.cs.meta diff --git a/Assets/Escape Room Engine/Desert/Scripts/Emission.cs b/Assets/Desert/Runtime/Emission.cs similarity index 96% rename from Assets/Escape Room Engine/Desert/Scripts/Emission.cs rename to Assets/Desert/Runtime/Emission.cs index 092a7ad..887c3c1 100644 --- a/Assets/Escape Room Engine/Desert/Scripts/Emission.cs +++ b/Assets/Desert/Runtime/Emission.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Escape_Room_Engine.Desert.Scripts +namespace EscapeRoomEngine.Desert.Runtime { public class Emission : MonoBehaviour { diff --git a/Assets/Escape Room Engine/Desert/Scripts/Emission.cs.meta b/Assets/Desert/Runtime/Emission.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Scripts/Emission.cs.meta rename to Assets/Desert/Runtime/Emission.cs.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts.meta b/Assets/Desert/Runtime/Puzzle A.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts.meta rename to Assets/Desert/Runtime/Puzzle A.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Ball.cs b/Assets/Desert/Runtime/Puzzle A/Ball.cs similarity index 91% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Ball.cs rename to Assets/Desert/Runtime/Puzzle A/Ball.cs index 3362424..dc32990 100644 --- a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Ball.cs +++ b/Assets/Desert/Runtime/Puzzle A/Ball.cs @@ -1,10 +1,9 @@ using System; -using Escape_Room_Engine.Desert.Scripts; -using Escape_Room_Engine.Engine.Scripts.Modules; +using EscapeRoomEngine.Engine.Runtime.Modules; using NaughtyAttributes; using UnityEngine; -namespace Escape_Room_Engine.Desert.Modules.Puzzle_A.Scripts +namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A { [RequireComponent(typeof(Animator))] public class Ball : PuzzleState diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Ball.cs.meta b/Assets/Desert/Runtime/Puzzle A/Ball.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Ball.cs.meta rename to Assets/Desert/Runtime/Puzzle A/Ball.cs.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Crystal.cs b/Assets/Desert/Runtime/Puzzle A/Crystal.cs similarity index 82% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Crystal.cs rename to Assets/Desert/Runtime/Puzzle A/Crystal.cs index 18a752e..1bf5d0c 100644 --- a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Crystal.cs +++ b/Assets/Desert/Runtime/Puzzle A/Crystal.cs @@ -1,8 +1,7 @@ -using Escape_Room_Engine.Desert.Scripts; -using NaughtyAttributes; +using NaughtyAttributes; using UnityEngine; -namespace Escape_Room_Engine.Desert.Modules.Puzzle_A.Scripts +namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A { [RequireComponent(typeof(Emission))] public class Crystal : MonoBehaviour diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Crystal.cs.meta b/Assets/Desert/Runtime/Puzzle A/Crystal.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Crystal.cs.meta rename to Assets/Desert/Runtime/Puzzle A/Crystal.cs.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Ring.cs b/Assets/Desert/Runtime/Puzzle A/Ring.cs similarity index 95% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Ring.cs rename to Assets/Desert/Runtime/Puzzle A/Ring.cs index 1fe038f..38fd94f 100644 --- a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Ring.cs +++ b/Assets/Desert/Runtime/Puzzle A/Ring.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using NaughtyAttributes; using UnityEngine; -namespace Escape_Room_Engine.Desert.Modules.Puzzle_A.Scripts +namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A { public class Ring : MonoBehaviour { diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Ring.cs.meta b/Assets/Desert/Runtime/Puzzle A/Ring.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Ring.cs.meta rename to Assets/Desert/Runtime/Puzzle A/Ring.cs.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Symbol.cs b/Assets/Desert/Runtime/Puzzle A/Symbol.cs similarity index 84% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Symbol.cs rename to Assets/Desert/Runtime/Puzzle A/Symbol.cs index 1b1a143..4f6e3fb 100644 --- a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Symbol.cs +++ b/Assets/Desert/Runtime/Puzzle A/Symbol.cs @@ -1,7 +1,6 @@ -using Escape_Room_Engine.Desert.Scripts; using UnityEngine; -namespace Escape_Room_Engine.Desert.Modules.Puzzle_A.Scripts +namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A { [RequireComponent(typeof(Emission))] public class Symbol : MonoBehaviour diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Symbol.cs.meta b/Assets/Desert/Runtime/Puzzle A/Symbol.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Symbol.cs.meta rename to Assets/Desert/Runtime/Puzzle A/Symbol.cs.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/SymbolButton.cs b/Assets/Desert/Runtime/Puzzle A/SymbolButton.cs similarity index 86% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/SymbolButton.cs rename to Assets/Desert/Runtime/Puzzle A/SymbolButton.cs index 30769af..9d9ce04 100644 --- a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/SymbolButton.cs +++ b/Assets/Desert/Runtime/Puzzle A/SymbolButton.cs @@ -1,8 +1,7 @@ -using Escape_Room_Engine.Desert.Scripts; -using Escape_Room_Engine.Engine.Scripts; +using EscapeRoomEngine.Engine.Runtime; using UnityEngine; -namespace Escape_Room_Engine.Desert.Modules.Puzzle_A.Scripts +namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A { [RequireComponent(typeof(MeshRenderer))] public class SymbolButton : Button diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/SymbolButton.cs.meta b/Assets/Desert/Runtime/Puzzle A/SymbolButton.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/SymbolButton.cs.meta rename to Assets/Desert/Runtime/Puzzle A/SymbolButton.cs.meta diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Terminal.cs b/Assets/Desert/Runtime/Puzzle A/Terminal.cs similarity index 91% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Terminal.cs rename to Assets/Desert/Runtime/Puzzle A/Terminal.cs index c700801..97c80f1 100644 --- a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Terminal.cs +++ b/Assets/Desert/Runtime/Puzzle A/Terminal.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; -using Escape_Room_Engine.Desert.Scripts; -using Escape_Room_Engine.Engine.Scripts.Modules; +using EscapeRoomEngine.Engine.Runtime.Modules; using NaughtyAttributes; using UnityEngine; -namespace Escape_Room_Engine.Desert.Modules.Puzzle_A.Scripts +namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A { [RequireComponent(typeof(Animator))] public class Terminal : PuzzleState diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Terminal.cs.meta b/Assets/Desert/Runtime/Puzzle A/Terminal.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Scripts/Terminal.cs.meta rename to Assets/Desert/Runtime/Puzzle A/Terminal.cs.meta diff --git a/Assets/Desert/package.json b/Assets/Desert/package.json new file mode 100644 index 0000000..5b9a94a --- /dev/null +++ b/Assets/Desert/package.json @@ -0,0 +1,18 @@ +{ + "displayName": "Escape Room Engine Theme - Desert", + "name": "wtf.milan.escape-room-engine.desert", + "version": "0.0.1", + "description": "A desert theme for the VR escape room engine.", + "unity": "2022.1", + "author": { + "name": "Milan van Zanten", + "email": "milan@milan.wtf", + "url": "https://milan.wtf" + }, + "hideInEditor": false, + "keywords": ["vr", "virtual reality", "modular", "escape room"], + "dependencies": { + "wtf.milan.escape-room-engine": "0.0.1", + "com.dbrizov.naughtyattributes": "2.1.4" + } +} diff --git a/Assets/Desert/package.json.meta b/Assets/Desert/package.json.meta new file mode 100644 index 0000000..350bd4e --- /dev/null +++ b/Assets/Desert/package.json.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 720aa805e8204bab88c42fd946331244 +timeCreated: 1668939945 \ No newline at end of file diff --git a/Assets/Escape Room Engine/Engine.meta b/Assets/Engine.meta similarity index 100% rename from Assets/Escape Room Engine/Engine.meta rename to Assets/Engine.meta diff --git a/Assets/Engine/Assets.meta b/Assets/Engine/Assets.meta new file mode 100644 index 0000000..e071ac8 --- /dev/null +++ b/Assets/Engine/Assets.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6e6e3e1ff95a42cf88bc952e826f4300 +timeCreated: 1668942265 \ No newline at end of file diff --git a/Assets/Escape Room Engine/Engine/Fonts.meta b/Assets/Engine/Assets/Fonts.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Fonts.meta rename to Assets/Engine/Assets/Fonts.meta diff --git a/Assets/Escape Room Engine/Engine/Fonts/BebasNeue-Regular.otf b/Assets/Engine/Assets/Fonts/BebasNeue-Regular.otf similarity index 100% rename from Assets/Escape Room Engine/Engine/Fonts/BebasNeue-Regular.otf rename to Assets/Engine/Assets/Fonts/BebasNeue-Regular.otf diff --git a/Assets/Escape Room Engine/Engine/Fonts/BebasNeue-Regular.otf.meta b/Assets/Engine/Assets/Fonts/BebasNeue-Regular.otf.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Fonts/BebasNeue-Regular.otf.meta rename to Assets/Engine/Assets/Fonts/BebasNeue-Regular.otf.meta diff --git a/Assets/Escape Room Engine/Engine/Lighting Settings.lighting b/Assets/Engine/Assets/Lighting Settings.lighting similarity index 100% rename from Assets/Escape Room Engine/Engine/Lighting Settings.lighting rename to Assets/Engine/Assets/Lighting Settings.lighting diff --git a/Assets/Escape Room Engine/Engine/Lighting Settings.lighting.meta b/Assets/Engine/Assets/Lighting Settings.lighting.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Lighting Settings.lighting.meta rename to Assets/Engine/Assets/Lighting Settings.lighting.meta diff --git a/Assets/Escape Room Engine/Engine/Materials.meta b/Assets/Engine/Assets/Materials.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Materials.meta rename to Assets/Engine/Assets/Materials.meta diff --git a/Assets/Escape Room Engine/Engine/Materials/Generic Material A.mat b/Assets/Engine/Assets/Materials/Generic Material A.mat similarity index 100% rename from Assets/Escape Room Engine/Engine/Materials/Generic Material A.mat rename to Assets/Engine/Assets/Materials/Generic Material A.mat diff --git a/Assets/Escape Room Engine/Engine/Materials/Generic Material A.mat.meta b/Assets/Engine/Assets/Materials/Generic Material A.mat.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Materials/Generic Material A.mat.meta rename to Assets/Engine/Assets/Materials/Generic Material A.mat.meta diff --git a/Assets/Escape Room Engine/Engine/Materials/Generic Material B.mat b/Assets/Engine/Assets/Materials/Generic Material B.mat similarity index 100% rename from Assets/Escape Room Engine/Engine/Materials/Generic Material B.mat rename to Assets/Engine/Assets/Materials/Generic Material B.mat diff --git a/Assets/Escape Room Engine/Engine/Materials/Generic Material B.mat.meta b/Assets/Engine/Assets/Materials/Generic Material B.mat.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Materials/Generic Material B.mat.meta rename to Assets/Engine/Assets/Materials/Generic Material B.mat.meta diff --git a/Assets/Escape Room Engine/Engine/Materials/Generic Material C.mat b/Assets/Engine/Assets/Materials/Generic Material C.mat similarity index 100% rename from Assets/Escape Room Engine/Engine/Materials/Generic Material C.mat rename to Assets/Engine/Assets/Materials/Generic Material C.mat diff --git a/Assets/Escape Room Engine/Engine/Materials/Generic Material C.mat.meta b/Assets/Engine/Assets/Materials/Generic Material C.mat.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Materials/Generic Material C.mat.meta rename to Assets/Engine/Assets/Materials/Generic Material C.mat.meta diff --git a/Assets/Escape Room Engine/Engine/Models.meta b/Assets/Engine/Assets/Models.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Models.meta rename to Assets/Engine/Assets/Models.meta diff --git a/Assets/Engine/Assets/Models/Space.blend b/Assets/Engine/Assets/Models/Space.blend new file mode 100644 index 0000000..107be78 --- /dev/null +++ b/Assets/Engine/Assets/Models/Space.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e54a864821a5d5f9d0d80de3d0e5df88049d871d7e454d97bb213cf14201861 +size 1316588 diff --git a/Assets/Escape Room Engine/Engine/Models/Space.blend.meta b/Assets/Engine/Assets/Models/Space.blend.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Models/Space.blend.meta rename to Assets/Engine/Assets/Models/Space.blend.meta diff --git a/Assets/Escape Room Engine/Engine/Models/Space.blend1 b/Assets/Engine/Assets/Models/Space.blend1 similarity index 100% rename from Assets/Escape Room Engine/Engine/Models/Space.blend1 rename to Assets/Engine/Assets/Models/Space.blend1 diff --git a/Assets/Escape Room Engine/Engine/Models/Space.blend1.meta b/Assets/Engine/Assets/Models/Space.blend1.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Models/Space.blend1.meta rename to Assets/Engine/Assets/Models/Space.blend1.meta diff --git a/Assets/Escape Room Engine/Engine/Module Descriptions.meta b/Assets/Engine/Assets/Module Descriptions.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Module Descriptions.meta rename to Assets/Engine/Assets/Module Descriptions.meta diff --git a/Assets/Escape Room Engine/Engine/Module Descriptions/Generic Door Entrance.asset b/Assets/Engine/Assets/Module Descriptions/Generic Door Entrance.asset similarity index 100% rename from Assets/Escape Room Engine/Engine/Module Descriptions/Generic Door Entrance.asset rename to Assets/Engine/Assets/Module Descriptions/Generic Door Entrance.asset diff --git a/Assets/Escape Room Engine/Engine/Module Descriptions/Generic Door Entrance.asset.meta b/Assets/Engine/Assets/Module Descriptions/Generic Door Entrance.asset.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Module Descriptions/Generic Door Entrance.asset.meta rename to Assets/Engine/Assets/Module Descriptions/Generic Door Entrance.asset.meta diff --git a/Assets/Escape Room Engine/Engine/Module Descriptions/Generic Door Exit.asset b/Assets/Engine/Assets/Module Descriptions/Generic Door Exit.asset similarity index 100% rename from Assets/Escape Room Engine/Engine/Module Descriptions/Generic Door Exit.asset rename to Assets/Engine/Assets/Module Descriptions/Generic Door Exit.asset diff --git a/Assets/Escape Room Engine/Engine/Module Descriptions/Generic Door Exit.asset.meta b/Assets/Engine/Assets/Module Descriptions/Generic Door Exit.asset.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Module Descriptions/Generic Door Exit.asset.meta rename to Assets/Engine/Assets/Module Descriptions/Generic Door Exit.asset.meta diff --git a/Assets/Escape Room Engine/Engine/Module Descriptions/Generic Module.asset b/Assets/Engine/Assets/Module Descriptions/Generic Module.asset similarity index 100% rename from Assets/Escape Room Engine/Engine/Module Descriptions/Generic Module.asset rename to Assets/Engine/Assets/Module Descriptions/Generic Module.asset diff --git a/Assets/Escape Room Engine/Engine/Module Descriptions/Generic Module.asset.meta b/Assets/Engine/Assets/Module Descriptions/Generic Module.asset.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Module Descriptions/Generic Module.asset.meta rename to Assets/Engine/Assets/Module Descriptions/Generic Module.asset.meta diff --git a/Assets/Escape Room Engine/Engine/Module Descriptions/Generic Puzzle.asset b/Assets/Engine/Assets/Module Descriptions/Generic Puzzle.asset similarity index 100% rename from Assets/Escape Room Engine/Engine/Module Descriptions/Generic Puzzle.asset rename to Assets/Engine/Assets/Module Descriptions/Generic Puzzle.asset diff --git a/Assets/Escape Room Engine/Engine/Module Descriptions/Generic Puzzle.asset.meta b/Assets/Engine/Assets/Module Descriptions/Generic Puzzle.asset.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Module Descriptions/Generic Puzzle.asset.meta rename to Assets/Engine/Assets/Module Descriptions/Generic Puzzle.asset.meta diff --git a/Assets/Escape Room Engine/Engine/Module Descriptions/Spawn.asset b/Assets/Engine/Assets/Module Descriptions/Spawn.asset similarity index 100% rename from Assets/Escape Room Engine/Engine/Module Descriptions/Spawn.asset rename to Assets/Engine/Assets/Module Descriptions/Spawn.asset diff --git a/Assets/Escape Room Engine/Engine/Module Descriptions/Spawn.asset.meta b/Assets/Engine/Assets/Module Descriptions/Spawn.asset.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Module Descriptions/Spawn.asset.meta rename to Assets/Engine/Assets/Module Descriptions/Spawn.asset.meta diff --git a/Assets/Escape Room Engine/Engine/Prefabs.meta b/Assets/Engine/Assets/Prefabs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Prefabs.meta rename to Assets/Engine/Assets/Prefabs.meta diff --git a/Assets/Escape Room Engine/Engine/Prefabs/Gamemaster Canvas.prefab b/Assets/Engine/Assets/Prefabs/Gamemaster Canvas.prefab similarity index 100% rename from Assets/Escape Room Engine/Engine/Prefabs/Gamemaster Canvas.prefab rename to Assets/Engine/Assets/Prefabs/Gamemaster Canvas.prefab diff --git a/Assets/Escape Room Engine/Engine/Prefabs/Gamemaster Canvas.prefab.meta b/Assets/Engine/Assets/Prefabs/Gamemaster Canvas.prefab.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Prefabs/Gamemaster Canvas.prefab.meta rename to Assets/Engine/Assets/Prefabs/Gamemaster Canvas.prefab.meta diff --git a/Assets/Escape Room Engine/Engine/Prefabs/Generic Door Entrance.prefab b/Assets/Engine/Assets/Prefabs/Generic Door Entrance.prefab similarity index 100% rename from Assets/Escape Room Engine/Engine/Prefabs/Generic Door Entrance.prefab rename to Assets/Engine/Assets/Prefabs/Generic Door Entrance.prefab diff --git a/Assets/Escape Room Engine/Engine/Prefabs/Generic Door Entrance.prefab.meta b/Assets/Engine/Assets/Prefabs/Generic Door Entrance.prefab.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Prefabs/Generic Door Entrance.prefab.meta rename to Assets/Engine/Assets/Prefabs/Generic Door Entrance.prefab.meta diff --git a/Assets/Escape Room Engine/Engine/Prefabs/Generic Door Exit.prefab b/Assets/Engine/Assets/Prefabs/Generic Door Exit.prefab similarity index 100% rename from Assets/Escape Room Engine/Engine/Prefabs/Generic Door Exit.prefab rename to Assets/Engine/Assets/Prefabs/Generic Door Exit.prefab diff --git a/Assets/Escape Room Engine/Engine/Prefabs/Generic Door Exit.prefab.meta b/Assets/Engine/Assets/Prefabs/Generic Door Exit.prefab.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Prefabs/Generic Door Exit.prefab.meta rename to Assets/Engine/Assets/Prefabs/Generic Door Exit.prefab.meta diff --git a/Assets/Escape Room Engine/Engine/Prefabs/Generic Door.prefab b/Assets/Engine/Assets/Prefabs/Generic Door.prefab similarity index 100% rename from Assets/Escape Room Engine/Engine/Prefabs/Generic Door.prefab rename to Assets/Engine/Assets/Prefabs/Generic Door.prefab diff --git a/Assets/Escape Room Engine/Engine/Prefabs/Generic Door.prefab.meta b/Assets/Engine/Assets/Prefabs/Generic Door.prefab.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Prefabs/Generic Door.prefab.meta rename to Assets/Engine/Assets/Prefabs/Generic Door.prefab.meta diff --git a/Assets/Escape Room Engine/Engine/Prefabs/Generic Module.prefab b/Assets/Engine/Assets/Prefabs/Generic Module.prefab similarity index 100% rename from Assets/Escape Room Engine/Engine/Prefabs/Generic Module.prefab rename to Assets/Engine/Assets/Prefabs/Generic Module.prefab diff --git a/Assets/Escape Room Engine/Engine/Prefabs/Generic Module.prefab.meta b/Assets/Engine/Assets/Prefabs/Generic Module.prefab.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Prefabs/Generic Module.prefab.meta rename to Assets/Engine/Assets/Prefabs/Generic Module.prefab.meta diff --git a/Assets/Escape Room Engine/Engine/Prefabs/Generic Puzzle.prefab b/Assets/Engine/Assets/Prefabs/Generic Puzzle.prefab similarity index 100% rename from Assets/Escape Room Engine/Engine/Prefabs/Generic Puzzle.prefab rename to Assets/Engine/Assets/Prefabs/Generic Puzzle.prefab diff --git a/Assets/Escape Room Engine/Engine/Prefabs/Generic Puzzle.prefab.meta b/Assets/Engine/Assets/Prefabs/Generic Puzzle.prefab.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Prefabs/Generic Puzzle.prefab.meta rename to Assets/Engine/Assets/Prefabs/Generic Puzzle.prefab.meta diff --git a/Assets/Escape Room Engine/Engine/Prefabs/Spawn.prefab b/Assets/Engine/Assets/Prefabs/Spawn.prefab similarity index 100% rename from Assets/Escape Room Engine/Engine/Prefabs/Spawn.prefab rename to Assets/Engine/Assets/Prefabs/Spawn.prefab diff --git a/Assets/Escape Room Engine/Engine/Prefabs/Spawn.prefab.meta b/Assets/Engine/Assets/Prefabs/Spawn.prefab.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Prefabs/Spawn.prefab.meta rename to Assets/Engine/Assets/Prefabs/Spawn.prefab.meta diff --git a/Assets/Escape Room Engine/Engine/Requirements.meta b/Assets/Engine/Assets/Requirements.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Requirements.meta rename to Assets/Engine/Assets/Requirements.meta diff --git a/Assets/Escape Room Engine/Engine/Requirements/Face Space Center.asset b/Assets/Engine/Assets/Requirements/Face Space Center.asset similarity index 100% rename from Assets/Escape Room Engine/Engine/Requirements/Face Space Center.asset rename to Assets/Engine/Assets/Requirements/Face Space Center.asset diff --git a/Assets/Escape Room Engine/Engine/Requirements/Face Space Center.asset.meta b/Assets/Engine/Assets/Requirements/Face Space Center.asset.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Requirements/Face Space Center.asset.meta rename to Assets/Engine/Assets/Requirements/Face Space Center.asset.meta diff --git a/Assets/Escape Room Engine/Engine/Requirements/No Overlap.asset b/Assets/Engine/Assets/Requirements/No Overlap.asset similarity index 100% rename from Assets/Escape Room Engine/Engine/Requirements/No Overlap.asset rename to Assets/Engine/Assets/Requirements/No Overlap.asset diff --git a/Assets/Escape Room Engine/Engine/Requirements/No Overlap.asset.meta b/Assets/Engine/Assets/Requirements/No Overlap.asset.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Requirements/No Overlap.asset.meta rename to Assets/Engine/Assets/Requirements/No Overlap.asset.meta diff --git a/Assets/Escape Room Engine/Engine/Requirements/Place Along Space Edges.asset b/Assets/Engine/Assets/Requirements/Place Along Space Edges.asset similarity index 100% rename from Assets/Escape Room Engine/Engine/Requirements/Place Along Space Edges.asset rename to Assets/Engine/Assets/Requirements/Place Along Space Edges.asset diff --git a/Assets/Escape Room Engine/Engine/Requirements/Place Along Space Edges.asset.meta b/Assets/Engine/Assets/Requirements/Place Along Space Edges.asset.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Requirements/Place Along Space Edges.asset.meta rename to Assets/Engine/Assets/Requirements/Place Along Space Edges.asset.meta diff --git a/Assets/Escape Room Engine/Engine/Requirements/Place Anywhere.asset b/Assets/Engine/Assets/Requirements/Place Anywhere.asset similarity index 100% rename from Assets/Escape Room Engine/Engine/Requirements/Place Anywhere.asset rename to Assets/Engine/Assets/Requirements/Place Anywhere.asset diff --git a/Assets/Escape Room Engine/Engine/Requirements/Place Anywhere.asset.meta b/Assets/Engine/Assets/Requirements/Place Anywhere.asset.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Requirements/Place Anywhere.asset.meta rename to Assets/Engine/Assets/Requirements/Place Anywhere.asset.meta diff --git a/Assets/Engine/CHANGELOG.md b/Assets/Engine/CHANGELOG.md new file mode 100644 index 0000000..5ddc08d --- /dev/null +++ b/Assets/Engine/CHANGELOG.md @@ -0,0 +1,16 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +### Added + +- modularVR analogues for room, space, passage and module types +- door module type +- puzzle module type +- module requirements +- room generation engine diff --git a/Assets/Engine/CHANGELOG.md.meta b/Assets/Engine/CHANGELOG.md.meta new file mode 100644 index 0000000..210be81 --- /dev/null +++ b/Assets/Engine/CHANGELOG.md.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: de752d6478ed4e0e8e854164064af298 +timeCreated: 1668939421 \ No newline at end of file diff --git a/Assets/Engine/README.md b/Assets/Engine/README.md new file mode 100644 index 0000000..987b10f --- /dev/null +++ b/Assets/Engine/README.md @@ -0,0 +1,3 @@ +# Escape Room Engine + +A VR escape room engine as an example implementation of the [modularVR](https://vr.milan.wtf/modular) framework. diff --git a/Assets/Engine/README.md.meta b/Assets/Engine/README.md.meta new file mode 100644 index 0000000..8721bea --- /dev/null +++ b/Assets/Engine/README.md.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 707ea97304634c83a0c2edc3b1f7b551 +timeCreated: 1668937213 \ No newline at end of file diff --git a/Assets/Escape Room Engine/Engine/Scripts.meta b/Assets/Engine/Runtime.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts.meta rename to Assets/Engine/Runtime.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Dimensions.cs b/Assets/Engine/Runtime/Dimensions.cs similarity index 96% rename from Assets/Escape Room Engine/Engine/Scripts/Dimensions.cs rename to Assets/Engine/Runtime/Dimensions.cs index d51909f..4704e20 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Dimensions.cs +++ b/Assets/Engine/Runtime/Dimensions.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Escape_Room_Engine.Engine.Scripts +namespace EscapeRoomEngine.Engine.Runtime { public struct Dimensions { diff --git a/Assets/Escape Room Engine/Engine/Scripts/Dimensions.cs.meta b/Assets/Engine/Runtime/Dimensions.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Dimensions.cs.meta rename to Assets/Engine/Runtime/Dimensions.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Editor.meta b/Assets/Engine/Runtime/Editor.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Editor.meta rename to Assets/Engine/Runtime/Editor.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Editor/EngineEditor.cs b/Assets/Engine/Runtime/Editor/EngineEditor.cs similarity index 97% rename from Assets/Escape Room Engine/Engine/Scripts/Editor/EngineEditor.cs rename to Assets/Engine/Runtime/Editor/EngineEditor.cs index 30d7384..0be7783 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Editor/EngineEditor.cs +++ b/Assets/Engine/Runtime/Editor/EngineEditor.cs @@ -2,7 +2,7 @@ using UnityEditor; using UnityEngine; using UnityEngine.UIElements; -namespace Escape_Room_Engine.Engine.Scripts.Editor +namespace EscapeRoomEngine.Engine.Runtime.Editor { public class EngineEditor : EditorWindow { diff --git a/Assets/Escape Room Engine/Engine/Scripts/Editor/EngineEditor.cs.meta b/Assets/Engine/Runtime/Editor/EngineEditor.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Editor/EngineEditor.cs.meta rename to Assets/Engine/Runtime/Editor/EngineEditor.cs.meta diff --git a/Assets/Engine/Runtime/Engine.asmdef b/Assets/Engine/Runtime/Engine.asmdef new file mode 100644 index 0000000..d85e8c3 --- /dev/null +++ b/Assets/Engine/Runtime/Engine.asmdef @@ -0,0 +1,16 @@ +{ + "name": "Engine", + "rootNamespace": "EscapeRoomEngine", + "references": [ + "GUID:776d03a35f1b52c4a9aed9f56d7b4229" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/Engine/Runtime/Engine.asmdef.meta b/Assets/Engine/Runtime/Engine.asmdef.meta new file mode 100644 index 0000000..239cc0e --- /dev/null +++ b/Assets/Engine/Runtime/Engine.asmdef.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2d68e204354e44f2a2ecf3cfa9213c5f +timeCreated: 1668940905 \ No newline at end of file diff --git a/Assets/Escape Room Engine/Engine/Scripts/Engine.cs b/Assets/Engine/Runtime/Engine.cs similarity index 92% rename from Assets/Escape Room Engine/Engine/Scripts/Engine.cs rename to Assets/Engine/Runtime/Engine.cs index 5d92e38..3586412 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Engine.cs +++ b/Assets/Engine/Runtime/Engine.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; -using Escape_Room_Engine.Engine.Scripts.Modules; -using Escape_Room_Engine.Engine.Scripts.Utilities; +using EscapeRoomEngine.Engine.Runtime.Modules; +using EscapeRoomEngine.Engine.Runtime.Utilities; using NaughtyAttributes; using UnityEngine; -using Logger = Escape_Room_Engine.Engine.Scripts.Utilities.Logger; -using LogType = Escape_Room_Engine.Engine.Scripts.Utilities.LogType; +using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger; +using LogType = EscapeRoomEngine.Engine.Runtime.Utilities.LogType; -namespace Escape_Room_Engine.Engine.Scripts +namespace EscapeRoomEngine.Engine.Runtime { public class Engine : MonoBehaviour { diff --git a/Assets/Escape Room Engine/Engine/Scripts/Engine.cs.meta b/Assets/Engine/Runtime/Engine.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Engine.cs.meta rename to Assets/Engine/Runtime/Engine.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/EngineTheme.cs b/Assets/Engine/Runtime/EngineTheme.cs similarity index 93% rename from Assets/Escape Room Engine/Engine/Scripts/EngineTheme.cs rename to Assets/Engine/Runtime/EngineTheme.cs index a997224..f2c6c4d 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/EngineTheme.cs +++ b/Assets/Engine/Runtime/EngineTheme.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using Escape_Room_Engine.Engine.Scripts.Modules; +using EscapeRoomEngine.Engine.Runtime.Modules; using NaughtyAttributes; using UnityEngine; -namespace Escape_Room_Engine.Engine.Scripts +namespace EscapeRoomEngine.Engine.Runtime { [CreateAssetMenu(menuName = "Engine Theme")] public class EngineTheme : ScriptableObject diff --git a/Assets/Escape Room Engine/Engine/Scripts/EngineTheme.cs.meta b/Assets/Engine/Runtime/EngineTheme.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/EngineTheme.cs.meta rename to Assets/Engine/Runtime/EngineTheme.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/GameControl.cs b/Assets/Engine/Runtime/GameControl.cs similarity index 98% rename from Assets/Escape Room Engine/Engine/Scripts/GameControl.cs rename to Assets/Engine/Runtime/GameControl.cs index 16535e6..81b8f52 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/GameControl.cs +++ b/Assets/Engine/Runtime/GameControl.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.UI; -namespace Escape_Room_Engine.Engine.Scripts +namespace EscapeRoomEngine.Engine.Runtime { public enum GameState { diff --git a/Assets/Escape Room Engine/Engine/Scripts/GameControl.cs.meta b/Assets/Engine/Runtime/GameControl.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/GameControl.cs.meta rename to Assets/Engine/Runtime/GameControl.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules.meta b/Assets/Engine/Runtime/Modules.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Modules.meta rename to Assets/Engine/Runtime/Modules.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules/DoorModule.cs b/Assets/Engine/Runtime/Modules/DoorModule.cs similarity index 95% rename from Assets/Escape Room Engine/Engine/Scripts/Modules/DoorModule.cs rename to Assets/Engine/Runtime/Modules/DoorModule.cs index 7578a46..bd4b6bd 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Modules/DoorModule.cs +++ b/Assets/Engine/Runtime/Modules/DoorModule.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Escape_Room_Engine.Engine.Scripts.Modules +namespace EscapeRoomEngine.Engine.Runtime.Modules { public enum DoorType { diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules/DoorModule.cs.meta b/Assets/Engine/Runtime/Modules/DoorModule.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Modules/DoorModule.cs.meta rename to Assets/Engine/Runtime/Modules/DoorModule.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules/DoorModuleDescription.cs b/Assets/Engine/Runtime/Modules/DoorModuleDescription.cs similarity index 89% rename from Assets/Escape Room Engine/Engine/Scripts/Modules/DoorModuleDescription.cs rename to Assets/Engine/Runtime/Modules/DoorModuleDescription.cs index 0fc26f6..3648c0b 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Modules/DoorModuleDescription.cs +++ b/Assets/Engine/Runtime/Modules/DoorModuleDescription.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Escape_Room_Engine.Engine.Scripts.Modules +namespace EscapeRoomEngine.Engine.Runtime.Modules { [CreateAssetMenu(menuName = "Modules/Door")] public class DoorModuleDescription : ModuleDescription diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules/DoorModuleDescription.cs.meta b/Assets/Engine/Runtime/Modules/DoorModuleDescription.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Modules/DoorModuleDescription.cs.meta rename to Assets/Engine/Runtime/Modules/DoorModuleDescription.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules/DoorState.cs b/Assets/Engine/Runtime/Modules/DoorState.cs similarity index 94% rename from Assets/Escape Room Engine/Engine/Scripts/Modules/DoorState.cs rename to Assets/Engine/Runtime/Modules/DoorState.cs index be212d3..6552803 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Modules/DoorState.cs +++ b/Assets/Engine/Runtime/Modules/DoorState.cs @@ -1,8 +1,8 @@ using System; -using Escape_Room_Engine.Engine.Scripts.Utilities; +using EscapeRoomEngine.Engine.Runtime.Utilities; using NaughtyAttributes; -namespace Escape_Room_Engine.Engine.Scripts.Modules +namespace EscapeRoomEngine.Engine.Runtime.Modules { public enum DoorEventType { diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules/DoorState.cs.meta b/Assets/Engine/Runtime/Modules/DoorState.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Modules/DoorState.cs.meta rename to Assets/Engine/Runtime/Modules/DoorState.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules/Module.cs b/Assets/Engine/Runtime/Modules/Module.cs similarity index 94% rename from Assets/Escape Room Engine/Engine/Scripts/Modules/Module.cs rename to Assets/Engine/Runtime/Modules/Module.cs index 9676b37..44c909a 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Modules/Module.cs +++ b/Assets/Engine/Runtime/Modules/Module.cs @@ -1,13 +1,13 @@ using System; using System.Collections.Generic; using System.Linq; -using Escape_Room_Engine.Engine.Scripts.Utilities; +using EscapeRoomEngine.Engine.Runtime.Utilities; using UnityEngine; -using Logger = Escape_Room_Engine.Engine.Scripts.Utilities.Logger; -using LogType = Escape_Room_Engine.Engine.Scripts.Utilities.LogType; +using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger; +using LogType = EscapeRoomEngine.Engine.Runtime.Utilities.LogType; using Object = UnityEngine.Object; -namespace Escape_Room_Engine.Engine.Scripts.Modules +namespace EscapeRoomEngine.Engine.Runtime.Modules { public enum Orientation { diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules/Module.cs.meta b/Assets/Engine/Runtime/Modules/Module.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Modules/Module.cs.meta rename to Assets/Engine/Runtime/Modules/Module.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules/ModuleDescription.cs b/Assets/Engine/Runtime/Modules/ModuleDescription.cs similarity index 79% rename from Assets/Escape Room Engine/Engine/Scripts/Modules/ModuleDescription.cs rename to Assets/Engine/Runtime/Modules/ModuleDescription.cs index 9f662ff..a087459 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Modules/ModuleDescription.cs +++ b/Assets/Engine/Runtime/Modules/ModuleDescription.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Escape_Room_Engine.Engine.Scripts.Requirements; +using EscapeRoomEngine.Engine.Runtime.Requirements; using UnityEngine; -namespace Escape_Room_Engine.Engine.Scripts.Modules +namespace EscapeRoomEngine.Engine.Runtime.Modules { [CreateAssetMenu(menuName = "Modules/Generic Module")] public class ModuleDescription : ScriptableObject diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules/ModuleDescription.cs.meta b/Assets/Engine/Runtime/Modules/ModuleDescription.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Modules/ModuleDescription.cs.meta rename to Assets/Engine/Runtime/Modules/ModuleDescription.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules/ModuleState.cs b/Assets/Engine/Runtime/Modules/ModuleState.cs similarity index 80% rename from Assets/Escape Room Engine/Engine/Scripts/Modules/ModuleState.cs rename to Assets/Engine/Runtime/Modules/ModuleState.cs index 8df075f..2e9ee46 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Modules/ModuleState.cs +++ b/Assets/Engine/Runtime/Modules/ModuleState.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Escape_Room_Engine.Engine.Scripts.Modules +namespace EscapeRoomEngine.Engine.Runtime.Modules { public class ModuleState : MonoBehaviour { diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules/ModuleState.cs.meta b/Assets/Engine/Runtime/Modules/ModuleState.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Modules/ModuleState.cs.meta rename to Assets/Engine/Runtime/Modules/ModuleState.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules/ModuleType.cs b/Assets/Engine/Runtime/Modules/ModuleType.cs similarity index 65% rename from Assets/Escape Room Engine/Engine/Scripts/Modules/ModuleType.cs rename to Assets/Engine/Runtime/Modules/ModuleType.cs index eea3582..761180b 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Modules/ModuleType.cs +++ b/Assets/Engine/Runtime/Modules/ModuleType.cs @@ -1,4 +1,4 @@ -namespace Escape_Room_Engine.Engine.Scripts.Modules +namespace EscapeRoomEngine.Engine.Runtime.Modules { public enum ModuleType { diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules/ModuleType.cs.meta b/Assets/Engine/Runtime/Modules/ModuleType.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Modules/ModuleType.cs.meta rename to Assets/Engine/Runtime/Modules/ModuleType.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules/PuzzleModule.cs b/Assets/Engine/Runtime/Modules/PuzzleModule.cs similarity index 93% rename from Assets/Escape Room Engine/Engine/Scripts/Modules/PuzzleModule.cs rename to Assets/Engine/Runtime/Modules/PuzzleModule.cs index 5370a05..cd34d41 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Modules/PuzzleModule.cs +++ b/Assets/Engine/Runtime/Modules/PuzzleModule.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Escape_Room_Engine.Engine.Scripts.Modules +namespace EscapeRoomEngine.Engine.Runtime.Modules { public class PuzzleModule : Module { diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules/PuzzleModule.cs.meta b/Assets/Engine/Runtime/Modules/PuzzleModule.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Modules/PuzzleModule.cs.meta rename to Assets/Engine/Runtime/Modules/PuzzleModule.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules/PuzzleModuleDescription.cs b/Assets/Engine/Runtime/Modules/PuzzleModuleDescription.cs similarity index 74% rename from Assets/Escape Room Engine/Engine/Scripts/Modules/PuzzleModuleDescription.cs rename to Assets/Engine/Runtime/Modules/PuzzleModuleDescription.cs index 310a643..41946b6 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Modules/PuzzleModuleDescription.cs +++ b/Assets/Engine/Runtime/Modules/PuzzleModuleDescription.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Escape_Room_Engine.Engine.Scripts.Modules +namespace EscapeRoomEngine.Engine.Runtime.Modules { [CreateAssetMenu(menuName = "Modules/Puzzle")] public class PuzzleModuleDescription : ModuleDescription diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules/PuzzleModuleDescription.cs.meta b/Assets/Engine/Runtime/Modules/PuzzleModuleDescription.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Modules/PuzzleModuleDescription.cs.meta rename to Assets/Engine/Runtime/Modules/PuzzleModuleDescription.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules/PuzzleState.cs b/Assets/Engine/Runtime/Modules/PuzzleState.cs similarity index 91% rename from Assets/Escape Room Engine/Engine/Scripts/Modules/PuzzleState.cs rename to Assets/Engine/Runtime/Modules/PuzzleState.cs index 4cfb269..de13057 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Modules/PuzzleState.cs +++ b/Assets/Engine/Runtime/Modules/PuzzleState.cs @@ -1,10 +1,10 @@ using System; -using Escape_Room_Engine.Engine.Scripts.Utilities; +using EscapeRoomEngine.Engine.Runtime.Utilities; using NaughtyAttributes; -using Logger = Escape_Room_Engine.Engine.Scripts.Utilities.Logger; -using LogType = Escape_Room_Engine.Engine.Scripts.Utilities.LogType; +using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger; +using LogType = EscapeRoomEngine.Engine.Runtime.Utilities.LogType; -namespace Escape_Room_Engine.Engine.Scripts.Modules +namespace EscapeRoomEngine.Engine.Runtime.Modules { public enum PuzzleEventType { diff --git a/Assets/Escape Room Engine/Engine/Scripts/Modules/PuzzleState.cs.meta b/Assets/Engine/Runtime/Modules/PuzzleState.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Modules/PuzzleState.cs.meta rename to Assets/Engine/Runtime/Modules/PuzzleState.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Passage.cs b/Assets/Engine/Runtime/Passage.cs similarity index 84% rename from Assets/Escape Room Engine/Engine/Scripts/Passage.cs rename to Assets/Engine/Runtime/Passage.cs index bbb02a6..79f574f 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Passage.cs +++ b/Assets/Engine/Runtime/Passage.cs @@ -1,9 +1,9 @@ -using Escape_Room_Engine.Engine.Scripts.Modules; +using EscapeRoomEngine.Engine.Runtime.Modules; using UnityEngine; -using Logger = Escape_Room_Engine.Engine.Scripts.Utilities.Logger; -using LogType = Escape_Room_Engine.Engine.Scripts.Utilities.LogType; +using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger; +using LogType = EscapeRoomEngine.Engine.Runtime.Utilities.LogType; -namespace Escape_Room_Engine.Engine.Scripts +namespace EscapeRoomEngine.Engine.Runtime { public class Passage { diff --git a/Assets/Escape Room Engine/Engine/Scripts/Passage.cs.meta b/Assets/Engine/Runtime/Passage.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Passage.cs.meta rename to Assets/Engine/Runtime/Passage.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Requirements.meta b/Assets/Engine/Runtime/Requirements.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Requirements.meta rename to Assets/Engine/Runtime/Requirements.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Requirements/FaceSpaceCenter.cs b/Assets/Engine/Runtime/Requirements/FaceSpaceCenter.cs similarity index 89% rename from Assets/Escape Room Engine/Engine/Scripts/Requirements/FaceSpaceCenter.cs rename to Assets/Engine/Runtime/Requirements/FaceSpaceCenter.cs index 1e2e121..4b097b8 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Requirements/FaceSpaceCenter.cs +++ b/Assets/Engine/Runtime/Requirements/FaceSpaceCenter.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Escape_Room_Engine.Engine.Scripts.Modules; +using EscapeRoomEngine.Engine.Runtime.Modules; using UnityEngine; -namespace Escape_Room_Engine.Engine.Scripts.Requirements +namespace EscapeRoomEngine.Engine.Runtime.Requirements { [CreateAssetMenu(menuName = "Requirements/Face Space Center")] public class FaceSpaceCenter : OrientationRequirement diff --git a/Assets/Escape Room Engine/Engine/Scripts/Requirements/FaceSpaceCenter.cs.meta b/Assets/Engine/Runtime/Requirements/FaceSpaceCenter.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Requirements/FaceSpaceCenter.cs.meta rename to Assets/Engine/Runtime/Requirements/FaceSpaceCenter.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Requirements/NoOverlap.cs b/Assets/Engine/Runtime/Requirements/NoOverlap.cs similarity index 90% rename from Assets/Escape Room Engine/Engine/Scripts/Requirements/NoOverlap.cs rename to Assets/Engine/Runtime/Requirements/NoOverlap.cs index 1c6d7d7..bca2c40 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Requirements/NoOverlap.cs +++ b/Assets/Engine/Runtime/Requirements/NoOverlap.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using Escape_Room_Engine.Engine.Scripts.Modules; +using EscapeRoomEngine.Engine.Runtime.Modules; using NaughtyAttributes; using UnityEngine; -namespace Escape_Room_Engine.Engine.Scripts.Requirements +namespace EscapeRoomEngine.Engine.Runtime.Requirements { [CreateAssetMenu(menuName = "Requirements/No Overlap")] public class NoOverlap : PlacementRequirement diff --git a/Assets/Escape Room Engine/Engine/Scripts/Requirements/NoOverlap.cs.meta b/Assets/Engine/Runtime/Requirements/NoOverlap.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Requirements/NoOverlap.cs.meta rename to Assets/Engine/Runtime/Requirements/NoOverlap.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Requirements/OrientationRequirement.cs b/Assets/Engine/Runtime/Requirements/OrientationRequirement.cs similarity index 87% rename from Assets/Escape Room Engine/Engine/Scripts/Requirements/OrientationRequirement.cs rename to Assets/Engine/Runtime/Requirements/OrientationRequirement.cs index 5a2697a..44b8340 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Requirements/OrientationRequirement.cs +++ b/Assets/Engine/Runtime/Requirements/OrientationRequirement.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Linq; -using Escape_Room_Engine.Engine.Scripts.Modules; -using Escape_Room_Engine.Engine.Scripts.Utilities; +using EscapeRoomEngine.Engine.Runtime.Modules; +using EscapeRoomEngine.Engine.Runtime.Utilities; -namespace Escape_Room_Engine.Engine.Scripts.Requirements +namespace EscapeRoomEngine.Engine.Runtime.Requirements { public abstract class OrientationRequirement : Requirement { diff --git a/Assets/Escape Room Engine/Engine/Scripts/Requirements/OrientationRequirement.cs.meta b/Assets/Engine/Runtime/Requirements/OrientationRequirement.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Requirements/OrientationRequirement.cs.meta rename to Assets/Engine/Runtime/Requirements/OrientationRequirement.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Requirements/PlaceAlongSpaceEdges.cs b/Assets/Engine/Runtime/Requirements/PlaceAlongSpaceEdges.cs similarity index 89% rename from Assets/Escape Room Engine/Engine/Scripts/Requirements/PlaceAlongSpaceEdges.cs rename to Assets/Engine/Runtime/Requirements/PlaceAlongSpaceEdges.cs index ebb39ef..ca9946d 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Requirements/PlaceAlongSpaceEdges.cs +++ b/Assets/Engine/Runtime/Requirements/PlaceAlongSpaceEdges.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Escape_Room_Engine.Engine.Scripts.Modules; +using EscapeRoomEngine.Engine.Runtime.Modules; using UnityEngine; -namespace Escape_Room_Engine.Engine.Scripts.Requirements +namespace EscapeRoomEngine.Engine.Runtime.Requirements { [CreateAssetMenu(menuName = "Requirements/Place Along Space Edges")] public class PlaceAlongSpaceEdges : PlacementRequirement diff --git a/Assets/Escape Room Engine/Engine/Scripts/Requirements/PlaceAlongSpaceEdges.cs.meta b/Assets/Engine/Runtime/Requirements/PlaceAlongSpaceEdges.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Requirements/PlaceAlongSpaceEdges.cs.meta rename to Assets/Engine/Runtime/Requirements/PlaceAlongSpaceEdges.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Requirements/PlaceAnywhere.cs b/Assets/Engine/Runtime/Requirements/PlaceAnywhere.cs similarity index 77% rename from Assets/Escape Room Engine/Engine/Scripts/Requirements/PlaceAnywhere.cs rename to Assets/Engine/Runtime/Requirements/PlaceAnywhere.cs index fd08ac1..231c64e 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Requirements/PlaceAnywhere.cs +++ b/Assets/Engine/Runtime/Requirements/PlaceAnywhere.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Escape_Room_Engine.Engine.Scripts.Modules; +using EscapeRoomEngine.Engine.Runtime.Modules; using UnityEngine; -namespace Escape_Room_Engine.Engine.Scripts.Requirements +namespace EscapeRoomEngine.Engine.Runtime.Requirements { [CreateAssetMenu(menuName = "Requirements/Place Anywhere")] public class PlaceAnywhere : PlacementRequirement diff --git a/Assets/Escape Room Engine/Engine/Scripts/Requirements/PlaceAnywhere.cs.meta b/Assets/Engine/Runtime/Requirements/PlaceAnywhere.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Requirements/PlaceAnywhere.cs.meta rename to Assets/Engine/Runtime/Requirements/PlaceAnywhere.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Requirements/PlacementRequirement.cs b/Assets/Engine/Runtime/Requirements/PlacementRequirement.cs similarity index 61% rename from Assets/Escape Room Engine/Engine/Scripts/Requirements/PlacementRequirement.cs rename to Assets/Engine/Runtime/Requirements/PlacementRequirement.cs index 53222c4..ced085b 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Requirements/PlacementRequirement.cs +++ b/Assets/Engine/Runtime/Requirements/PlacementRequirement.cs @@ -1,10 +1,12 @@ using System.Collections.Generic; using System.Linq; -using Escape_Room_Engine.Engine.Scripts.Modules; -using Escape_Room_Engine.Engine.Scripts.Utilities; +using EscapeRoomEngine.Engine.Runtime.Modules; +using EscapeRoomEngine.Engine.Runtime.Utilities; using UnityEngine; +using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger; +using LogType = EscapeRoomEngine.Engine.Runtime.Utilities.LogType; -namespace Escape_Room_Engine.Engine.Scripts.Requirements +namespace EscapeRoomEngine.Engine.Runtime.Requirements { public abstract class PlacementRequirement : Requirement { @@ -17,7 +19,7 @@ namespace Escape_Room_Engine.Engine.Scripts.Requirements module.description.placementRequirements, module, space); - Utilities.Logger.Log($"placement candidates: {string.Join(", ", placementCandidates.ToList().ConvertAll(c => c.ToString()))}", Utilities.LogType.RequirementResolution); + Logger.Log($"placement candidates: {string.Join(", ", placementCandidates.ToList().ConvertAll(c => c.ToString()))}", LogType.RequirementResolution); if (placementCandidates.Count > 0) { @@ -27,7 +29,7 @@ namespace Escape_Room_Engine.Engine.Scripts.Requirements // ReSharper disable once RedundantIfElseBlock else { - Utilities.Logger.Log($"Could not find suitable placement for {module}", Utilities.LogType.ModulePlacement); + Logger.Log($"Could not find suitable placement for {module}", LogType.ModulePlacement); return false; } } diff --git a/Assets/Escape Room Engine/Engine/Scripts/Requirements/PlacementRequirement.cs.meta b/Assets/Engine/Runtime/Requirements/PlacementRequirement.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Requirements/PlacementRequirement.cs.meta rename to Assets/Engine/Runtime/Requirements/PlacementRequirement.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Requirements/Requirement.cs b/Assets/Engine/Runtime/Requirements/Requirement.cs similarity index 87% rename from Assets/Escape Room Engine/Engine/Scripts/Requirements/Requirement.cs rename to Assets/Engine/Runtime/Requirements/Requirement.cs index c865e2d..55ee981 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Requirements/Requirement.cs +++ b/Assets/Engine/Runtime/Requirements/Requirement.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Escape_Room_Engine.Engine.Scripts.Modules; +using EscapeRoomEngine.Engine.Runtime.Modules; using UnityEngine; -namespace Escape_Room_Engine.Engine.Scripts.Requirements +namespace EscapeRoomEngine.Engine.Runtime.Requirements { public abstract class Requirement : ScriptableObject { diff --git a/Assets/Escape Room Engine/Engine/Scripts/Requirements/Requirement.cs.meta b/Assets/Engine/Runtime/Requirements/Requirement.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Requirements/Requirement.cs.meta rename to Assets/Engine/Runtime/Requirements/Requirement.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Room.cs b/Assets/Engine/Runtime/Room.cs similarity index 90% rename from Assets/Escape Room Engine/Engine/Scripts/Room.cs rename to Assets/Engine/Runtime/Room.cs index 50820e5..51a27fc 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Room.cs +++ b/Assets/Engine/Runtime/Room.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Linq; -using Escape_Room_Engine.Engine.Scripts.Modules; +using EscapeRoomEngine.Engine.Runtime.Modules; using UnityEngine; -using Logger = Escape_Room_Engine.Engine.Scripts.Utilities.Logger; -using LogType = Escape_Room_Engine.Engine.Scripts.Utilities.LogType; +using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger; +using LogType = EscapeRoomEngine.Engine.Runtime.Utilities.LogType; -namespace Escape_Room_Engine.Engine.Scripts +namespace EscapeRoomEngine.Engine.Runtime { public class Room { diff --git a/Assets/Escape Room Engine/Engine/Scripts/Room.cs.meta b/Assets/Engine/Runtime/Room.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Room.cs.meta rename to Assets/Engine/Runtime/Room.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Space.cs b/Assets/Engine/Runtime/Space.cs similarity index 94% rename from Assets/Escape Room Engine/Engine/Scripts/Space.cs rename to Assets/Engine/Runtime/Space.cs index fd0f5aa..ecec5bd 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Space.cs +++ b/Assets/Engine/Runtime/Space.cs @@ -1,12 +1,13 @@ using System; using System.Collections.Generic; -using Escape_Room_Engine.Engine.Scripts.Modules; -using Escape_Room_Engine.Engine.Scripts.Requirements; +using EscapeRoomEngine.Engine.Runtime.Modules; +using EscapeRoomEngine.Engine.Runtime.Requirements; using UnityEngine; -using LogType = Escape_Room_Engine.Engine.Scripts.Utilities.LogType; +using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger; +using LogType = EscapeRoomEngine.Engine.Runtime.Utilities.LogType; using Object = UnityEngine.Object; -namespace Escape_Room_Engine.Engine.Scripts +namespace EscapeRoomEngine.Engine.Runtime { public class Space { @@ -148,7 +149,7 @@ namespace Escape_Room_Engine.Engine.Scripts var dimensions = new Dimensions(xMax - xMin, zMax - zMin, xMin, zMin); - Utilities.Logger.Log($"Generated space dimensions {dimensions} from entrance position {position}", LogType.RoomGeneration); + Logger.Log($"Generated space dimensions {dimensions} from entrance position {position}", LogType.RoomGeneration); return dimensions; } diff --git a/Assets/Escape Room Engine/Engine/Scripts/Space.cs.meta b/Assets/Engine/Runtime/Space.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Space.cs.meta rename to Assets/Engine/Runtime/Space.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/SpaceTile.cs b/Assets/Engine/Runtime/SpaceTile.cs similarity index 94% rename from Assets/Escape Room Engine/Engine/Scripts/SpaceTile.cs rename to Assets/Engine/Runtime/SpaceTile.cs index 7a886c8..4546abc 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/SpaceTile.cs +++ b/Assets/Engine/Runtime/SpaceTile.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Escape_Room_Engine.Engine.Scripts.Utilities; +using EscapeRoomEngine.Engine.Runtime.Utilities; using NaughtyAttributes; using UnityEngine; -namespace Escape_Room_Engine.Engine.Scripts +namespace EscapeRoomEngine.Engine.Runtime { [SuppressMessage("ReSharper", "InconsistentNaming")] public enum TileLocation diff --git a/Assets/Escape Room Engine/Engine/Scripts/SpaceTile.cs.meta b/Assets/Engine/Runtime/SpaceTile.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/SpaceTile.cs.meta rename to Assets/Engine/Runtime/SpaceTile.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Utilities.meta b/Assets/Engine/Runtime/Utilities.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Utilities.meta rename to Assets/Engine/Runtime/Utilities.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Utilities/Logger.cs b/Assets/Engine/Runtime/Utilities/Logger.cs similarity index 94% rename from Assets/Escape Room Engine/Engine/Scripts/Utilities/Logger.cs rename to Assets/Engine/Runtime/Utilities/Logger.cs index 6187520..9364955 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Utilities/Logger.cs +++ b/Assets/Engine/Runtime/Utilities/Logger.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Escape_Room_Engine.Engine.Scripts.Utilities +namespace EscapeRoomEngine.Engine.Runtime.Utilities { public enum LogType { diff --git a/Assets/Escape Room Engine/Engine/Scripts/Utilities/Logger.cs.meta b/Assets/Engine/Runtime/Utilities/Logger.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Utilities/Logger.cs.meta rename to Assets/Engine/Runtime/Utilities/Logger.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Utilities/Option.cs b/Assets/Engine/Runtime/Utilities/Option.cs similarity index 97% rename from Assets/Escape Room Engine/Engine/Scripts/Utilities/Option.cs rename to Assets/Engine/Runtime/Utilities/Option.cs index ed1061d..8ad9b43 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Utilities/Option.cs +++ b/Assets/Engine/Runtime/Utilities/Option.cs @@ -1,6 +1,6 @@ using System; -namespace Escape_Room_Engine.Engine.Scripts.Utilities +namespace EscapeRoomEngine.Engine.Runtime.Utilities { /// /// Optional type with a subset of the functionality of the one described in the Rust documentation at https://doc.rust-lang.org/std/option/enum.Option.html. diff --git a/Assets/Escape Room Engine/Engine/Scripts/Utilities/Option.cs.meta b/Assets/Engine/Runtime/Utilities/Option.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Utilities/Option.cs.meta rename to Assets/Engine/Runtime/Utilities/Option.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Utilities/UDictionary.cs b/Assets/Engine/Runtime/Utilities/UDictionary.cs similarity index 99% rename from Assets/Escape Room Engine/Engine/Scripts/Utilities/UDictionary.cs rename to Assets/Engine/Runtime/Utilities/UDictionary.cs index b6d9952..c3ce6b3 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Utilities/UDictionary.cs +++ b/Assets/Engine/Runtime/Utilities/UDictionary.cs @@ -3,14 +3,11 @@ using System; using System.Collections; using System.Collections.Generic; -using UnityEngine; - -#if UNITY_EDITOR using UnityEditor; using UnityEditorInternal; -#endif +using UnityEngine; -namespace Escape_Room_Engine.Engine.Scripts.Utilities +namespace EscapeRoomEngine.Engine.Runtime.Utilities { [Serializable] public class UDictionary diff --git a/Assets/Escape Room Engine/Engine/Scripts/Utilities/UDictionary.cs.meta b/Assets/Engine/Runtime/Utilities/UDictionary.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Utilities/UDictionary.cs.meta rename to Assets/Engine/Runtime/Utilities/UDictionary.cs.meta diff --git a/Assets/Escape Room Engine/Engine/Scripts/Utilities/Utilities.cs b/Assets/Engine/Runtime/Utilities/Utilities.cs similarity index 95% rename from Assets/Escape Room Engine/Engine/Scripts/Utilities/Utilities.cs rename to Assets/Engine/Runtime/Utilities/Utilities.cs index 3adfd9d..310ad55 100644 --- a/Assets/Escape Room Engine/Engine/Scripts/Utilities/Utilities.cs +++ b/Assets/Engine/Runtime/Utilities/Utilities.cs @@ -2,7 +2,7 @@ using System.Linq; using UnityEngine; -namespace Escape_Room_Engine.Engine.Scripts.Utilities +namespace EscapeRoomEngine.Engine.Runtime.Utilities { public static class Utilities { diff --git a/Assets/Escape Room Engine/Engine/Scripts/Utilities/Utilities.cs.meta b/Assets/Engine/Runtime/Utilities/Utilities.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Engine/Scripts/Utilities/Utilities.cs.meta rename to Assets/Engine/Runtime/Utilities/Utilities.cs.meta diff --git a/Assets/Engine/package.json b/Assets/Engine/package.json new file mode 100644 index 0000000..8dfc3f9 --- /dev/null +++ b/Assets/Engine/package.json @@ -0,0 +1,18 @@ +{ + "displayName": "Escape Room Engine", + "name": "wtf.milan.escape-room-engine", + "version": "0.0.1", + "description": "A VR escape room engine as an example implementation of the modularVR framework.", + "unity": "2022.1", + "author": { + "name": "Milan van Zanten", + "email": "milan@milan.wtf", + "url": "https://milan.wtf" + }, + "hideInEditor": false, + "keywords": ["vr", "virtual reality", "modular", "escape room"], + "dependencies": { + "wtf.milan.escape-room-engine.portal": "0.0.1", + "com.dbrizov.naughtyattributes": "2.1.4" + } +} diff --git a/Assets/Engine/package.json.meta b/Assets/Engine/package.json.meta new file mode 100644 index 0000000..fe8c3a3 --- /dev/null +++ b/Assets/Engine/package.json.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2679e008e9e54434968b04592a3cdbd6 +timeCreated: 1668935913 \ No newline at end of file diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_AlbedoTransparency.png b/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_AlbedoTransparency.png deleted file mode 100644 index c632be4..0000000 Binary files a/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_AlbedoTransparency.png and /dev/null differ diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Height.png b/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Height.png deleted file mode 100644 index 298a01a..0000000 Binary files a/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Height.png and /dev/null differ diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_MetallicSmoothness.png b/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_MetallicSmoothness.png deleted file mode 100644 index 9b16406..0000000 Binary files a/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_MetallicSmoothness.png and /dev/null differ diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Normal.png b/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Normal.png deleted file mode 100644 index ebeab8d..0000000 Binary files a/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Normal.png and /dev/null differ diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Occlusion.png b/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Occlusion.png deleted file mode 100644 index 177970d..0000000 Binary files a/Assets/Escape Room Engine/Desert/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Occlusion.png and /dev/null differ diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_Height.png b/Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_Height.png deleted file mode 100644 index 880678a..0000000 Binary files a/Assets/Escape Room Engine/Desert/Materials/Textures/Space Floor/Space Floor_pewter_striped_Height.png and /dev/null differ diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/skybox.hdr b/Assets/Escape Room Engine/Desert/Materials/Textures/skybox.hdr deleted file mode 100644 index 66cd534..0000000 Binary files a/Assets/Escape Room Engine/Desert/Materials/Textures/skybox.hdr and /dev/null differ diff --git a/Assets/Escape Room Engine/Desert/Materials/Textures/skybox_4k.hdr b/Assets/Escape Room Engine/Desert/Materials/Textures/skybox_4k.hdr deleted file mode 100644 index fc0da5d..0000000 Binary files a/Assets/Escape Room Engine/Desert/Materials/Textures/skybox_4k.hdr and /dev/null differ diff --git a/Assets/Escape Room Engine/Desert/Models/Desert Floor.blend b/Assets/Escape Room Engine/Desert/Models/Desert Floor.blend deleted file mode 100644 index 02dcb5f..0000000 Binary files a/Assets/Escape Room Engine/Desert/Models/Desert Floor.blend and /dev/null differ diff --git a/Assets/Escape Room Engine/Desert/Models/Desert Floor.fbx b/Assets/Escape Room Engine/Desert/Models/Desert Floor.fbx deleted file mode 100644 index b0da776..0000000 Binary files a/Assets/Escape Room Engine/Desert/Models/Desert Floor.fbx and /dev/null differ diff --git a/Assets/Escape Room Engine/Desert/Models/Space Floor.blend b/Assets/Escape Room Engine/Desert/Models/Space Floor.blend deleted file mode 100644 index c3d2b9b..0000000 Binary files a/Assets/Escape Room Engine/Desert/Models/Space Floor.blend and /dev/null differ diff --git a/Assets/Escape Room Engine/Desert/Models/Space Floor.fbx b/Assets/Escape Room Engine/Desert/Models/Space Floor.fbx deleted file mode 100644 index 3d758ea..0000000 Binary files a/Assets/Escape Room Engine/Desert/Models/Space Floor.fbx and /dev/null differ diff --git a/Assets/Escape Room Engine/Engine/Models/Space.blend b/Assets/Escape Room Engine/Engine/Models/Space.blend deleted file mode 100644 index 7dd381e..0000000 Binary files a/Assets/Escape Room Engine/Engine/Models/Space.blend and /dev/null differ diff --git a/Assets/Escape Room Engine/Portal/Models/Portal Frame.blend b/Assets/Escape Room Engine/Portal/Models/Portal Frame.blend deleted file mode 100644 index 0ade972..0000000 Binary files a/Assets/Escape Room Engine/Portal/Models/Portal Frame.blend and /dev/null differ diff --git a/Assets/Escape Room Engine/Portal/Models/Portal Screen.blend b/Assets/Escape Room Engine/Portal/Models/Portal Screen.blend deleted file mode 100644 index 5b0347e..0000000 Binary files a/Assets/Escape Room Engine/Portal/Models/Portal Screen.blend and /dev/null differ diff --git a/Assets/Escape Room Engine/Portal.meta b/Assets/Portal.meta similarity index 100% rename from Assets/Escape Room Engine/Portal.meta rename to Assets/Portal.meta diff --git a/Assets/Portal/Assets.meta b/Assets/Portal/Assets.meta new file mode 100644 index 0000000..76b2458 --- /dev/null +++ b/Assets/Portal/Assets.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 66daa331b4934750b899f09b3bf72749 +timeCreated: 1668944964 \ No newline at end of file diff --git a/Assets/Escape Room Engine/Portal/Materials.meta b/Assets/Portal/Assets/Materials.meta similarity index 100% rename from Assets/Escape Room Engine/Portal/Materials.meta rename to Assets/Portal/Assets/Materials.meta diff --git a/Assets/Escape Room Engine/Portal/Materials/Portal.mat b/Assets/Portal/Assets/Materials/Portal.mat similarity index 100% rename from Assets/Escape Room Engine/Portal/Materials/Portal.mat rename to Assets/Portal/Assets/Materials/Portal.mat diff --git a/Assets/Escape Room Engine/Portal/Materials/Portal.mat.meta b/Assets/Portal/Assets/Materials/Portal.mat.meta similarity index 100% rename from Assets/Escape Room Engine/Portal/Materials/Portal.mat.meta rename to Assets/Portal/Assets/Materials/Portal.mat.meta diff --git a/Assets/Escape Room Engine/Portal/Materials/PortalShader.shader b/Assets/Portal/Assets/Materials/PortalShader.shader similarity index 100% rename from Assets/Escape Room Engine/Portal/Materials/PortalShader.shader rename to Assets/Portal/Assets/Materials/PortalShader.shader diff --git a/Assets/Escape Room Engine/Portal/Materials/PortalShader.shader.meta b/Assets/Portal/Assets/Materials/PortalShader.shader.meta similarity index 100% rename from Assets/Escape Room Engine/Portal/Materials/PortalShader.shader.meta rename to Assets/Portal/Assets/Materials/PortalShader.shader.meta diff --git a/Assets/Escape Room Engine/Portal/Models.meta b/Assets/Portal/Assets/Models.meta similarity index 100% rename from Assets/Escape Room Engine/Portal/Models.meta rename to Assets/Portal/Assets/Models.meta diff --git a/Assets/Portal/Assets/Models/Portal Frame.blend b/Assets/Portal/Assets/Models/Portal Frame.blend new file mode 100644 index 0000000..3c761c0 --- /dev/null +++ b/Assets/Portal/Assets/Models/Portal Frame.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4606958e16fcc574289a62b92a1d5e2ddda1afa6afbf9fce4eee37b81ce4d760 +size 790616 diff --git a/Assets/Escape Room Engine/Portal/Models/Portal Frame.blend.meta b/Assets/Portal/Assets/Models/Portal Frame.blend.meta similarity index 100% rename from Assets/Escape Room Engine/Portal/Models/Portal Frame.blend.meta rename to Assets/Portal/Assets/Models/Portal Frame.blend.meta diff --git a/Assets/Escape Room Engine/Portal/Models/Portal Frame.blend1 b/Assets/Portal/Assets/Models/Portal Frame.blend1 similarity index 100% rename from Assets/Escape Room Engine/Portal/Models/Portal Frame.blend1 rename to Assets/Portal/Assets/Models/Portal Frame.blend1 diff --git a/Assets/Escape Room Engine/Portal/Models/Portal Frame.blend1.meta b/Assets/Portal/Assets/Models/Portal Frame.blend1.meta similarity index 100% rename from Assets/Escape Room Engine/Portal/Models/Portal Frame.blend1.meta rename to Assets/Portal/Assets/Models/Portal Frame.blend1.meta diff --git a/Assets/Portal/Assets/Models/Portal Screen.blend b/Assets/Portal/Assets/Models/Portal Screen.blend new file mode 100644 index 0000000..ed6a492 --- /dev/null +++ b/Assets/Portal/Assets/Models/Portal Screen.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d99a6e730e86be83ef70bb66b431f998d030faf18f32387965b11666ccf24b0 +size 797684 diff --git a/Assets/Escape Room Engine/Portal/Models/Portal Screen.blend.meta b/Assets/Portal/Assets/Models/Portal Screen.blend.meta similarity index 100% rename from Assets/Escape Room Engine/Portal/Models/Portal Screen.blend.meta rename to Assets/Portal/Assets/Models/Portal Screen.blend.meta diff --git a/Assets/Escape Room Engine/Portal/Models/Portal Screen.blend1 b/Assets/Portal/Assets/Models/Portal Screen.blend1 similarity index 100% rename from Assets/Escape Room Engine/Portal/Models/Portal Screen.blend1 rename to Assets/Portal/Assets/Models/Portal Screen.blend1 diff --git a/Assets/Escape Room Engine/Portal/Models/Portal Screen.blend1.meta b/Assets/Portal/Assets/Models/Portal Screen.blend1.meta similarity index 100% rename from Assets/Escape Room Engine/Portal/Models/Portal Screen.blend1.meta rename to Assets/Portal/Assets/Models/Portal Screen.blend1.meta diff --git a/Assets/Escape Room Engine/Portal/Prefabs.meta b/Assets/Portal/Assets/Prefabs.meta similarity index 100% rename from Assets/Escape Room Engine/Portal/Prefabs.meta rename to Assets/Portal/Assets/Prefabs.meta diff --git a/Assets/Escape Room Engine/Portal/Prefabs/Portal.prefab b/Assets/Portal/Assets/Prefabs/Portal.prefab similarity index 100% rename from Assets/Escape Room Engine/Portal/Prefabs/Portal.prefab rename to Assets/Portal/Assets/Prefabs/Portal.prefab diff --git a/Assets/Escape Room Engine/Portal/Prefabs/Portal.prefab.meta b/Assets/Portal/Assets/Prefabs/Portal.prefab.meta similarity index 100% rename from Assets/Escape Room Engine/Portal/Prefabs/Portal.prefab.meta rename to Assets/Portal/Assets/Prefabs/Portal.prefab.meta diff --git a/Assets/Portal/CHANGELOG.md b/Assets/Portal/CHANGELOG.md new file mode 100644 index 0000000..c457134 --- /dev/null +++ b/Assets/Portal/CHANGELOG.md @@ -0,0 +1,13 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +### Added + +- Portal rendering +- Passing through portals diff --git a/Assets/Portal/CHANGELOG.md.meta b/Assets/Portal/CHANGELOG.md.meta new file mode 100644 index 0000000..7685570 --- /dev/null +++ b/Assets/Portal/CHANGELOG.md.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 262758ef572e4d6fac62967946667239 +timeCreated: 1668943830 \ No newline at end of file diff --git a/Assets/Portal/README.md b/Assets/Portal/README.md new file mode 100644 index 0000000..29ffbcc --- /dev/null +++ b/Assets/Portal/README.md @@ -0,0 +1,3 @@ +# Escape Room Engine Portals + +An implementation of portals for the VR escape room engine. \ No newline at end of file diff --git a/Assets/Portal/README.md.meta b/Assets/Portal/README.md.meta new file mode 100644 index 0000000..d842fdb --- /dev/null +++ b/Assets/Portal/README.md.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ea99eadf762e4f118c169f68d950ec78 +timeCreated: 1668943800 \ No newline at end of file diff --git a/Assets/Escape Room Engine/Portal/Scripts.meta b/Assets/Portal/Runtime.meta similarity index 100% rename from Assets/Escape Room Engine/Portal/Scripts.meta rename to Assets/Portal/Runtime.meta diff --git a/Assets/Escape Room Engine/Portal/Scripts/HandPortalDriver.cs b/Assets/Portal/Runtime/HandPortalDriver.cs similarity index 84% rename from Assets/Escape Room Engine/Portal/Scripts/HandPortalDriver.cs rename to Assets/Portal/Runtime/HandPortalDriver.cs index 58242b3..899f9d2 100644 --- a/Assets/Escape Room Engine/Portal/Scripts/HandPortalDriver.cs +++ b/Assets/Portal/Runtime/HandPortalDriver.cs @@ -1,4 +1,4 @@ -namespace Escape_Room_Engine.Portal +namespace EscapeRoomEngine.Portal.Runtime { public class HandPortalDriver : PortalDriver { diff --git a/Assets/Escape Room Engine/Portal/Scripts/HandPortalDriver.cs.meta b/Assets/Portal/Runtime/HandPortalDriver.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Portal/Scripts/HandPortalDriver.cs.meta rename to Assets/Portal/Runtime/HandPortalDriver.cs.meta diff --git a/Assets/Escape Room Engine/Portal/Scripts/PlayerCamera.cs b/Assets/Portal/Runtime/PlayerCamera.cs similarity index 88% rename from Assets/Escape Room Engine/Portal/Scripts/PlayerCamera.cs rename to Assets/Portal/Runtime/PlayerCamera.cs index d47bc81..7646107 100644 --- a/Assets/Escape Room Engine/Portal/Scripts/PlayerCamera.cs +++ b/Assets/Portal/Runtime/PlayerCamera.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Escape_Room_Engine.Portal +namespace EscapeRoomEngine.Portal.Runtime { public class PlayerCamera : MonoBehaviour { diff --git a/Assets/Escape Room Engine/Portal/Scripts/PlayerCamera.cs.meta b/Assets/Portal/Runtime/PlayerCamera.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Portal/Scripts/PlayerCamera.cs.meta rename to Assets/Portal/Runtime/PlayerCamera.cs.meta diff --git a/Assets/Portal/Runtime/Portal.asmdef b/Assets/Portal/Runtime/Portal.asmdef new file mode 100644 index 0000000..c3c9174 --- /dev/null +++ b/Assets/Portal/Runtime/Portal.asmdef @@ -0,0 +1,18 @@ +{ + "name": "Portal", + "rootNamespace": "EscapeRoomEngine", + "references": [ + "GUID:75469ad4d38634e559750d17036d5f7c", + "GUID:15fc0a57446b3144c949da3e2b9737a9", + "GUID:fe685ec1767f73d42b749ea8045bfe43" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/Portal/Runtime/Portal.asmdef.meta b/Assets/Portal/Runtime/Portal.asmdef.meta new file mode 100644 index 0000000..503b4b8 --- /dev/null +++ b/Assets/Portal/Runtime/Portal.asmdef.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ba4c7dba98ca4c31818cc46276b5dea1 +timeCreated: 1668943888 \ No newline at end of file diff --git a/Assets/Escape Room Engine/Portal/Scripts/Portal.cs b/Assets/Portal/Runtime/Portal.cs similarity index 98% rename from Assets/Escape Room Engine/Portal/Scripts/Portal.cs rename to Assets/Portal/Runtime/Portal.cs index 75207ce..8a6edd2 100644 --- a/Assets/Escape Room Engine/Portal/Scripts/Portal.cs +++ b/Assets/Portal/Runtime/Portal.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using UnityEngine; -namespace Escape_Room_Engine.Portal +namespace EscapeRoomEngine.Portal.Runtime { [RequireComponent(typeof(Collider))] public class Portal : MonoBehaviour diff --git a/Assets/Escape Room Engine/Portal/Scripts/Portal.cs.meta b/Assets/Portal/Runtime/Portal.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Portal/Scripts/Portal.cs.meta rename to Assets/Portal/Runtime/Portal.cs.meta diff --git a/Assets/Escape Room Engine/Portal/Scripts/PortalCamera.cs b/Assets/Portal/Runtime/PortalCamera.cs similarity index 99% rename from Assets/Escape Room Engine/Portal/Scripts/PortalCamera.cs rename to Assets/Portal/Runtime/PortalCamera.cs index 268309e..8952a5b 100644 --- a/Assets/Escape Room Engine/Portal/Scripts/PortalCamera.cs +++ b/Assets/Portal/Runtime/PortalCamera.cs @@ -5,7 +5,7 @@ using UnityEngine.Rendering; using UnityEngine.Rendering.Universal; using UnityEngine.XR; -namespace Escape_Room_Engine.Portal +namespace EscapeRoomEngine.Portal.Runtime { [RequireComponent(typeof(Camera))] public class PortalCamera : MonoBehaviour diff --git a/Assets/Escape Room Engine/Portal/Scripts/PortalCamera.cs.meta b/Assets/Portal/Runtime/PortalCamera.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Portal/Scripts/PortalCamera.cs.meta rename to Assets/Portal/Runtime/PortalCamera.cs.meta diff --git a/Assets/Escape Room Engine/Portal/Scripts/PortalDriver.cs b/Assets/Portal/Runtime/PortalDriver.cs similarity index 98% rename from Assets/Escape Room Engine/Portal/Scripts/PortalDriver.cs rename to Assets/Portal/Runtime/PortalDriver.cs index 0c03631..d68a3fa 100644 --- a/Assets/Escape Room Engine/Portal/Scripts/PortalDriver.cs +++ b/Assets/Portal/Runtime/PortalDriver.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Escape_Room_Engine.Portal +namespace EscapeRoomEngine.Portal.Runtime { [RequireComponent(typeof(Collider), typeof(Rigidbody))] public class PortalDriver : MonoBehaviour diff --git a/Assets/Escape Room Engine/Portal/Scripts/PortalDriver.cs.meta b/Assets/Portal/Runtime/PortalDriver.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Portal/Scripts/PortalDriver.cs.meta rename to Assets/Portal/Runtime/PortalDriver.cs.meta diff --git a/Assets/Escape Room Engine/Portal/Scripts/PortalDriverClone.cs b/Assets/Portal/Runtime/PortalDriverClone.cs similarity index 97% rename from Assets/Escape Room Engine/Portal/Scripts/PortalDriverClone.cs rename to Assets/Portal/Runtime/PortalDriverClone.cs index 19a5a0b..c0f33c1 100644 --- a/Assets/Escape Room Engine/Portal/Scripts/PortalDriverClone.cs +++ b/Assets/Portal/Runtime/PortalDriverClone.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.InputSystem.XR; using UnityEngine.XR.Interaction.Toolkit; -namespace Escape_Room_Engine.Portal +namespace EscapeRoomEngine.Portal.Runtime { public class PortalDriverClone : MonoBehaviour { diff --git a/Assets/Escape Room Engine/Portal/Scripts/PortalDriverClone.cs.meta b/Assets/Portal/Runtime/PortalDriverClone.cs.meta similarity index 100% rename from Assets/Escape Room Engine/Portal/Scripts/PortalDriverClone.cs.meta rename to Assets/Portal/Runtime/PortalDriverClone.cs.meta diff --git a/Assets/Portal/package.json b/Assets/Portal/package.json new file mode 100644 index 0000000..2cefe04 --- /dev/null +++ b/Assets/Portal/package.json @@ -0,0 +1,17 @@ +{ + "displayName": "Escape Room Engine Portals", + "name": "wtf.milan.escape-room-engine.portal", + "version": "0.0.1", + "description": "Portals for the VR escape room engine.", + "unity": "2022.1", + "author": { + "name": "Milan van Zanten", + "email": "milan@milan.wtf", + "url": "https://milan.wtf" + }, + "hideInEditor": false, + "keywords": ["vr", "virtual reality", "modular", "escape room"], + "dependencies": { + "com.dbrizov.naughtyattributes": "2.1.4" + } +} diff --git a/Assets/Portal/package.json.meta b/Assets/Portal/package.json.meta new file mode 100644 index 0000000..6cc507d --- /dev/null +++ b/Assets/Portal/package.json.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e3ab6063e82341ceb3715639390ea65c +timeCreated: 1668943725 \ No newline at end of file diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity index ca35cf4..1da9834 100644 --- a/Assets/Scenes/TestScene.unity +++ b/Assets/Scenes/TestScene.unity @@ -1265,7 +1265,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 2 - m_TransformParent: {fileID: 1568048335} + m_TransformParent: {fileID: 1943716338} m_Modifications: - target: {fileID: 4522052738963994966, guid: 6ab6b46f22ab480fbd1c85d5e8601025, type: 3} @@ -1446,7 +1446,7 @@ GameObject: m_Component: - component: {fileID: 1247991222} - component: {fileID: 1247991221} - - component: {fileID: 1247991220} + - component: {fileID: 1247991223} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -1454,25 +1454,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1247991220 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1247991219} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 --- !u!114 &1247991221 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1501,8 +1482,48 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1247991223 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247991219} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 + m_CursorLockBehavior: 0 --- !u!1 &1274381185 GameObject: m_ObjectHideFlags: 0 @@ -1610,10 +1631,9 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 776566807} + m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1568048336 MonoBehaviour: @@ -1788,7 +1808,8 @@ Transform: m_LocalPosition: {x: 0, y: 3, z: -4} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 776566807} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 28.238, y: 0, z: 0} diff --git a/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db b/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db index 59ade45..7e29c5f 100644 Binary files a/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db and b/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db differ