Skip to content

Commit 5294508

Browse files
artsouflMSartsouflMS
authored
Merge pull request #1 from microsoft/mrtk_development
Update to current Mrtk development
2 parents 32e41e0 + d8d79da commit 5294508

File tree

6,583 files changed

+1003580
-110205
lines changed

Some content is hidden

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

6,583 files changed

+1003580
-110205
lines changed

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

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
---
2+
name: Bug report
3+
about: Create a bug report to help us improve
4+
title: ''
5+
labels: Bug
6+
assignees: ''
7+
8+
---
9+
10+
## Describe the bug
11+
12+
A clear and concise description of what the bug is.
13+
14+
## To reproduce
15+
16+
Steps to reproduce the behavior:
17+
18+
1. Go to '...'
19+
2. Click on '....'
20+
3. Scroll down to '....'
21+
4. See error
22+
23+
## Expected behavior
24+
25+
A clear and concise description of what you expected to happen.
26+
27+
## Screenshots
28+
29+
If applicable, add screenshots to help explain your problem.
30+
31+
## Your Setup (please complete the following information)
32+
33+
- Unity Version [e.g. 2018.3.11f1]
34+
- MRTK Version [e.g. v2.0]
35+
36+
## Target Platform (please complete the following information)
37+
38+
- HoloLens
39+
- HoloLens 2
40+
- WMR immersive
41+
- OpenVR
42+
43+
## Additional context
44+
45+
Add any other context about the problem here.

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Documentation Issue
3+
about: 'Something in our doc is missing or incorrect '
4+
title: ''
5+
labels: Documentation
6+
assignees: ''
7+
8+
---
9+
10+
## Describe the Issue
11+
A clear and concise what the issue
12+
13+
## Feature Area
14+
What's incorrect? What's missing?
15+
16+
## Existing Doc Link
17+
If this is about something in an existing document, please provide link
18+
19+
## Additional context
20+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/feature-request.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: Feature Request
3+
about: Suggest an idea for the MRTK
4+
title: ''
5+
labels: Feature Request
6+
assignees: ''
7+
8+
---
9+
10+
## Describe the problem
11+
12+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
13+
14+
## Describe the solution you'd like
15+
16+
A clear and concise description of what you want to happen.
17+
18+
## Describe alternatives you've considered
19+
20+
A clear and concise description of any alternative solutions or features you've considered.
21+
22+
## Additional context
23+
24+
Add any other context or screenshots about the feature request here.

‎.github/pull_request_template.md‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,22 @@
1-
Overview
2-
---
1+
## Overview
32

43

5-
Changes
6-
---
4+
## Changes
75
- Fixes: # .
6+
7+
8+
## Verification
9+
> This optional section is a place where you can detail the specific type of verification
10+
> you want from reviewers. For example, if you want reviewers to checkout the PR locally
11+
> and validate the functionality of specific scenarios, provide instructions
12+
> on the specific scenarios and what you want verified.
13+
>
14+
> If there are specific areas of concern or question feel free to highlight them here so
15+
> that reviewers can watch out for those issues.
16+
>
17+
> As a reviewer, it is possible to check out this change locally by using the following
18+
> commands (substituting {PR_ID} with the ID of this pull request):
19+
>
20+
> git fetch origin pull/{PR_ID}/head:name_of_local_branch
21+
>
22+
> git checkout name_of_local_branch

‎.github/write-good.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
writeGood: false
2+
alex: false
3+
spellchecker: true

