Skip to content

Commit e315a40

Browse files
bethalha-havokbethalha-havok
committed
Merge remote-tracking branch 'remotes/public/prerelease/2.3.0_stabilization' into user/bethalha/bc_examples
2 parents 77aa2f4 + 2e07623 commit e315a40

File tree

317 files changed

+344124
-2219
lines changed

Some content is hidden

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

317 files changed

+344124
-2219
lines changed

‎Assets/MixedReality.Toolkit.Foundation.nuspec‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</metadata>
2323
<files>
2424
<file src="MixedRealityToolkit\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit\toc.yml*" target="MRTK\" />
25-
<file src="MixedRealityToolkit.Providers\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Providers\License.txt*;MixedRealityToolkit.Providers\Version.txt*;MixedRealityToolkit.Providers\WindowsMixedReality\DotNetAdapter*;MixedRealityToolkit.Providers\WindowsMixedReality\DotNetAdapter\**\*.*" target="MRTK\" />
25+
<file src="MixedRealityToolkit.Providers\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Providers\License.txt*;MixedRealityToolkit.Providers\Version.txt*;MixedRealityToolkit.Providers\WindowsMixedReality\DotNetAdapter*;MixedRealityToolkit.Providers\WindowsMixedReality\DotNetAdapter\**\*.*;MixedRealityToolkit.Providers\UnityAR*;MixedRealityToolkit.Providers\UnityAR\**\*.*" target="MRTK\" />
2626
<file src="MixedRealityToolkit.SDK\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.SDK\License.txt*;MixedRealityToolkit.SDK\Version.txt*;MixedRealityToolkit.SDK\toc.yml*;MixedRealityToolkit.SDK\StandardAssets.meta;MixedRealityToolkit.SDK\StandardAssets\Fonts.meta;MixedRealityToolkit.SDK\StandardAssets\Materials.meta;MixedRealityToolkit.SDK\StandardAssets\Shaders.meta;MixedRealityToolkit.SDK\StandardAssets\Textures.meta" target="MRTK\" />
2727
<file src="MixedRealityToolkit.Services\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Services\License.txt*;MixedRealityToolkit.Services\Version.txt*" target="MRTK\" />
2828

@@ -34,28 +34,23 @@
3434
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.dll*" target="Plugins\" />
3535
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.pdb*" target="Plugins\" />
3636
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Gltf.*" target="Plugins\" />
37-
38-
<!-- The following line is commented out because of a path length issue in nuget for unity -->
37+
<!-- The following line is commented out because of a path length issue -->
3938
<!-- <file src="..\..\Assets\MixedRealityToolkit\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit" /> -->
40-
4139

4240
<!-- Assemblies and Sources that are built from the MixedRealityToolkit.Providers folder -->
43-
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Providers.*" target="Plugins\" />
44-
45-
<!-- The following line is commented out because of a path length issue in nuget for unity -->
41+
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Providers.*" exclude="..\Plugins\**\Microsoft.MixedReality.Toolkit.Providers.UnityAR*;..\Plugins\**\Microsoft.MixedReality.Toolkit.Providers.UnityAR\**\*.*" target="Plugins\" />
42+
<!-- The following line is commented out because of a path length issue -->
4643
<!-- <file src="..\..\Assets\MixedRealityToolkit.Providers\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.Providers" /> -->
47-
44+
4845
<!-- Assemblies and Sources that are built from the MixedRealityToolkit.SDK folder -->
4946
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.SDK.*" target="Plugins\" />
5047
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.SDK.Inspectors.*" target="Plugins\" />
51-
52-
<!-- The following line is commented out because of a path length issue in nuget for unity -->
53-
<!-- <file src="..\..\Assets\MixedRealityToolkit.SDK\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.SDK" />-->
54-
48+
<!-- The following line is commented out because of a path length issue -->
49+
<!-- <file src="..\..\Assets\MixedRealityToolkit.SDK\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.SDK" /> -->
50+
5551
<!-- Assemblies and Sources that are built from the MixedRealityToolkit.Services folder -->
5652
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Services.*" target="Plugins\" />
57-
58-
<!-- The following line is commented out because of a path length issue in nuget for unity -->
53+
<!-- The following line is commented out because of a path length issue -->
5954
<!-- <file src="..\..\Assets\MixedRealityToolkit.Services\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.Services" /> -->
6055

6156
<!--

