Skip to content

Commit c58a2c6

Browse files
authored
Merge pull request #110 from Unity-Technologies/xri-v2.3.2-updates
Update XRI Examples with v2.3.2 and implement latest examples
2 parents 8322b6f + a4df91d commit c58a2c6

File tree

616 files changed

+34343
-16472
lines changed

Some content is hidden

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

616 files changed

+34343
-16472
lines changed

Assets/Samples/XR Interaction Toolkit/2.3.0.meta renamed to Assets/Samples/XR Interaction Toolkit/2.3.2.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Samples/XR Interaction Toolkit/2.3.0/Starter Assets.meta renamed to Assets/Samples/XR Interaction Toolkit/2.3.2/Starter Assets.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Samples/XR Interaction Toolkit/2.3.0/Starter Assets/.sample.json renamed to Assets/Samples/XR Interaction Toolkit/2.3.2/Starter Assets/.sample.json

File renamed without changes.

Assets/Samples/XR Interaction Toolkit/2.3.0/Starter Assets/AffordanceThemes.meta renamed to Assets/Samples/XR Interaction Toolkit/2.3.2/Starter Assets/AffordanceThemes.meta

File renamed without changes.

Assets/Samples/XR Interaction Toolkit/2.3.0/Starter Assets/AffordanceThemes/InteractionColorAffordanceTheme.asset renamed to Assets/Samples/XR Interaction Toolkit/2.3.2/Starter Assets/AffordanceThemes/InteractionColorAffordanceTheme.asset

File renamed without changes.

Assets/Samples/XR Interaction Toolkit/2.3.0/Starter Assets/AffordanceThemes/InteractionColorAffordanceTheme.asset.meta renamed to Assets/Samples/XR Interaction Toolkit/2.3.2/Starter Assets/AffordanceThemes/InteractionColorAffordanceTheme.asset.meta

File renamed without changes.

Assets/Samples/XR Interaction Toolkit/2.3.0/Starter Assets/Audio.meta renamed to Assets/Samples/XR Interaction Toolkit/2.3.2/Starter Assets/Audio.meta

File renamed without changes.

Assets/Samples/XR Interaction Toolkit/2.3.0/Starter Assets/Audio/Button Pop.wav renamed to Assets/Samples/XR Interaction Toolkit/2.3.2/Starter Assets/Audio/Button Pop.wav

File renamed without changes.

Assets/Samples/XR Interaction Toolkit/2.3.0/Starter Assets/Audio/Button Pop.wav.meta renamed to Assets/Samples/XR Interaction Toolkit/2.3.2/Starter Assets/Audio/Button Pop.wav.meta

File renamed without changes.

Assets/Samples/XR Interaction Toolkit/2.3.0/Starter Assets/DemoScene.unity renamed to Assets/Samples/XR Interaction Toolkit/2.3.2/Starter Assets/DemoScene.unity

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3150,7 +3150,7 @@ ParticleSystemRenderer:
31503150
m_RenderingLayerMask: 1
31513151
m_RendererPriority: 0
31523152
m_Materials:
3153-
- {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
3153+
- {fileID: 10301, guid: 0000000000000000f000000000000000, type: 0}
31543154
m_StaticBatchInfo:
31553155
firstSubMesh: 0
31563156
subMeshCount: 0
@@ -3386,7 +3386,7 @@ ParticleSystem:
33863386
serializedVersion: 2
33873387
minMaxState: 0
33883388
minColor: {r: 1, g: 1, b: 1, a: 1}
3389-
maxColor: {r: 1, g: 0.4, b: 0, a: 1}
3389+
maxColor: {r: 0.9622642, g: 0.19517623, b: 0.20951429, a: 1}
33903390
maxGradient:
33913391
serializedVersion: 2
33923392
key0: {r: 1, g: 1, b: 1, a: 1}

0 commit comments

Comments
 (0)