Skip to content

Commit b456e4d

Browse files
cre8iveparkcre8ivepark
committed
Merge branch 'mrtk_development_hl2' of https://github.com/Microsoft/MixedRealityToolkit-Unity into feature/handmeshvis
# Conflicts: # Assets/MixedRealityToolkit.Examples/Demos/HandTracking/Scenes/HandInteractionExamples.unity
2 parents a9d2032 + a770110 commit b456e4d

File tree

707 files changed

+130490
-3223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

707 files changed

+130490
-3223
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,5 @@ Assets/TextMesh Pro/
6666
Assets/StreamingAssets/GltfModels/
6767
Assets/StreamingAssets/GltfModels.meta
6868
Assets/StreamingAssets.meta
69+
70+
/mrtk_log_mostRecentET.csv

‎Assets/MixedRealityToolkit.Examples/Demos/Audio/Scenes/AudioLoFiEffectDemo.unity‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ GameObject:
694694
- component: {fileID: 1701341181}
695695
- component: {fileID: 1701341185}
696696
- component: {fileID: 1701341188}
697-
- component: {fileID: 1701341186}
697+
- component: {fileID: 1701341187}
698698
m_Layer: 0
699699
m_Name: Main Camera
700700
m_TagString: MainCamera
@@ -796,7 +796,7 @@ MonoBehaviour:
796796
gazeTransform: {fileID: 0}
797797
minHeadVelocityThreshold: 0.5
798798
maxHeadVelocityThreshold: 2
799-
--- !u!114 &1701341186
799+
--- !u!114 &1701341187
800800
MonoBehaviour:
801801
m_ObjectHideFlags: 0
802802
m_CorrespondingSourceObject: {fileID: 0}
@@ -805,9 +805,16 @@ MonoBehaviour:
805805
m_GameObject: {fileID: 1701341180}
806806
m_Enabled: 1
807807
m_EditorHideFlags: 0
808-
m_Script: {fileID: 11500000, guid: 7a21b486d0bb44444b1418aaa38b44de, type: 3}
808+
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
809809
m_Name:
810810
m_EditorClassIdentifier:
811+
m_HorizontalAxis: Horizontal
812+
m_VerticalAxis: Vertical
813+
m_SubmitButton: Submit
814+
m_CancelButton: Cancel
815+
m_InputActionsPerSecond: 10
816+
m_RepeatDelay: 0.5
817+
m_ForceModuleActive: 0
811818
--- !u!114 &1701341188
812819
MonoBehaviour:
813820
m_ObjectHideFlags: 0

‎Assets/MixedRealityToolkit.Examples/Demos/Audio/Scenes/AudioOcclusionDemo.unity‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ GameObject:
498498
- component: {fileID: 1460686211}
499499
- component: {fileID: 1460686215}
500500
- component: {fileID: 1460686217}
501-
- component: {fileID: 1460686216}
501+
- component: {fileID: 1460686218}
502502
m_Layer: 0
503503
m_Name: Main Camera
504504
m_TagString: MainCamera
@@ -600,7 +600,7 @@ MonoBehaviour:
600600
gazeTransform: {fileID: 0}
601601
minHeadVelocityThreshold: 0.5
602602
maxHeadVelocityThreshold: 2
603-
--- !u!114 &1460686216
603+
--- !u!114 &1460686217
604604
MonoBehaviour:
605605
m_ObjectHideFlags: 0
606606
m_CorrespondingSourceObject: {fileID: 0}
@@ -609,10 +609,13 @@ MonoBehaviour:
609609
m_GameObject: {fileID: 1460686210}
610610
m_Enabled: 1
611611
m_EditorHideFlags: 0
612-
m_Script: {fileID: 11500000, guid: 7a21b486d0bb44444b1418aaa38b44de, type: 3}
612+
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
613613
m_Name:
614614
m_EditorClassIdentifier:
615-
--- !u!114 &1460686217
615+
m_FirstSelected: {fileID: 0}
616+
m_sendNavigationEvents: 1
617+
m_DragThreshold: 10
618+
--- !u!114 &1460686218
616619
MonoBehaviour:
617620
m_ObjectHideFlags: 0
618621
m_CorrespondingSourceObject: {fileID: 0}
@@ -621,12 +624,16 @@ MonoBehaviour:
621624
m_GameObject: {fileID: 1460686210}
622625
m_Enabled: 1
623626
m_EditorHideFlags: 0
624-
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
627+
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
625628
m_Name:
626629
m_EditorClassIdentifier:
627-
m_FirstSelected: {fileID: 0}
628-
m_sendNavigationEvents: 1
629-
m_DragThreshold: 10
630+
m_HorizontalAxis: Horizontal
631+
m_VerticalAxis: Vertical
632+
m_SubmitButton: Submit
633+
m_CancelButton: Cancel
634+
m_InputActionsPerSecond: 10
635+
m_RepeatDelay: 0.5
636+
m_ForceModuleActive: 0
630637
--- !u!1 &1552166284
631638
GameObject:
632639
m_ObjectHideFlags: 0

