Skip to content

Commit cf60cf3

Browse files
committed
Merge remote-tracking branch 'refs/remotes/Microsoft/master'
2 parents 0d78fc7 + c014337 commit cf60cf3

Some content is hidden

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

55 files changed

+3252
-800
lines changed

Assets/HoloToolkit-Examples/SpatialUnderstanding/SpatialUnderstanding-FeatureOverview/Scenes/Main.unity

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RenderSettings:
3737
m_ReflectionIntensity: 1
3838
m_CustomReflection: {fileID: 0}
3939
m_Sun: {fileID: 0}
40-
m_IndirectSpecularColor: {r: 0.44692582, g: 0.4967878, b: 0.5750859, a: 1}
40+
m_IndirectSpecularColor: {r: 0.44692558, g: 0.49678743, b: 0.57508624, a: 1}
4141
--- !u!157 &3
4242
LightmapSettings:
4343
m_ObjectHideFlags: 0
@@ -638,6 +638,7 @@ MonoBehaviour:
638638
SetStabilizationPlane: 1
639639
LerpStabilizationPlanePowerCloser: 4
640640
LerpStabilizationPlanePowerFarther: 7
641+
UseBuiltInGazeStabilization: 1
641642
--- !u!114 &418325384
642643
MonoBehaviour:
643644
m_ObjectHideFlags: 0
@@ -756,6 +757,26 @@ Prefab:
756757
propertyPath: m_RootOrder
757758
value: 2
758759
objectReference: {fileID: 0}
760+
- target: {fileID: 114000013027790266, guid: d41fa7615c3c85b40bcc95fc4367b607,
761+
type: 2}
762+
propertyPath: MaxFrameTime
763+
value: 5
764+
objectReference: {fileID: 0}
765+
- target: {fileID: 114000013027790266, guid: d41fa7615c3c85b40bcc95fc4367b607,
766+
type: 2}
767+
propertyPath: ImportMeshPeriod
768+
value: 2.5
769+
objectReference: {fileID: 0}
770+
- target: {fileID: 114000012099205058, guid: d41fa7615c3c85b40bcc95fc4367b607,
771+
type: 2}
772+
propertyPath: UpdatePeriod_DuringScanning
773+
value: 3.5
774+
objectReference: {fileID: 0}
775+
- target: {fileID: 114000012099205058, guid: d41fa7615c3c85b40bcc95fc4367b607,
776+
type: 2}
777+
propertyPath: UpdatePeriod_AfterScanning
778+
value: 7
779+
objectReference: {fileID: 0}
759780
m_RemovedComponents: []
760781
m_ParentPrefab: {fileID: 100100000, guid: d41fa7615c3c85b40bcc95fc4367b607, type: 2}
761782
m_IsPrefabParent: 0
-25.4 KB
Binary file not shown.
-31.8 KB
Binary file not shown.

Assets/HoloToolkit/Input/Plugins.meta

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

Assets/HoloToolkit/Input/Plugins/WSA.meta

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

Assets/HoloToolkit/Input/Plugins/WSA/ARM.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
128 KB
Binary file not shown.

Assets/HoloToolkit/Input/Plugins/WSA/ARM/MicStreamSelector.dll.meta

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

Assets/HoloToolkit/Input/Plugins/WSA/x64.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
162 KB
Binary file not shown.

0 commit comments

Comments
 (0)