Skip to content

Commit 28a8d35

Browse files
provencherprovencher
authored
Merge pull request #1 from provencher/Upgrade
XRI 2.4 Upgrade
2 parents b08a80d + db01176 commit 28a8d35

File tree

476 files changed

+81353
-13620
lines changed

Some content is hidden

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

476 files changed

+81353
-13620
lines changed

‎Assets/AffordanceThemes/Audio/GrabInteractableAudioTheme.asset‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,6 @@ MonoBehaviour:
3434
- stateName: activated
3535
stateEntered: {fileID: 0}
3636
stateExited: {fileID: 0}
37+
- stateName: focused
38+
stateEntered: {fileID: 0}
39+
stateExited: {fileID: 0}

‎Assets/AffordanceThemes/Color/InteractionColorTheme.asset‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,8 @@ MonoBehaviour:
6161
- stateName: activated
6262
animationStateStartValue: {r: 0, g: 0, b: 0, a: 0}
6363
animationStateEndValue: {r: 0, g: 0, b: 0, a: 0}
64+
- stateName: focused
65+
animationStateStartValue: {r: 0, g: 0, b: 0, a: 0}
66+
animationStateEndValue: {r: 0, g: 0, b: 0, a: 0}
6467
m_ColorBlendMode: 1
6568
m_BlendAmount: 0.5

‎Assets/AffordanceThemes/Scale/UniformScaleTheme.asset‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,6 @@ MonoBehaviour:
6161
- stateName: activated
6262
animationStateStartValue: 1
6363
animationStateEndValue: 1
64+
- stateName: focused
65+
animationStateStartValue: 1
66+
animationStateEndValue: 1

‎Assets/Art/XRI Template Models/Materials/Plastic_Black.mat‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 5
15+
version: 7
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -22,6 +22,8 @@ Material:
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: Plastic_Black
2424
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
2527
m_ValidKeywords: []
2628
m_InvalidKeywords: []
2729
m_LightmapFlags: 4
@@ -31,6 +33,7 @@ Material:
3133
stringTagMap:
3234
RenderType: Opaque
3335
disabledShaderPasses: []
36+
m_LockedProperties:
3437
m_SavedProperties:
3538
serializedVersion: 3
3639
m_TexEnvs:

‎Assets/Art/XRI Template Models/Materials/Plastic_Blue.mat‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Plastic_Blue
1111
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords: []
1315
m_InvalidKeywords: []
1416
m_LightmapFlags: 4
@@ -18,6 +20,7 @@ Material:
1820
stringTagMap:
1921
RenderType: Opaque
2022
disabledShaderPasses: []
23+
m_LockedProperties:
2124
m_SavedProperties:
2225
serializedVersion: 3
2326
m_TexEnvs:
@@ -123,4 +126,4 @@ MonoBehaviour:
123126
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
124127
m_Name:
125128
m_EditorClassIdentifier:
126-
version: 5
129+
version: 7

‎Assets/Art/XRI Template Models/Materials/Plastic_LightBlue.mat‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Plastic_LightBlue
1111
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords: []
1315
m_InvalidKeywords: []
1416
m_LightmapFlags: 4
@@ -18,6 +20,7 @@ Material:
1820
stringTagMap:
1921
RenderType: Opaque
2022
disabledShaderPasses: []
23+
m_LockedProperties:
2124
m_SavedProperties:
2225
serializedVersion: 3
2326
m_TexEnvs:
@@ -123,4 +126,4 @@ MonoBehaviour:
123126
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
124127
m_Name:
125128
m_EditorClassIdentifier:
126-
version: 5
129+
version: 7

‎Assets/Art/XRI Template Models/Materials/Plastic_White.mat‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 5
15+
version: 7
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -22,6 +22,8 @@ Material:
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: Plastic_White
2424
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
2527
m_ValidKeywords: []
2628
m_InvalidKeywords: []
2729
m_LightmapFlags: 4
@@ -31,6 +33,7 @@ Material:
3133
stringTagMap:
3234
RenderType: Opaque
3335
disabledShaderPasses: []
36+
m_LockedProperties:
3437
m_SavedProperties:
3538
serializedVersion: 3
3639
m_TexEnvs:

‎Assets/Art/XRI Template Models/Materials/Ribbon_Red.mat‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Ribbon_Red
1111
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords:
1315
- _ALPHATEST_ON
1416
m_InvalidKeywords: []
@@ -19,6 +21,7 @@ Material:
1921
stringTagMap:
2022
RenderType: TransparentCutout
2123
disabledShaderPasses: []
24+
m_LockedProperties:
2225
m_SavedProperties:
2326
serializedVersion: 3
2427
m_TexEnvs:
@@ -81,7 +84,9 @@ Material:
8184
m_Ints: []
8285
m_Floats:
8386
- _AlphaClip: 1
87+
- _AlphaToMask: 1
8488
- _Blend: 0
89+
- _BlendModePreserveSpecular: 1
8590
- _BumpScale: 1
8691
- _ClearCoatMask: 0
8792
- _ClearCoatSmoothness: 0
@@ -90,6 +95,7 @@ Material:
9095
- _DetailAlbedoMapScale: 1
9196
- _DetailNormalMapScale: 1
9297
- _DstBlend: 0
98+
- _DstBlendAlpha: 0
9399
- _EnvironmentReflections: 1
94100
- _GlossMapScale: 0
95101
- _Glossiness: 0
@@ -103,6 +109,7 @@ Material:
103109
- _SmoothnessTextureChannel: 0
104110
- _SpecularHighlights: 1
105111
- _SrcBlend: 1
112+
- _SrcBlendAlpha: 1
106113
- _Surface: 0
107114
- _WorkflowMode: 1
108115
- _ZWrite: 1
@@ -124,4 +131,4 @@ MonoBehaviour:
124131
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
125132
m_Name:
126133
m_EditorClassIdentifier:
127-
version: 5
134+
version: 7

‎Assets/Art/XRI Template Models/Materials/Rubber_Black.mat‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 5
15+
version: 7
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -22,6 +22,8 @@ Material:
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: Rubber_Black
2424
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
2527
m_ValidKeywords: []
2628
m_InvalidKeywords: []
2729
m_LightmapFlags: 4
@@ -31,6 +33,7 @@ Material:
3133
stringTagMap:
3234
RenderType: Opaque
3335
disabledShaderPasses: []
36+
m_LockedProperties:
3437
m_SavedProperties:
3538
serializedVersion: 3
3639
m_TexEnvs:

‎Assets/Art/XRI Template Models/Materials/Rubber_Grey.mat‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Rubber_Grey
1111
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords: []
1315
m_InvalidKeywords: []
1416
m_LightmapFlags: 4
@@ -18,6 +20,7 @@ Material:
1820
stringTagMap:
1921
RenderType: Opaque
2022
disabledShaderPasses: []
23+
m_LockedProperties:
2124
m_SavedProperties:
2225
serializedVersion: 3
2326
m_TexEnvs:
@@ -123,4 +126,4 @@ MonoBehaviour:
123126
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
124127
m_Name:
125128
m_EditorClassIdentifier:
126-
version: 5
129+
version: 7

0 commit comments

Comments
 (0)