‎Assets/MixedRealityToolkit.Examples/Demos/Boundary/Scenes/BoundaryVisualization.unity‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ GameObject:
715715
- component: {fileID: 1491404207}
716716
- component: {fileID: 1491404211}
717717
- component: {fileID: 1491404205}
718-
- component: {fileID: 1491404206}
718+
- component: {fileID: 1491404210}
719719
m_Layer: 0
720720
m_Name: Main Camera
721721
m_TagString: MainCamera
@@ -759,18 +759,6 @@ MonoBehaviour:
759759
gazeTransform: {fileID: 0}
760760
minHeadVelocityThreshold: 0.5
761761
maxHeadVelocityThreshold: 2
762-
--- !u!114 &1491404206
763-
MonoBehaviour:
764-
m_ObjectHideFlags: 0
765-
m_CorrespondingSourceObject: {fileID: 0}
766-
m_PrefabInstance: {fileID: 0}
767-
m_PrefabAsset: {fileID: 0}
768-
m_GameObject: {fileID: 1491404203}
769-
m_Enabled: 1
770-
m_EditorHideFlags: 0
771-
m_Script: {fileID: 11500000, guid: 7a21b486d0bb44444b1418aaa38b44de, type: 3}
772-
m_Name:
773-
m_EditorClassIdentifier:
774762
--- !u!81 &1491404207
775763
AudioListener:
776764
m_ObjectHideFlags: 0
@@ -829,6 +817,25 @@ Camera:
829817
m_OcclusionCulling: 1
830818
m_StereoConvergence: 10
831819
m_StereoSeparation: 0.022
820+
--- !u!114 &1491404210
821+
MonoBehaviour:
822+
m_ObjectHideFlags: 0
823+
m_CorrespondingSourceObject: {fileID: 0}
824+
m_PrefabInstance: {fileID: 0}
825+
m_PrefabAsset: {fileID: 0}
826+
m_GameObject: {fileID: 1491404203}
827+
m_Enabled: 1
828+
m_EditorHideFlags: 0
829+
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
830+
m_Name:
831+
m_EditorClassIdentifier:
832+
m_HorizontalAxis: Horizontal
833+
m_VerticalAxis: Vertical
834+
m_SubmitButton: Submit
835+
m_CancelButton: Cancel
836+
m_InputActionsPerSecond: 10
837+
m_RepeatDelay: 0.5
838+
m_ForceModuleActive: 0
832839
--- !u!114 &1491404211
833840
MonoBehaviour:
834841
m_ObjectHideFlags: 0

