Skip to content

Commit 3b3e9ca

Browse files
Troy-FerrellTroy-Ferrell
committed
merge of latest
2 parents 75cbb46 + e1fef61 commit 3b3e9ca

File tree

1,297 files changed

+114342
-10605
lines changed

Some content is hidden

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

1,297 files changed

+114342
-10605
lines changed

‎.github/ISSUE_TEMPLATE/bug-report.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ A clear and concise description of what you expected to happen.
2828

2929
If applicable, add screenshots to help explain your problem.
3030

31-
## Your Setup (please complete the following information)
31+
## Your setup (please complete the following information)
3232

3333
- Unity Version [e.g. 2018.3.11f1]
3434
- MRTK Version [e.g. v2.0]
3535

36-
## Target Platform (please complete the following information)
36+
## Target platform (please complete the following information)
3737

3838
- HoloLens
3939
- HoloLens 2

‎.github/ISSUE_TEMPLATE/documentation-issue.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ assignees: ''
77

88
---
99

10-
## Describe the Issue
10+
## Describe the issue
1111
A clear and concise what the issue
1212

13-
## Feature Area
13+
## Feature area
1414
What's incorrect? What's missing?
1515

16-
## Existing Doc Link
17-
If this is about something in an existing document, please provide link
16+
## Existing doc link
17+
If this is about something in an existing document, please provide link
1818

1919
## Additional context
2020
Add any other context about the problem here.

‎.github/issue_template.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
## Overview
22

3-
## Expected Behavior
3+
## Expected behavior
44

5-
## Actual Behavior
5+
## Actual behavior
66

77
## Steps to reproduce
88
_(Links to sample github project preferred)_
99

10-
## Unity Editor Version
10+
## Unity editor version
1111

12-
## Mixed Reality Toolkit Release Version
12+
## Mixed Reality Toolkit release version

‎.gitignore‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,13 @@ obj/
5959
# Project Specific List #
6060
# ===================== #
6161
artifacts/
62-
Assets/ThirdParty/
63-
Assets/ThirdParty.meta
64-
Assets/TextMesh Pro.meta
65-
Assets/TextMesh Pro/
62+
Assets/ThirdParty*
63+
Assets/TextMesh Pro*
6664
--Version/
6765
Assets/StreamingAssets/GltfModels/
6866
Assets/StreamingAssets/GltfModels.meta
6967
Assets/StreamingAssets.meta
68+
Assets/MixedRealityToolkit.Generated*
7069

7170
/mrtk_log_mostRecentET.csv
7271

@@ -91,3 +90,10 @@ doc/
9190
/MSBuild/
9291
/PackagesCopy/
9392
!/scripts/Packaging/NuGetRestoreProject.csproj
93+
94+
# ========================= #
95+
# MSBuildForUnity generated #
96+
# ========================= #
97+
Assets/MixedRealityToolkit.Providers/WindowsMixedReality/DotNetAdapter/Plugins*
98+
MSBuildForUnity.Common.props
99+
.obj

‎Assets/MixedReality.Toolkit.Foundation.nuspec‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,24 @@
55
<version>$version$</version>
66
<authors>Microsoft</authors>
77
<owners>Microsoft,MixedReality</owners>
8-
<licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/mrtk_release/License.txt</licenseUrl>
9-
<projectUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity</projectUrl>
8+
<licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/mrtk_development/License.txt</licenseUrl>
9+
<projectUrl>https://aka.ms/MRTK</projectUrl>
10+
<iconUrl>https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Images/MRTK_Logo_NuGet.png</iconUrl>
1011
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1112
<description>The Mixed Reality Toolkit is a collection of scripts and components intended to accelerate development of applications targeting Microsoft HoloLens and Windows Mixed Reality headsets.</description>
1213
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1314
<releaseNotes>$releaseNotes$</releaseNotes>
14-
<tags>Unity MixedReality</tags>
15+
<tags>Unity MixedReality MixedRealityToolkit MRTK</tags>
16+
<dependencies>
17+
<dependency id="Microsoft.Windows.MixedReality.DotNetWinRT" version="0.5.1037" />
18+
</dependencies>
1519
<contentFiles>
1620
<files include="any\any\.PkgSrc\**" buildAction="None" copyToOutput="false" />
1721
</contentFiles>
1822
</metadata>
1923
<files>
2024
<file src="MixedRealityToolkit\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit\toc.yml*" target="MRTK\" />
21-
<file src="MixedRealityToolkit.Providers\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Providers\License.txt*;MixedRealityToolkit.Providers\Version.txt*" 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\" />
2226
<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\" />
2327
<file src="MixedRealityToolkit.Services\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Services\License.txt*;MixedRealityToolkit.Services\Version.txt*" target="MRTK\" />
2428