‎Assets/MixedRealityToolkit.Examples/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.4.0.0")]
7-
[assembly: AssemblyFileVersion("2.4.0.0")]
6+
[assembly: AssemblyVersion("2.3.0.0")]
7+
[assembly: AssemblyFileVersion("2.3.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Demos/Gltf/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.4.0.0")]
7-
[assembly: AssemblyFileVersion("2.4.0.0")]
6+
[assembly: AssemblyVersion("2.3.0.0")]
7+
[assembly: AssemblyFileVersion("2.3.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Demos/Gltf/Scripts/Editor/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.4.0.0")]
7-
[assembly: AssemblyFileVersion("2.4.0.0")]
6+
[assembly: AssemblyVersion("2.3.0.0")]
7+
[assembly: AssemblyFileVersion("2.3.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Demos/StandardShader/Scripts/Editor/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.4.0.0")]
7-
[assembly: AssemblyFileVersion("2.4.0.0")]
6+
[assembly: AssemblyVersion("2.3.0.0")]
7+
[assembly: AssemblyFileVersion("2.3.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Demos/UX/Interactables/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.4.0.0")]
7-
[assembly: AssemblyFileVersion("2.4.0.0")]
6+
[assembly: AssemblyVersion("2.3.0.0")]
7+
[assembly: AssemblyFileVersion("2.3.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Demos/UX/Interactables/Scenes/InteractablesExamples.unity‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3393,17 +3393,17 @@ PrefabInstance:
33933393
- target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
33943394
type: 3}
33953395
propertyPath: profiles.Array.data[0].Themes.Array.size
3396-
value: 1
3396+
value: 2
33973397
objectReference: {fileID: 0}
33983398
- target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
33993399
type: 3}
34003400
propertyPath: profiles.Array.data[1].Themes.Array.size
3401-
value: 1
3401+
value: 2
34023402
objectReference: {fileID: 0}
34033403
- target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
34043404
type: 3}
34053405
propertyPath: profiles.Array.data[2].Themes.Array.size
3406-
value: 1
3406+
value: 2
34073407
objectReference: {fileID: 0}
34083408
- target: {fileID: 9004932328701866534, guid: 64790b91b91094d49942373c4e83c237,
34093409
type: 3}
@@ -5095,30 +5095,10 @@ PrefabInstance:
50955095
propertyPath: m_LocalScale.z
50965096
value: 1.8
50975097
objectReference: {fileID: 0}
5098-
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
5099-
type: 3}
5100-
propertyPath: m_textInfo.characterCount
5101-
value: 0
5102-
objectReference: {fileID: 0}
5103-
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
5104-
type: 3}
5105-
propertyPath: m_textInfo.spaceCount
5106-
value: 0
5107-
objectReference: {fileID: 0}
5108-
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
5109-
type: 3}
5110-
propertyPath: m_textInfo.wordCount
5111-
value: 0
5112-
objectReference: {fileID: 0}
5113-
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
5114-
type: 3}
5115-
propertyPath: m_textInfo.lineCount
5116-
value: 0
5117-
objectReference: {fileID: 0}
5118-
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
5098+
- target: {fileID: 4607504470098667674, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
51195099
type: 3}
5120-
propertyPath: m_textInfo.pageCount
5121-
value: 0
5100+
propertyPath: m_Mesh
5101+
value:
51225102
objectReference: {fileID: 0}
51235103
- target: {fileID: 2204069621878992557, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
51245104
type: 3}
@@ -5150,10 +5130,30 @@ PrefabInstance:
51505130
propertyPath: m_text
51515131
value: Normal
51525132
objectReference: {fileID: 0}
5153-
- target: {fileID: 4607504470098667674, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
5133+
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
51545134
type: 3}
5155-
propertyPath: m_Mesh
5156-
value:
5135+
propertyPath: m_textInfo.characterCount
5136+
value: 0
5137+
objectReference: {fileID: 0}
5138+
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
5139+
type: 3}
5140+
propertyPath: m_textInfo.spaceCount
5141+
value: 0
5142+
objectReference: {fileID: 0}
5143+
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
5144+
type: 3}
5145+
propertyPath: m_textInfo.wordCount
5146+
value: 0
5147+
objectReference: {fileID: 0}
5148+
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
5149+
type: 3}
5150+
propertyPath: m_textInfo.lineCount
5151+
value: 0
5152+
objectReference: {fileID: 0}
5153+
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
5154+
type: 3}
5155+
propertyPath: m_textInfo.pageCount
5156+
value: 0
51575157
objectReference: {fileID: 0}
51585158
m_RemovedComponents: []
51595159
m_SourcePrefab: {fileID: 100100000, guid: 3f1f46cbecbe08e46a303ccfdb5b498a, type: 3}
@@ -6361,27 +6361,27 @@ PrefabInstance:
63616361
propertyPath: m_LocalScale.z
63626362
value: 0.24414062
63636363
objectReference: {fileID: 0}
6364-
- target: {fileID: 4610967451646196, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
6364+
- target: {fileID: 4891684840272184, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
63656365
propertyPath: m_LocalScale.x
63666366
value: 0.34179688
63676367
objectReference: {fileID: 0}
6368-
- target: {fileID: 4610967451646196, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
6368+
- target: {fileID: 4891684840272184, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
63696369
propertyPath: m_LocalScale.y
63706370
value: 0.34179688
63716371
objectReference: {fileID: 0}
6372-
- target: {fileID: 4610967451646196, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
6372+
- target: {fileID: 4891684840272184, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
63736373
propertyPath: m_LocalScale.z
63746374
value: 0.24414062
63756375
objectReference: {fileID: 0}
6376-
- target: {fileID: 4891684840272184, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
6376+
- target: {fileID: 4610967451646196, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
63776377
propertyPath: m_LocalScale.x
63786378
value: 0.34179688
63796379
objectReference: {fileID: 0}
6380-
- target: {fileID: 4891684840272184, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
6380+
- target: {fileID: 4610967451646196, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
63816381
propertyPath: m_LocalScale.y
63826382
value: 0.34179688
63836383
objectReference: {fileID: 0}
6384-
- target: {fileID: 4891684840272184, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
6384+
- target: {fileID: 4610967451646196, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
63856385
propertyPath: m_LocalScale.z
63866386
value: 0.24414062
63876387
objectReference: {fileID: 0}

‎Assets/MixedRealityToolkit.Examples/Demos/Utilities/InspectorFields/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.4.0.0")]
7-
[assembly: AssemblyFileVersion("2.4.0.0")]
6+
[assembly: AssemblyVersion("2.3.0.0")]
7+
[assembly: AssemblyFileVersion("2.3.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Demos/Utilities/InspectorFields/Inspectors/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.4.0.0")]
7-
[assembly: AssemblyFileVersion("2.4.0.0")]
6+
[assembly: AssemblyVersion("2.3.0.0")]
7+
[assembly: AssemblyFileVersion("2.3.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Experimental/HandCoach.meta‎

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

0 commit comments

Comments
 (0)