Skip to content

Commit be250ad

Browse files
StephenHodgsonStephenHodgson
committed
Merge branch 'vNEXT-TouchScreenInputSourceUpdate' into vNEXT-SpatialMouse
2 parents c47b43e + 78fee65 commit be250ad

File tree

77 files changed

+1043
-724
lines changed

Some content is hidden

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

77 files changed

+1043
-724
lines changed

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Materials/CubeBorder.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Material:
4949
m_Scale: {x: 1, y: 1}
5050
m_Offset: {x: 0, y: 0}
5151
- _MainTex:
52-
m_Texture: {fileID: 2800000, guid: 73ec9371d04141f689e80c1e1e2c388c, type: 3}
52+
m_Texture: {fileID: 2800000, guid: 7b551659cf4349242ba72d82b4f9cdc7, type: 3}
5353
m_Scale: {x: 1, y: 1}
5454
m_Offset: {x: 0, y: 0}
5555
- _MetallicGlossMap:

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Materials/CubeInnerGlow.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Material:
4949
m_Scale: {x: 1, y: 1}
5050
m_Offset: {x: 0, y: 0}
5151
- _MainTex:
52-
m_Texture: {fileID: 2800000, guid: 73ec9371d04141f689e80c1e1e2c388c, type: 3}
52+
m_Texture: {fileID: 2800000, guid: 7b551659cf4349242ba72d82b4f9cdc7, type: 3}
5353
m_Scale: {x: 1, y: 1}
5454
m_Offset: {x: 0, y: 0}
5555
- _MetallicGlossMap:

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Materials/CubeOpaqueBorder.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Material:
4949
m_Scale: {x: 1, y: 1}
5050
m_Offset: {x: 0, y: 0}
5151
- _MainTex:
52-
m_Texture: {fileID: 2800000, guid: 73ec9371d04141f689e80c1e1e2c388c, type: 3}
52+
m_Texture: {fileID: 2800000, guid: 7b551659cf4349242ba72d82b4f9cdc7, type: 3}
5353
m_Scale: {x: 1, y: 1}
5454
m_Offset: {x: 0, y: 0}
5555
- _MetallicGlossMap:

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Materials/PanelBorder.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Material:
4949
m_Scale: {x: 1, y: 1}
5050
m_Offset: {x: 0, y: 0}
5151
- _MainTex:
52-
m_Texture: {fileID: 2800000, guid: 73ec9371d04141f689e80c1e1e2c388c, type: 3}
52+
m_Texture: {fileID: 2800000, guid: 7b551659cf4349242ba72d82b4f9cdc7, type: 3}
5353
m_Scale: {x: 1, y: 1}
5454
m_Offset: {x: 0, y: 0}
5555
- _MetallicGlossMap:

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Materials/PanelBorderBlue.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Material:
4949
m_Scale: {x: 1, y: 1}
5050
m_Offset: {x: 0, y: 0}
5151
- _MainTex:
52-
m_Texture: {fileID: 2800000, guid: 73ec9371d04141f689e80c1e1e2c388c, type: 3}
52+
m_Texture: {fileID: 2800000, guid: 7b551659cf4349242ba72d82b4f9cdc7, type: 3}
5353
m_Scale: {x: 1, y: 1}
5454
m_Offset: {x: 0, y: 0}
5555
- _MetallicGlossMap:

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Materials/PanelBorderCyan.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Material:
4949
m_Scale: {x: 1, y: 1}
5050
m_Offset: {x: 0, y: 0}
5151
- _MainTex:
52-
m_Texture: {fileID: 2800000, guid: 73ec9371d04141f689e80c1e1e2c388c, type: 3}
52+
m_Texture: {fileID: 2800000, guid: 7b551659cf4349242ba72d82b4f9cdc7, type: 3}
5353
m_Scale: {x: 1, y: 1}
5454
m_Offset: {x: 0, y: 0}
5555
- _MetallicGlossMap:

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Materials/PanelBorderGreen.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Material:
4949
m_Scale: {x: 1, y: 1}
5050
m_Offset: {x: 0, y: 0}
5151
- _MainTex:
52-
m_Texture: {fileID: 2800000, guid: 73ec9371d04141f689e80c1e1e2c388c, type: 3}
52+
m_Texture: {fileID: 2800000, guid: 7b551659cf4349242ba72d82b4f9cdc7, type: 3}
5353
m_Scale: {x: 1, y: 1}
5454
m_Offset: {x: 0, y: 0}
5555
- _MetallicGlossMap:

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Materials/PanelBorderOrange.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Material:
4949
m_Scale: {x: 1, y: 1}
5050
m_Offset: {x: 0, y: 0}
5151
- _MainTex:
52-
m_Texture: {fileID: 2800000, guid: 73ec9371d04141f689e80c1e1e2c388c, type: 3}
52+
m_Texture: {fileID: 2800000, guid: 7b551659cf4349242ba72d82b4f9cdc7, type: 3}
5353
m_Scale: {x: 1, y: 1}
5454
m_Offset: {x: 0, y: 0}
5555
- _MetallicGlossMap:

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Materials/PanelBorderPink.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Material:
4949
m_Scale: {x: 1, y: 1}
5050
m_Offset: {x: 0, y: 0}
5151
- _MainTex:
52-
m_Texture: {fileID: 2800000, guid: 73ec9371d04141f689e80c1e1e2c388c, type: 3}
52+
m_Texture: {fileID: 2800000, guid: 7b551659cf4349242ba72d82b4f9cdc7, type: 3}
5353
m_Scale: {x: 1, y: 1}
5454
m_Offset: {x: 0, y: 0}
5555
- _MetallicGlossMap:

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Materials/PanelBorderPurple.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Material:
4949
m_Scale: {x: 1, y: 1}
5050
m_Offset: {x: 0, y: 0}
5151
- _MainTex:
52-
m_Texture: {fileID: 2800000, guid: 73ec9371d04141f689e80c1e1e2c388c, type: 3}
52+
m_Texture: {fileID: 2800000, guid: 7b551659cf4349242ba72d82b4f9cdc7, type: 3}
5353
m_Scale: {x: 1, y: 1}
5454
m_Offset: {x: 0, y: 0}
5555
- _MetallicGlossMap:

0 commit comments

Comments
 (0)