‎Assets/MixedRealityToolkit.Examples/AssemblyInfo.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License. See LICENSE in the project root for license information.
3+
4+
using System.Reflection;
5+
6+
[assembly: AssemblyVersion("2.3.0.0")]
7+
[assembly: AssemblyFileVersion("2.3.0.0")]
8+
9+
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
10+
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/AssemblyInfo.cs.meta‎

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

‎Assets/MixedRealityToolkit.Examples/Demos/Audio/Scripts/LoFiFilterSelection.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
namespace Microsoft.MixedReality.Toolkit.Examples.Demos
99
{
1010
[RequireComponent(typeof(AudioLoFiEffect))]
11+
[AddComponentMenu("Scripts/MRTK/Examples/LoFiFilterSelection")]
1112
public class LoFiFilterSelection : MonoBehaviour, IMixedRealityPointerHandler
1213
{
1314
[Tooltip("Material used when the emitter is set to Narrow Band Telephony")]

‎Assets/MixedRealityToolkit.Examples/Demos/Boundary/Scenes/BoundaryVisualization.unity‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,6 @@ MonoBehaviour:
256256
m_OnCullStateChanged:
257257
m_PersistentCalls:
258258
m_Calls: []
259-
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
260-
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
261259
m_FontData:
262260
m_Font: {fileID: 12800000, guid: e869342c56e54acf989b2422b4b80dcc, type: 3}
263261
m_FontSize: 40
@@ -540,8 +538,6 @@ MonoBehaviour:
540538
m_OnCullStateChanged:
541539
m_PersistentCalls:
542540
m_Calls: []
543-
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
544-
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
545541
m_FontData:
546542
m_Font: {fileID: 12800000, guid: e869342c56e54acf989b2422b4b80dcc, type: 3}
547543
m_FontSize: 40
@@ -698,8 +694,6 @@ MonoBehaviour:
698694
m_OnCullStateChanged:
699695
m_PersistentCalls:
700696
m_Calls: []
701-
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
702-
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
703697
m_FontData:
704698
m_Font: {fileID: 12800000, guid: e869342c56e54acf989b2422b4b80dcc, type: 3}
705699
m_FontSize: 40

‎Assets/MixedRealityToolkit.Examples/Demos/Boundary/Scripts/BoundaryVisualizationDemo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
using Microsoft.MixedReality.Toolkit.Boundary;
55
using System.Collections.Generic;
66
using UnityEngine;
7-
using UnityBoundary = UnityEngine.Experimental.XR.Boundary;
87

98
namespace Microsoft.MixedReality.Toolkit.Examples.Demos
109
{
1110
/// <summary>
1211
/// Demo class to show different ways of using the boundary system and visualizing the data.
1312
/// </summary>
13+
[AddComponentMenu("Scripts/MRTK/Examples/BoundaryVisualizationDemo")]
1414
public class BoundaryVisualizationDemo : MonoBehaviour, IMixedRealityBoundaryHandler
1515
{
1616
private GameObject markerParent;
@@ -144,12 +144,12 @@ private void AddMarkers()
144144

145145
Material material = null;
146146
// Check inscribed rectangle first
147-
if (CoreServices.BoundarySystem.Contains(position, UnityBoundary.Type.PlayArea))
147+
if (CoreServices.BoundarySystem.Contains(position, BoundaryType.PlayArea))
148148
{
149149
material = playAreaMaterial;
150150
}
151151
// Then check geometry
152-
else if (CoreServices.BoundarySystem.Contains(position, UnityBoundary.Type.TrackedArea))
152+
else if (CoreServices.BoundarySystem.Contains(position, BoundaryType.TrackedArea))
153153
{
154154
material = trackedAreaMaterial;
155155
}

0 commit comments

Comments
 (0)