Skip to content

Commit bf92ff2

Browse files
authored
Merge pull request #6703 from keveleigh/merge-stabilization
Merge stabilization -> dev
2 parents 1e57ecf + ad07b2d commit bf92ff2

File tree

58 files changed

+7468
-6954
lines changed

Some content is hidden

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

58 files changed

+7468
-6954
lines changed

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-02-TargetSelection.unity

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -816,6 +816,11 @@ PrefabInstance:
816816
propertyPath: m_isInputParsingRequired
817817
value: 1
818818
objectReference: {fileID: 0}
819+
- target: {fileID: 6489359697116138686, guid: c0931c4da6d91ea429abedb10290dd16,
820+
type: 3}
821+
propertyPath: assetVersion
822+
value: 1
823+
objectReference: {fileID: 0}
819824
m_RemovedComponents:
820825
- {fileID: 1272738663672335838, guid: c0931c4da6d91ea429abedb10290dd16, type: 3}
821826
m_SourcePrefab: {fileID: 100100000, guid: c0931c4da6d91ea429abedb10290dd16, type: 3}
@@ -1069,8 +1074,6 @@ MonoBehaviour:
10691074
m_OnCullStateChanged:
10701075
m_PersistentCalls:
10711076
m_Calls: []
1072-
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
1073-
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
10741077
m_text: Eye Tracking Examples
10751078
m_isRightToLeft: 0
10761079
m_fontAsset: {fileID: 11400000, guid: 6a84f857bec7e7345843ae29404c57ce, type: 2}
@@ -1280,8 +1283,6 @@ MonoBehaviour:
12801283
m_OnCullStateChanged:
12811284
m_PersistentCalls:
12821285
m_Calls: []
1283-
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
1284-
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
12851286
m_text: Eye-gaze-supported Target Selections
12861287
m_isRightToLeft: 0
12871288
m_fontAsset: {fileID: 11400000, guid: 6a84f857bec7e7345843ae29404c57ce, type: 2}
@@ -1669,8 +1670,6 @@ MonoBehaviour:
16691670
m_OnCullStateChanged:
16701671
m_PersistentCalls:
16711672
m_Calls: []
1672-
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
1673-
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
16741673
m_text: Gaze & Commit
16751674
m_isRightToLeft: 0
16761675
m_fontAsset: {fileID: 11400000, guid: afc8299d5d5bbd440a0616c8ecbc7217, type: 2}
@@ -1880,8 +1879,6 @@ MonoBehaviour:
18801879
m_OnCullStateChanged:
18811880
m_PersistentCalls:
18821881
m_Calls: []
1883-
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
1884-
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
18851882
m_text: Simply look at the gems and say "Select" or "Explode". You can also air-tap
18861883
(i.e., pinch your thumb and index finger together) while looking at the gem you
18871884
want to select.
@@ -2207,8 +2204,6 @@ MonoBehaviour:
22072204
m_OnCullStateChanged:
22082205
m_PersistentCalls:
22092206
m_Calls: []
2210-
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
2211-
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
22122207
m_text: "With eye tracking, you can effortlessly target objects.\n\nDestroy gems
22132208
as fast as you can.\nDo one of the following: \n - Look and air-tap\n -
22142209
\ Look and say \"Select\" or \"Explode\" \n\n"

0 commit comments

Comments
 (0)