Merge remote-tracking branch 'remotes/origin/master' into OmniSteamVR

# Conflicts:
#	UserSettings/EditorUserSettings.asset

Assets/Scenes/Level/Maze.unity

@@ -6990,13 +6990,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 975713724}
-  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: -0.46196577, y: 0.06699788, z: 0.03502526, w: -0.88366973}
   m_LocalPosition: {x: 11.07, y: 6.58, z: 11.31}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 414.268, y: -14.961, z: -12.239}
 --- !u!1 &977461609 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4e43359aa0ae4244884e8e0e509457ee,

Assets/Scenes/Level/ObstacleInMiddle.unity

@@ -3563,13 +3563,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 975713724}
-  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: 0.5248315, y: 0.078877516, z: 0.048925545, w: 0.8461303}
   m_LocalPosition: {x: 11.07, y: 6.58, z: 11.31}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 61.695, y: 22.943, z: 20.44}
 --- !u!1 &976150997 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4e43359aa0ae4244884e8e0e509457ee,

Assets/Scenes/Level/SShapeCorridor.unity

@@ -3039,13 +3039,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 975713724}
-  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: 0.7448342, y: 0.14566429, z: 0.124976546, w: 0.63905}
   m_LocalPosition: {x: 11.07, y: 6.58, z: 11.31}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 66.286, y: 112.205, z: 110.492}
 --- !u!1 &977461609 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4e43359aa0ae4244884e8e0e509457ee,

Assets/Scenes/Level/StraghtCorridor.unity

@@ -2701,13 +2701,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 975713724}
-  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: 0.61160266, y: 0.1316529, z: 0.104144186, w: 0.7731518}
   m_LocalPosition: {x: 11.07, y: 6.58, z: 11.31}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 66.679, y: 56.722, z: 54.446}
 --- !u!1 &977461609 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4e43359aa0ae4244884e8e0e509457ee,

Assets/Scenes/Level/TShapeCorridor.unity

@@ -3226,13 +3226,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 975713724}
-  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: 0.64040077, y: -0.021885576, z: 0.09459359, w: 0.7618792}
   m_LocalPosition: {x: 11.07, y: 6.58, z: 11.31}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 78.509, y: 26.153, z: 35.65}
 --- !u!1 &976150997 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4e43359aa0ae4244884e8e0e509457ee,

Assets/Scripts/Utilities/Timer.cs

@@ -10,9 +10,10 @@ namespace Assets.Scripts.Utilities
 
         // TODO JIMMY : Rename this
         [SerializeField]
-        private TextMesh text;
+        private TextMesh textmesh;
         // TODO JIMMY :   ^ Rename this
 
+
         private Coroutine timerRoutine;
 
         // Start is called before the first frame update
@@ -30,7 +31,7 @@ namespace Assets.Scripts.Utilities
         public void Stop()
         {
             timerStop = true;
-            PlayerPrefs.SetString(Constant.PPK_TIMER_TIME, text.text);
+            PlayerPrefs.SetString(Constant.PPK_TIMER_TIME, textmesh.text);
             StopCoroutine(timerRoutine);
 
         }
@@ -42,8 +43,8 @@ namespace Assets.Scripts.Utilities
                 if (!timerStop)
                 {
                     time += 0.1f;
-                    if (text != null)
+                    if (textmesh != null)
-                        text.text = ""+ (Mathf.Round(time * 10) * 0.1f).ToString("F1");
+                        textmesh.text = ""+ (Mathf.Round(time * 10) * 0.1f).ToString("F1");
                     yield return new WaitForSeconds(.1f);
                 }
             }

Assets/XR/Settings/Windows MR Package Settings.asset

@@ -12,6 +12,21 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e679265d16d650945812b915bb9d5cc3, type: 3}
   m_Name: Windows MR Package Settings
   m_EditorClassIdentifier: 
-  Keys: 
+  Keys: 01000000
-  Values: []
+  Values:
+  - {fileID: 8371491172281770961}
   BuildValues: []
+--- !u!114 &8371491172281770961
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ed912223f7b3af74d8e196b2a4e662b3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DepthBufferFormat: 0
+  UseSharedDepthBuffer: 0