‎.gitignore‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
[Aa]pp/
1111
UWP/
1212
WindowsStoreApp/
13+
WSA/
1314
UnityGenerated/
1415
UnityPackageManager/
1516
.out/
@@ -63,3 +64,38 @@ Assets/ThirdParty.meta
6364
Assets/TextMesh Pro.meta
6465
Assets/TextMesh Pro/
6566
--Version/
67+
Assets/StreamingAssets/GltfModels/
68+
Assets/StreamingAssets/GltfModels.meta
69+
Assets/StreamingAssets.meta
70+
Assets/MixedRealityToolkit.Generated/*
71+
72+
/mrtk_log_mostRecentET.csv
73+
74+
# =============== #
75+
# DocFX Generated #
76+
# =============== #
77+
doc/
78+
79+
# This is only needed because docfx chooses the first alphabetically occurring
80+
# .cs file's folder to create an obj/xdoc cache folder inside.
81+
# When https://github.com/dotnet/docfx/issues/1156 is addressed, it should be
82+
# possible to remove the rule on the following line and update our docfx
83+
# configuration to place its cache in a deterministic folder.
84+
[Oo]bj.meta
85+
86+
# ============================= #
87+
# NuGet Build Process Generated #
88+
# ============================= #
89+
/NuGet/*
90+
!/NuGet/BuildSource.proj
91+
/MRTKBuild/
92+
/MSBuild/
93+
/PackagesCopy/
94+
!/scripts/Packaging/NuGetRestoreProject.csproj
95+
96+
# ========================= #
97+
# MSBuildForUnity generated #
98+
# ========================= #
99+
Assets/MixedRealityToolkit.Providers/WindowsMixedReality/DotNetAdapter/Plugins*
100+
MSBuildForUnity.Common.props
101+
.obj

‎Assets/MixedReality.Toolkit.Foundation.nuspec‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?xml version="1.0"?>
2+
<package >
3+
<metadata>
4+
<id>Microsoft.MixedReality.Toolkit.Foundation</id>
5+
<version>$version$</version>
6+
<authors>Microsoft</authors>
7+
<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>
10+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
11+
<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>
12+
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
13+
<releaseNotes>$releaseNotes$</releaseNotes>
14+
<tags>Unity MixedReality</tags>
15+
<dependencies>
16+
<dependency id="Microsoft.Windows.MixedReality.DotNetWinRT" version="0.5.1034" />
17+
</dependencies>
18+
<contentFiles>
19+
<files include="any\any\.PkgSrc\**" buildAction="None" copyToOutput="false" />
20+
</contentFiles>
21+
</metadata>
22+
<files>
23+
<file src="MixedRealityToolkit\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit\toc.yml*" target="MRTK\" />
24+
<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.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\" />
26+
<file src="MixedRealityToolkit.Services\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Services\License.txt*;MixedRealityToolkit.Services\Version.txt*" target="MRTK\" />
27+
28+
<file src="MixedRealityToolkit\MixedReality.Toolkit.targets" target="build\Microsoft.MixedReality.Toolkit.Foundation.targets" />
29+
30+
<!-- Assemblies and Sources that are built from the MixedRealityToolkit folder -->
31+
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Editor.*" target="Plugins\" />
32+
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Async.*" target="Plugins\" />
33+
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.dll*" target="Plugins\" />
34+
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.pdb*" target="Plugins\" />
35+
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Gltf.*" target="Plugins\" />
36+
<file src="..\..\Assets\MixedRealityToolkit\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit" />
37+
38+
<!-- Assemblies and Sources that are built from the MixedRealityToolkit.Providers folder -->
39+
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Providers.*" target="Plugins\" />
40+
<file src="..\..\Assets\MixedRealityToolkit.Providers\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.Providers" />
41+
42+
<!-- Assemblies and Sources that are built from the MixedRealityToolkit.SDK folder -->
43+
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.SDK.*" target="Plugins\" />
44+
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.SDK.Inspectors.*" target="Plugins\" />
45+
<file src="..\..\Assets\MixedRealityToolkit.SDK\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.SDK" />
46+
47+
<!-- Assemblies and Sources that are built from the MixedRealityToolkit.Services folder -->
48+
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Services.*" target="Plugins\" />
49+
<file src="..\..\Assets\MixedRealityToolkit.Services\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.Services" />
50+
51+
<!--
52+
link.xml is copied to the root location, so that it can catch IL2CPP
53+
bytecode stripping issues for all scripts included in this package.
54+
-->
55+
<file src="link.xml" target="" />
56+
<file src="link.xml.meta" target="" />
57+
</files>
58+
</package>

‎Assets/MixedReality.Toolkit.Foundation.nuspec.meta‎

Lines changed: 7 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)