Skip to content

Commit 6470ad7

Browse files
Merge branch 'mrtk_development' into vNEXT-InputActionRules
2 parents 2522fa2 + 76d6041 commit 6470ad7

File tree

229 files changed

+7608
-1122
lines changed

Some content is hidden

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

229 files changed

+7608
-1122
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,4 @@ Assets/ThirdParty/
5454
Assets/ThirdParty.meta
5555
Assets/TextMesh Pro.meta
5656
Assets/TextMesh Pro/
57+
--Version/

Assets/MixedRealityToolkit-Examples/Demos/Audio.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.

Assets/MixedRealityToolkit-Examples/Demos/Audio/Audio.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.
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-Examples/Demos/Audio/Scenes.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)