‎Assets/MixedRealityToolkit.Examples/Demos/Diagnostics/Scenes/DiagnosticsDemo.unity‎

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ GameObject:
199199
- component: {fileID: 469757470}
200200
- component: {fileID: 469757468}
201201
- component: {fileID: 469757473}
202-
- component: {fileID: 469757469}
202+
- component: {fileID: 469757472}
203203
m_Layer: 0
204204
m_Name: Main Camera
205205
m_TagString: MainCamera
@@ -243,18 +243,6 @@ MonoBehaviour:
243243
gazeTransform: {fileID: 0}
244244
minHeadVelocityThreshold: 0.5
245245
maxHeadVelocityThreshold: 2
246-
--- !u!114 &469757469
247-
MonoBehaviour:
248-
m_ObjectHideFlags: 0
249-
m_CorrespondingSourceObject: {fileID: 0}
250-
m_PrefabInstance: {fileID: 0}
251-
m_PrefabAsset: {fileID: 0}
252-
m_GameObject: {fileID: 469757466}
253-
m_Enabled: 1
254-
m_EditorHideFlags: 0
255-
m_Script: {fileID: 11500000, guid: 7a21b486d0bb44444b1418aaa38b44de, type: 3}
256-
m_Name:
257-
m_EditorClassIdentifier:
258246
--- !u!81 &469757470
259247
AudioListener:
260248
m_ObjectHideFlags: 0
@@ -305,6 +293,25 @@ Camera:
305293
m_OcclusionCulling: 1
306294
m_StereoConvergence: 10
307295
m_StereoSeparation: 0.022
296+
--- !u!114 &469757472
297+
MonoBehaviour:
298+
m_ObjectHideFlags: 0
299+
m_CorrespondingSourceObject: {fileID: 0}
300+
m_PrefabInstance: {fileID: 0}
301+
m_PrefabAsset: {fileID: 0}
302+
m_GameObject: {fileID: 469757466}
303+
m_Enabled: 1
304+
m_EditorHideFlags: 0
305+
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
306+
m_Name:
307+
m_EditorClassIdentifier:
308+
m_HorizontalAxis: Horizontal
309+
m_VerticalAxis: Vertical
310+
m_SubmitButton: Submit
311+
m_CancelButton: Cancel
312+
m_InputActionsPerSecond: 10
313+
m_RepeatDelay: 0.5
314+
m_ForceModuleActive: 0
308315
--- !u!114 &469757473
309316
MonoBehaviour:
310317
m_ObjectHideFlags: 0
@@ -551,6 +558,16 @@ PrefabInstance:
551558
propertyPath: m_Text
552559
value: DiagnosticDemoControls.cs
553560
objectReference: {fileID: 0}
561+
- target: {fileID: 114121190672569774, guid: a900c08743a94c328074df8bbe3eb63c,
562+
type: 3}
563+
propertyPath: m_Text
564+
value: ' Toggle Diagnostics'
565+
objectReference: {fileID: 0}
566+
- target: {fileID: 114186135864427680, guid: a900c08743a94c328074df8bbe3eb63c,
567+
type: 3}
568+
propertyPath: m_Text
569+
value: ' Toggle Profiler'
570+
objectReference: {fileID: 0}
554571
- target: {fileID: 224849082003076088, guid: a900c08743a94c328074df8bbe3eb63c,
555572
type: 3}
556573
propertyPath: m_AnchoredPosition.y
@@ -566,16 +583,6 @@ PrefabInstance:
566583
propertyPath: m_AnchoredPosition.y
567584
value: 0.055
568585
objectReference: {fileID: 0}
569-
- target: {fileID: 114186135864427680, guid: a900c08743a94c328074df8bbe3eb63c,
570-
type: 3}
571-
propertyPath: m_Text
572-
value: ' Toggle Profiler'
573-
objectReference: {fileID: 0}
574-
- target: {fileID: 114121190672569774, guid: a900c08743a94c328074df8bbe3eb63c,
575-
type: 3}
576-
propertyPath: m_Text
577-
value: ' Toggle Diagnostics'
578-
objectReference: {fileID: 0}
579586
m_RemovedComponents: []
580587
m_SourcePrefab: {fileID: 100100000, guid: a900c08743a94c328074df8bbe3eb63c, type: 3}
581588
--- !u!4 &1776170452 stripped

‎Assets/MixedRealityToolkit.Examples/Demos/EyeTracking.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_BasicSetup.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_BasicSetup/Materials.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)