Merge branch 'VR-Gameplay' into dev

# Conflicts: # Assets/Models/Characters/Player.controller # Assets/Prefabs/UI/GameUI.prefab # Assets/Scripts/GameUI.cs
Saarg · Mar 10, 2018 · d97a795 · d97a795
1 parent fd3e64c
commit d97a795
Show file tree

Hide file tree

Showing 1,496 changed files with 4,813,208 additions and 457,095 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,7 @@ sysinfo.txt
 # Builds
 *.apk
 *.unitypackage
+Assets/Imports/VRTK/Examples/ExampleResources/Models/teleportbeam.obj.meta
+Assets/Imports/VRTK/Examples/ExampleResources/Models/lightseg.obj.meta
+Assets/Imports/VRTK/Examples/ExampleResources/Models/lightring.obj.meta
+Assets/Imports/VRTK/Examples/ExampleResources/Models/hexprism.obj.meta
diff --git a/Assets/Imports/DAX.meta b/Assets/Imports/DAX.meta
diff --git a/Assets/Imports/DAX/Shields Collection.meta b/Assets/Imports/DAX/Shields Collection.meta
diff --git a/Assets/Imports/DAX/Shields Collection/Demo V1.meta b/Assets/Imports/DAX/Shields Collection/Demo V1.meta