Merge pull request #1826 from thestonefox/chore/remove-additive-scene…

…-loading chore(Examples): remove additive scene loading
ExtendRealityLtd · Jun 12, 2018 · 6e4f65e · 6e4f65e
2 parents 110d22c + db32bbb
commit 6e4f65e
Show file tree

Hide file tree

Showing 24 changed files with 40,030 additions and 6,489 deletions.
diff --git a/Assets/VRTK/Examples/ExampleResources/SharedResources/Prefabs/CameraRigSpawnPoint.meta b/Assets/VRTK/Examples/ExampleResources/SharedResources/Prefabs/CameraRigSpawnPoint.meta
diff --git a/...VRTK/Examples/ExampleResources/SharedResources/Prefabs/CameraRigSpawnPoint/Materials.meta b/...VRTK/Examples/ExampleResources/SharedResources/Prefabs/CameraRigSpawnPoint/Materials.meta
diff --git a/...urces/SharedResources/Prefabs/CameraRigSpawnPoint/Materials/CameraRigSpawnPointColour.mat b/...urces/SharedResources/Prefabs/CameraRigSpawnPoint/Materials/CameraRigSpawnPointColour.mat
diff --git a/.../SharedResources/Prefabs/CameraRigSpawnPoint/Materials/CameraRigSpawnPointColour.mat.meta b/.../SharedResources/Prefabs/CameraRigSpawnPoint/Materials/CameraRigSpawnPointColour.mat.meta
diff --git a/...s/VRTK/Examples/ExampleResources/SharedResources/Prefabs/CameraRigSpawnPoint/Scripts.meta b/...s/VRTK/Examples/ExampleResources/SharedResources/Prefabs/CameraRigSpawnPoint/Scripts.meta
diff --git a/...ampleResources/SharedResources/Prefabs/CameraRigSpawnPoint/Scripts/CameraRigSpawnPoint.cs b/...ampleResources/SharedResources/Prefabs/CameraRigSpawnPoint/Scripts/CameraRigSpawnPoint.cs
diff --git a/...Resources/SharedResources/Prefabs/CameraRigSpawnPoint/Scripts/CameraRigSpawnPoint.cs.meta b/...Resources/SharedResources/Prefabs/CameraRigSpawnPoint/Scripts/CameraRigSpawnPoint.cs.meta