Merge pull request #7 from Microsoft/mrtk_development

Mrtk development
microsoft · May 1, 2019 · c00ddbf · c00ddbf
2 parents 42bcafa + 163e69e
commit c00ddbf
Show file tree

Hide file tree

Showing 160 changed files with 2,701 additions and 928 deletions.
diff --git a/...MixedRealityToolkit.Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-03-Navigation.unity b/...MixedRealityToolkit.Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-03-Navigation.unity
@@ -4639,125 +4639,125 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 224634334}
     m_Modifications:
-    - target: {fileID: 100048, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 100048, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_Name
       value: TheModule
       objectReference: {fileID: 0}
-    - target: {fileID: 400032, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 400032, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 400032, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 400032, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_LocalScale.y
       value: 0.58
       objectReference: {fileID: 0}
-    - target: {fileID: 400048, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 400048, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 400048, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 400048, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 400048, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 400048, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 400048, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 400048, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_LocalRotation.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 400048, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 400048, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_LocalRotation.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 400048, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 400048, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 400048, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 400048, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 400048, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 400048, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_RootOrder
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 400048, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 400048, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 400048, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 400048, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 400048, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 400048, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 400048, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 400048, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_LocalScale.x
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 400048, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 400048, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_LocalScale.y
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 400048, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 400048, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_LocalScale.z
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 2300000, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 2300000, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: d5334c45caee46be937b095a1e977dc6, type: 2}
-    - target: {fileID: 2300002, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 2300002, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: d808c628536649eaa61f2a2f2d16c6cc, type: 2}
-    - target: {fileID: 2300034, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 2300034, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: d5334c45caee46be937b095a1e977dc6, type: 2}
-    - target: {fileID: 2300036, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 2300036, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: 71d471797c0e430783230146721c3fcb, type: 2}
-    - target: {fileID: 2300038, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 2300038, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: b0fcdc3322e34d9ea83e8399bd9f4031, type: 2}
-    - target: {fileID: 2300040, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 2300040, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: 71d573ea4cb045cdadc98e56044f6d2c, type: 2}
-    - target: {fileID: 2300042, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 2300042, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: 53ea63593b32415faf734536616f5fb3, type: 2}
-    - target: {fileID: 2300044, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 2300044, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_Materials.Array.data[1]
       value: 
       objectReference: {fileID: 2100000, guid: 71d573ea4cb045cdadc98e56044f6d2c, type: 2}
-    - target: {fileID: 2300046, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 2300046, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: 71d471797c0e430783230146721c3fcb, type: 2}
-    - target: {fileID: 2300048, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+    - target: {fileID: 2300048, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: b0fcdc3322e34d9ea83e8399bd9f4031, type: 2}
     m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 2c11bf713819a084d8cb4c35db20d042, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: 9b8d622e06b5ddc47bfd77b86d50527c, type: 3}
 --- !u!4 &775880684 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 400048, guid: 2c11bf713819a084d8cb4c35db20d042,
+  m_CorrespondingSourceObject: {fileID: 400048, guid: 9b8d622e06b5ddc47bfd77b86d50527c,
     type: 3}
   m_PrefabInstance: {fileID: 775880683}
   m_PrefabAsset: {fileID: 0}
 --- !u!1 &775880685 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 100048, guid: 2c11bf713819a084d8cb4c35db20d042,
+  m_CorrespondingSourceObject: {fileID: 100048, guid: 9b8d622e06b5ddc47bfd77b86d50527c,
     type: 3}
   m_PrefabInstance: {fileID: 775880683}
   m_PrefabAsset: {fileID: 0}

diff --git a/Assets/MixedRealityToolkit.Examples/Demos/HandTracking/Prefabs/PressableRoundButton.prefab b/Assets/MixedRealityToolkit.Examples/Demos/HandTracking/Prefabs/PressableRoundButton.prefab
@@ -1010,7 +1010,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7428662621041068899}
-  m_Mesh: {fileID: 4300002, guid: 5308c0eb5c6ed4647b3797671dc2e5f3, type: 3}
+  m_Mesh: {fileID: 4300002, guid: 728972833a3739d4fa5d234f7c91b4b2, type: 3}
 --- !u!23 &7428662621041068901
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -1087,7 +1087,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7428662621253425500}
-  m_Mesh: {fileID: 4300000, guid: 5308c0eb5c6ed4647b3797671dc2e5f3, type: 3}
+  m_Mesh: {fileID: 4300000, guid: 728972833a3739d4fa5d234f7c91b4b2, type: 3}
 --- !u!23 &7428662621253425502
 MeshRenderer:
   m_ObjectHideFlags: 0