Skip to content

Commit acd338a

Browse files
author
David Kline
authored
Merge pull request #3047 from Microsoft/mrtk_2018beta_stabilization
MRTK 2018 vNext Beta (2018.9.0) -> mrtk_release
2 parents 9f5bea7 + 9ada725 commit acd338a

File tree

1,027 files changed

+59174
-9495
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,027 files changed

+59174
-9495
lines changed

.gitignore

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,18 @@ UWP/
1212
WindowsStoreApp/
1313
UnityGenerated/
1414
UnityPackageManager/
15+
.out/
1516
project.json
1617
project.lock.json
17-
WSATestCertificate.pfx
18-
WSATestCertificate.pfx.meta
18+
*.package
19+
20+
# ============ #
21+
# Certificates #
22+
# ============ #
23+
*.cert
24+
*.privkey
25+
*.pfx
26+
*.pfx.meta
1927

2028
# ===================================== #
2129
# Visual Studio / MonoDevelop generated #
@@ -41,9 +49,17 @@ obj/
4149
*.idb
4250
*.opendb
4351

44-
Assets/ThirdParty/
45-
Assets/ThirdParty.meta
52+
# ============================ #
53+
# Visual Studio Code Generated #
54+
# ============================ #
55+
.vscode/
4656

57+
# ===================== #
58+
# Project Specific List #
59+
# ===================== #
4760
artifacts/
61+
Assets/ThirdParty/
62+
Assets/ThirdParty.meta
4863
Assets/TextMesh Pro.meta
4964
Assets/TextMesh Pro/
65+
--Version/

Assets/MixedRealityToolkit-Examples/Internal.meta renamed to Assets/MixedRealityToolkit-Examples/Demos/Audio.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/MixedRealityToolkit/Sharing/RackNet.meta renamed to Assets/MixedRealityToolkit-Examples/Demos/Audio/Audio.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

Assets/MixedRealityToolkit-Examples/Demos/Audio/Audio/PolyHover.wav.meta

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
1.35 MB
Binary file not shown.

Assets/MixedRealityToolkit-Examples/Demos/Audio/Audio/Vocals.wav.meta

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

Assets/MixedRealityToolkit/Sharing/UNET.meta renamed to Assets/MixedRealityToolkit-Examples/Demos/Audio/Scenes.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)