Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge 2.1.0 into release branch #6253

Merged
merged 1,147 commits into from
Oct 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1147 commits
Select commit Hold shift + click to select a range
e88aee8
update prefab path in test
Sep 23, 2019
29fdfc0
Merge pull request #6021 from cre8ivepark/mrtk_development_HandMenuPo…
Sep 23, 2019
707b9d6
Merge remote-tracking branch 'origin/mrtk_development' into get-types…
AdamMitchell-ms Sep 23, 2019
32ba3c0
Merge pull request #6046 from davidkline-ms/5953_tree
Sep 23, 2019
2503c20
Merge pull request #6019 from MenelvagorMilsom/ux/interaction-destroy…
Sep 23, 2019
05622c7
Added doc comments
CDiaz-MS Sep 23, 2019
2647f90
Updated touchable collider comment and typos
CDiaz-MS Sep 24, 2019
e9d4d4b
Merge branch 'mrtk_development_MenuExamples' of https://github.com/cr…
cre8ivepark Sep 24, 2019
ec8c4d5
Reassigned toggle buttons with proper interactable profiles.
cre8ivepark Sep 24, 2019
6a06cce
Fix broken image links
cre8ivepark Sep 24, 2019
4c2bc2b
Fixed broken filename
cre8ivepark Sep 24, 2019
513e92c
Change request - remove comment
Sep 24, 2019
838ab93
Merge pull request #6027 from CDiaz-MS/issue_5825
thalbern Sep 24, 2019
c5b0ed8
Recreated HandMenuExamples scene, deleted original corrupt scene file.
cre8ivepark Sep 24, 2019
9b20bf4
Merge pull request #5990 from cre8ivepark/mrtk_development_MenuExamples
cre8ivepark Sep 24, 2019
4e241d2
Merge branch 'prerelease/2.1.0_stabilization' of https://github.com/m…
cre8ivepark Sep 24, 2019
3c23aec
Merge pull request #5949 from AdamMitchell-ms/get-types-safely
Sep 24, 2019
b7aab2d
Reassigned buttons.
cre8ivepark Sep 24, 2019
414707f
Button position adjustment
cre8ivepark Sep 24, 2019
6786a55
Updated Scene System Profile for the Examples Hub
cre8ivepark Sep 24, 2019
f067f87
add desc panel to input tool, rename tool
Sep 24, 2019
883a662
re-update tool name to be more descriptive
Sep 24, 2019
fc80b8f
Merge pull request #6059 from cre8ivepark/prerelease/2.1.0_stabilizat…
Sep 24, 2019
cc8d6d7
minor description panel updates
Sep 24, 2019
661f284
add tool document and images, update input data provider doc to ref tool
Sep 24, 2019
6547dae
add controller mapping tool to toc
Sep 24, 2019
ef129de
Update Documentation/Tools/ControllerMappingTool.md
Sep 24, 2019
d8e00b1
Updated OnDisable and SetDisable in Interactable
CDiaz-MS Sep 24, 2019
9180bb4
progress
Sep 25, 2019
412827e
Merge branch 'prerelease/2.1.0_stabilization' of https://github.com/M…
Sep 25, 2019
05efbf4
cleanup
Sep 25, 2019
4839327
Fix other unit test
AdamMitchell-ms Sep 23, 2019
fd17eb9
Fix broken unit test
AdamMitchell-ms Sep 23, 2019
a3b9f88
Revert "Revert "Fix a few issues with PressableButton.""
AdamMitchell-ms Sep 23, 2019
9baffa7
Revert previous changes, they didn't work. Instead add second collide…
Sep 25, 2019
dea2d7c
remove extra fixedupdates
Sep 25, 2019
97827f0
Doccomments
Sep 25, 2019
81db5a0
Merge pull request #6017 from thalbern/user/bethalha/bb_anim
thalbern Sep 25, 2019
90f5ecb
commit delete code that i missed in merge
Sep 25, 2019
ce7f9b0
Remove empty returns
Sep 25, 2019
bbd5852
One more empty return
Sep 25, 2019
989e905
Merge pull request #6069 from julenka/cherrypick/6048
Sep 25, 2019
6657707
Merge pull request #6067 from julenka/issue/5552
Sep 25, 2019
886d390
Merge pull request #6040 from andreiborodin/uses/anborod/nugetDocumen…
Sep 24, 2019
25fb342
use new hand behaviors, make scale handles bigger
Sep 25, 2019
aff7d19
remove bulk tests
Sep 25, 2019
c801601
remove magic number
Sep 25, 2019
966baa0
Merge pull request #6074 from julenka/issue/6058
Sep 25, 2019
6e9d317
Add second cube to fix issue where sometimes ray doesn't hit collider…
Sep 25, 2019
5fa1f94
Fix ble TestInputActionMenuInput test by adding function that ensures…
Sep 25, 2019
6f2aabf
Fix black piano key not responding to hand tracking input. adjusted B…
cre8ivepark Sep 25, 2019
0a01a5b
Adjust hand positions a bit in a test. Also add better error text to…
AdamMitchell-ms Sep 25, 2019
aeda5ec
Merge pull request #6075 from julenka/issue/6058
Sep 25, 2019
bdec5b1
fix tmp installation
Sep 25, 2019
894691d
Fix intermittent voice command failure by waiting for input system
Sep 25, 2019
ca04247
Remove extra wait
Sep 25, 2019
6d1e4fe
Move the hand down/right by 5cm to aim the hand ray closer to the cen…
AdamMitchell-ms Sep 25, 2019
91a0d4b
add log message if tmpro package cannot be found
Sep 25, 2019
6d25f53
Merge pull request #6081 from davidkline-ms/inbButtonTestFailures
Sep 25, 2019
b8e527c
Merge pull request #6083 from AdamMitchell-ms/test-robustness
Sep 25, 2019
fa77717
Updated if spaces, removed SetDisabled from OnEnable and OnDisable
CDiaz-MS Sep 25, 2019
ef58a74
Merge pull request #6082 from julenka/issue/6058
Sep 25, 2019
087ec0a
More reliable one hand move far
Sep 25, 2019
567d81e
Merge remote-tracking branch 'upstream/prerelease/2.1.0_stabilization…
Sep 25, 2019
3376d87
fix comments
Sep 26, 2019
f875438
Update to CoreServices
Troy-Ferrell Sep 26, 2019
53e724d
Merge branch 'prerelease/2.1.0_stabilization' into users/trferrel/int…
Troy-Ferrell Sep 26, 2019
7a0ef78
Comments
Sep 26, 2019
5795b21
Start deprecation and conslidation of state properties/setters
Troy-Ferrell Sep 26, 2019
797d9ac
Merge pull request #6084 from julenka/issue/6058
Sep 26, 2019
f3f8a09
Merge pull request #6079 from cre8ivepark/prerelease/2.1.0_stabilizat…
Sep 26, 2019
d604a53
Update states and move related items into deprecated, clean up code, …
Troy-Ferrell Sep 26, 2019
dbe3a9f
Merge branch 'prerelease/2.1.0_stabilization' into users/trferrel/int…
Troy-Ferrell Sep 26, 2019
6243563
Fix from merge, cleaning up code a bit
Troy-Ferrell Sep 26, 2019
fd2e072
Merge pull request #6063 from davidkline-ms/inputToolDocs
Sep 26, 2019
726a3cf
Merge pull request #6035 from gilbdev/bugfix/sceneutils
Sep 26, 2019
99bf392
Minor tweaks
Troy-Ferrell Sep 26, 2019
01cf777
Merge branch 'prerelease/2.1.0_stabilization' into users/trferrel/int…
Troy-Ferrell Sep 26, 2019
7be2143
Update selectionmode code and disable interactable GUI on play
Troy-Ferrell Sep 26, 2019
f8e5832
Merge pull request #6099 from davidkline-ms/picks/6040
keveleigh Sep 26, 2019
af8a2ac
polish steps
Troy-Ferrell Sep 26, 2019
30bc95f
Merge pull request #6068 from CDiaz-MS/issue_4967_4481_fix
Sep 26, 2019
39cc2eb
Start working on tests
Troy-Ferrell Sep 26, 2019
1b0ab72
Merge branch 'prerelease/2.1.0_stabilization' into users/trferrel/int…
Troy-Ferrell Sep 26, 2019
b96fa20
Update tests
Troy-Ferrell Sep 26, 2019
3d0437d
Add deprecated item back
Troy-Ferrell Sep 26, 2019
c7bcdce
Documentation fix for the Examples Hub
cre8ivepark Sep 26, 2019
f7b918c
Missing private field
Troy-Ferrell Sep 26, 2019
5f94172
Merge pull request #6097 from Railboy/tooltip_inspector_fixes
Sep 26, 2019
3cae9ee
Update Documentation/README_BoundingBox.md
julenka Sep 26, 2019
a9661b1
Account for script in .anim file
keveleigh Sep 26, 2019
cbb389b
Improve logging
keveleigh Sep 26, 2019
1720f7c
Turn off input simulation indicators (#6062)
Sep 26, 2019
109a509
Docs update for the Button
cre8ivepark Sep 27, 2019
c662325
Remove IconEditor
keveleigh Sep 27, 2019
7cd1e6e
Delete MRTKExamplesHub.meta
keveleigh Sep 27, 2019
95c360b
Image update
cre8ivepark Sep 27, 2019
5578078
Merge pull request #6107 from davidkline-ms/picks/6097
keveleigh Sep 27, 2019
39da72b
Merge pull request #6113 from keveleigh/remove-unused-meta
keveleigh Sep 27, 2019
4c761bd
Updated default simulation mouse rotation speed for improved usabilit…
cre8ivepark Sep 27, 2019
196037b
Properly remap regardless of m_script or script
keveleigh Sep 27, 2019
9f7a2dc
Merge branch 'prerelease/2.1.0_stabilization' into users/trferrel/int…
Troy-Ferrell Sep 27, 2019
2a7d43e
Merge pull request #6112 from keveleigh/remove-icon-setter
Sep 27, 2019
a42a72e
Updates for PR
Troy-Ferrell Sep 27, 2019
8917723
Update buffer size debug output
keveleigh Sep 27, 2019
84fd045
Merge pull request #6123 from keveleigh/update-buffer-doc
keveleigh Sep 27, 2019
5f49933
removed patch for scaling issue while animating because it's breaking…
thalbern Sep 27, 2019
a49f17b
Camera fix and test
Troy-Ferrell Sep 27, 2019
953b649
Minor tweaks
Troy-Ferrell Sep 28, 2019
8662831
Added CanRouteInput() to PhysicalPressEventRouter and added a test fo…
CDiaz-MS Sep 28, 2019
3135f52
Update Documentation/README_ExampleHub.md
cre8ivepark Sep 29, 2019
9887da0
Update Documentation/README_ExampleHub.md
cre8ivepark Sep 29, 2019
8642c10
Update Documentation/README_Button.md
cre8ivepark Sep 29, 2019
f241da3
Update Documentation/README_Button.md
cre8ivepark Sep 29, 2019
2cced5a
Update Assets/MixedRealityToolkit.Tests/PlayModeTests/PressableButton…
CDiaz-MS Sep 30, 2019
433cb9d
Merge pull request #6110 from keveleigh/update-asset-retargeter
Sep 30, 2019
1906399
Added test to InteractableTests that checks focus state when enabling…
CDiaz-MS Sep 30, 2019
7c38e27
Fix for PR
Troy-Ferrell Sep 30, 2019
d267b40
Merge branch 'prerelease/2.1.0_stabilization' of https://github.com/M…
cre8ivepark Sep 30, 2019
0112e75
Merge pull request #6129 from CDiaz-MS/issue_5833
CDiaz-MS Sep 30, 2019
7e89f3b
fix ?. usages for obvious UnityEngine.Component derived objects
Sep 30, 2019
4de888b
Merge pull request #6128 from Troy-Ferrell/users/trferrel/FOV-Camera-Fix
keveleigh Sep 30, 2019
25eb62a
Animation Controller / Radial View timing adjustment to remove initia…
cre8ivepark Sep 30, 2019
eb2c02b
Merge pull request #6141 from davidkline-ms/questionDot
Sep 30, 2019
abca2c1
Mark ColliderNearInteractionTouchable as obsolete (#6139)
Sep 30, 2019
c3042d2
Updates for PR
Troy-Ferrell Sep 30, 2019
6449867
Merge pull request #6109 from cre8ivepark/prerelease/2.1.0_stabilizat…
Sep 30, 2019
7668849
Merge pull request #6102 from cre8ivepark/mrtk_development_Docs_BB_0913
Sep 30, 2019
2c2927d
Merge pull request #6111 from cre8ivepark/prerelease/2.1.0_stabilizat…
Sep 30, 2019
65301bc
Remove #IF UNITY_EDITOR from MSBuild scripts
keveleigh Sep 30, 2019
d18933d
Merge pull request #6142 from cre8ivepark/mrtk_development_SpeechConf…
Sep 30, 2019
1053355
Clean up some UNITY_EDITOR usage
keveleigh Sep 30, 2019
4bdd7c6
Merge branch 'prerelease/2.1.0_stabilization' into users/trferrel/int…
Troy-Ferrell Sep 30, 2019
73cbe97
Update for merge
Troy-Ferrell Sep 30, 2019
ebe9a04
fix null reference exception when re-enabling input system
Sep 30, 2019
8a560bc
add disable/enable input systm test
Sep 30, 2019
c5869b4
Merge pull request #6146 from keveleigh/fix-MSBuild-docs-and-editor-c…
keveleigh Sep 30, 2019
97c3974
Fix docs building
keveleigh Oct 1, 2019
84aac45
Fix typos
keveleigh Oct 1, 2019
ee4ff44
Merge pull request #6150 from keveleigh/fix-2.1.0-docs
Oct 1, 2019
c3e4803
Merge pull request #6104 from Troy-Ferrell/users/trferrel/interactabl…
Oct 1, 2019
f80844e
Init of docs update
Troy-Ferrell Oct 1, 2019
c6d6cf2
Merge remote-tracking branch 'upstream/prerelease/2.1.0_stabilization…
CDiaz-MS Oct 1, 2019
f4414aa
Merge pull request #6148 from davidkline-ms/disableEnableInput
keveleigh Oct 1, 2019
4607514
More updates
Troy-Ferrell Oct 1, 2019
ea1f74a
Updated test based on feedback
CDiaz-MS Oct 1, 2019
f8bc932
Updates for docs
Troy-Ferrell Oct 1, 2019
cbe9b87
More updates
Troy-Ferrell Oct 1, 2019
67fa3a8
Fix
Troy-Ferrell Oct 1, 2019
17c60c9
Fix header
Troy-Ferrell Oct 1, 2019
d37eecc
Minor interface fix
Troy-Ferrell Oct 1, 2019
afef9de
Docfx fixes
Troy-Ferrell Oct 1, 2019
a430937
Fix serialized property name in the inspector that was broken due to …
ritijain Oct 1, 2019
47968cd
More docfx fixes
Troy-Ferrell Oct 1, 2019
55edbf9
pr fix
Troy-Ferrell Oct 1, 2019
9351ff9
Merge pull request #6162 from ritijain/u/ritikaj/bugfixinteractable
Oct 1, 2019
324e9f3
Merge pull request #6140 from CDiaz-MS/issue_4967_test
CDiaz-MS Oct 1, 2019
68e8fb9
Merge pull request #6158 from Troy-Ferrell/users/trferrel/spatial-awa…
Oct 2, 2019
0d9e1d7
Update menu/start button mapping for Oculus Touch
keveleigh Oct 2, 2019
cd5bb6f
Change TriggerPress -> Select for WMR controller button-based select
keveleigh Oct 2, 2019
a8633d7
Minor optimization
keveleigh Oct 2, 2019
0e0ff9c
Rename MixedRealityControllerMappingProfiles -> MixedRealityControlle…
keveleigh Oct 2, 2019
5fb1bf8
Update Select for Vive and GenericOpenVR
keveleigh Oct 2, 2019
99b99a4
Use built in profile method
keveleigh Oct 2, 2019
e51fb81
Improve profile migration
keveleigh Oct 2, 2019
9fa6b8d
Formatting
keveleigh Oct 2, 2019
7df1793
Revert change to make Dimensions field lower-case to fix #6169
Oct 2, 2019
f093cb4
Update toggle state of the near menu pin buttons
Oct 2, 2019
ca5e92d
Revert handinteractionexamples change
Oct 2, 2019
1707d41
Revert near menu, will do it in prefabs
Oct 2, 2019
ae5d94b
Modify 4x1 prefab pin to be toggled.
Oct 2, 2019
f2adc7a
Merge pull request #6184 from keveleigh/fix-wmr-openvr
Oct 2, 2019
7e2fd4c
Formatting
keveleigh Oct 3, 2019
ad3e7b9
Update test icons
keveleigh Oct 2, 2019
ddecffb
Fixed recursive property setting. Yay tests!
Oct 3, 2019
cb47e0e
Update WMROpenVRController to initially account for the angle offset
keveleigh Oct 3, 2019
70ee51b
Add controller mapping tests
keveleigh Oct 3, 2019
6827d38
Deleted extra MixedRealityPlaypace objects from example scenes
CDiaz-MS Oct 3, 2019
51de525
Disable camera controls when an xr device is present
MenelvagorMilsom Oct 3, 2019
3fb8732
first pass release notes for 2.1.0, modify add updating guide
Oct 3, 2019
18f3116
Add comment for change
MenelvagorMilsom Oct 3, 2019
29344c3
Merge pull request #6186 from julenka/issue/6169
Oct 3, 2019
2e35b92
Merge pull request #6193 from MenelvagorMilsom/ux/fix-object-jumping-vr
Oct 3, 2019
74a154c
add new features and known issues content
Oct 3, 2019
5c40f3c
add interactable deprecation list to updating article
Oct 3, 2019
32fe9ac
Updating from RC2 -> Updating from earlier versions
Oct 3, 2019
fa73ac5
fix typing errors and bad links
Oct 3, 2019
6584dc2
Docs - Getting Started page - Fix broken links, updated and polished …
cre8ivepark Oct 3, 2019
85d3f70
Formatting and spelling
keveleigh Oct 3, 2019
6b350ff
More test icons
keveleigh Oct 3, 2019
615c8cf
Add menu item to add icons to tests automatically
keveleigh Oct 3, 2019
756cefd
Spelling and move menu item to be consistent
keveleigh Oct 3, 2019
a216dd9
Update UnitTests.md
keveleigh Oct 3, 2019
6b8cc3a
Fix tests
keveleigh Oct 3, 2019
0f6a58b
Add assert
keveleigh Oct 3, 2019
d03ed46
Wrap #if UNITY_EDITOR
keveleigh Oct 3, 2019
6bc6e66
Merge pull request #6197 from CDiaz-MS/example_scenes_cleanup
Oct 3, 2019
a20eb05
Fix toggle buttons and other multi-dimension interactable themes (#6…
Oct 3, 2019
b9fd6fc
Merge pull request #6189 from keveleigh/add-input-mapping-tests
Oct 3, 2019
cad5db3
Merge pull request #6190 from keveleigh/update-test-icons
Oct 3, 2019
7ae8588
Auto generate signing configs in release pipeline
MenelvagorMilsom Oct 4, 2019
236cc90
Add missing dir
MenelvagorMilsom Oct 4, 2019
c8d897e
Merge pull request #6200 from cre8ivepark/prerelease/2.1.0_stabilizat…
Oct 4, 2019
a1d79b3
Merge pull request #6211 from MenelvagorMilsom/ci/auto-generate-signi…
MenelvagorMilsom Oct 4, 2019
e4e65d2
fix link
Oct 4, 2019
c2ddbd7
Merge pull request #6215 from davidkline-ms/fixGettingStarted
keveleigh Oct 4, 2019
992cf31
Formatting and spelling
keveleigh Oct 4, 2019
c5d4b0b
Formatting and spelling
keveleigh Oct 4, 2019
bb4fd76
All-caps !NOTE and !IMPORTANT
keveleigh Oct 4, 2019
5b7f2db
Add notes on controller mapping profile
keveleigh Oct 4, 2019
beb1f15
Merge pull request #6199 from davidkline-ms/relNotes210
Oct 4, 2019
12fc3db
move example hub to the experimental folder, update release notes
Oct 4, 2019
f26da04
More new stuff
Oct 5, 2019
21304f4
Spacing
Oct 5, 2019
2842e49
Add mesh outlining
Oct 5, 2019
8141693
Merge pull request #6218 from davidkline-ms/hubExperimental
Oct 5, 2019
746b44a
Merge pull request #6219 from julenka/docs/2.1_releasenotes
Oct 5, 2019
efaee05
Merge branch 'prerelease/2.0.1_stabilization' into merge-2.0.1
keveleigh Oct 7, 2019
217c5ce
Merge pull request #6229 from keveleigh/merge-2.0.1
Oct 7, 2019
c1002c3
We don't want to publish Tests package, but we should include it in t…
Oct 7, 2019
e996b36
Merge pull request #6230 from andreiborodin/prerelease/2.1.0_bugs/del…
Oct 7, 2019
4562fd3
Remove alpha tag
Oct 7, 2019
3b44e70
Merge pull request #6231 from microsoft/prerelease/2.1.0_bugs/removeA…
Oct 7, 2019
4dc2300
Merge pull request #6228 from microsoft/sostel-doc-1
Oct 7, 2019
8c122df
temprarilly disabling mesh vertex count tracking
Oct 8, 2019
49dae03
restore some of the preciously commented code
Oct 8, 2019
ae05f78
try calling recalc when the mesh changes
Oct 8, 2019
42cba70
restore 0 check
Oct 8, 2019
c9b39e3
refine mesh change check
Oct 8, 2019
b90f0fe
readd the vertex count and add a null check
Oct 8, 2019
c2238a1
Merge pull request #6238 from davidkline-ms/inv6234_take2
keveleigh Oct 8, 2019
6d7dbe9
Remove duplicate metas from being packaged
Oct 8, 2019
1bb34a0
Merge pull request #6240 from andreiborodin/prerelease/2.1.0_bugs/rem…
Oct 8, 2019
cc12f1a
Update Examples Hub README to provide information on Extension package
cre8ivepark Oct 9, 2019
4b06cf2
Update README_ExampleHub.md
cre8ivepark Oct 9, 2019
326b1d3
Update Documentation/README_ExampleHub.md
cre8ivepark Oct 9, 2019
806c1ca
Update README_ExampleHub.md
cre8ivepark Oct 9, 2019
9cab162
add nuget package information to release notes
Oct 9, 2019
c34e05b
improve nuget update instructions
Oct 9, 2019
ebb84c1
Update Documentation/ReleaseNotes.md
Oct 9, 2019
6407618
Merge pull request #6245 from microsoft/cre8ivepark-patch-1
Oct 9, 2019
00008b4
Update Documentation/ReleaseNotes.md
Oct 9, 2019
7939ed3
Updating nuspecs to remove source from 2.1 release due to N4U long pa…
Oct 9, 2019
79ab010
Merge pull request #6248 from davidkline-ms/upd210RelNotes
Oct 9, 2019
134dd2c
Merge remote-tracking branch 'origin/prerelease/2.1.0_stabilization' …
Oct 9, 2019
1da7b2a
Merge pull request #6251 from andreiborodin/prerelease/2.1.0_bugs/rem…
Oct 9, 2019
78e63ca
update roadmap
Oct 9, 2019
a69c76d
Merge branch 'upd210RelNotes' of https://github.com/davidkline-ms/Mix…
Oct 9, 2019
5b31831
Merge pull request #6252 from davidkline-ms/upd210RelNotes
Oct 9, 2019
e9c2fda
Update .gitignore
Oct 9, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 12 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
[Aa]pp/
UWP/
WindowsStoreApp/
WSA/
UnityGenerated/
UnityPackageManager/
.out/
Expand Down Expand Up @@ -74,10 +75,19 @@ Assets/StreamingAssets.meta
# =============== #
doc/

# This is only needed because docfx chooses the first alphabetically occurring
# .cs file's folder to create an obj/xdoc cache folder inside.
# When https://github.com/dotnet/docfx/issues/1156 is addressed, it should be
# possible to remove the rule on the following line and update our docfx
# configuration to place its cache in a deterministic folder.
[Oo]bj.meta

# ============================= #
# NuGet Build Process Generated #
# ============================= #
/NuGet/
/NuGet/*
!/NuGet/BuildSource.proj
/MRTKBuild/
/MSBuild/
/PackagesCopy/
/PackagesCopy/
!/scripts/Packaging/NuGetRestoreProject.csproj
26 changes: 17 additions & 9 deletions Assets/MixedReality.Toolkit.Foundation.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,39 @@
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<releaseNotes>$releaseNotes$</releaseNotes>
<tags>Unity MixedReality</tags>
<contentFiles>
<files include="any\any\.PkgSrc\**" buildAction="None" copyToOutput="false" />
</contentFiles>
</metadata>
<files>
<file src="MixedRealityToolkit\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta" target="MRTK\" />
<file src="MixedRealityToolkit.Providers\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta" target="MRTK\" />
<file src="MixedRealityToolkit.SDK\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta" target="MRTK\" />
<file src="MixedRealityToolkit.Services\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta" target="MRTK\" />
<file src="MixedRealityToolkit\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit\toc.yml*" target="MRTK\" />
<file src="MixedRealityToolkit.Providers\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Providers\License.txt*;MixedRealityToolkit.Providers\Version.txt*" target="MRTK\" />
<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\" />
<file src="MixedRealityToolkit.Services\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Services\License.txt*;MixedRealityToolkit.Services\Version.txt*" target="MRTK\" />

<file src="MixedRealityToolkit\MixedReality.Toolkit.targets" target="build\Microsoft.MixedReality.Toolkit.Foundation.targets" />

<!-- Assemblies that are built from the MixedRealityToolkit folder -->
<!-- Assemblies and Sources that are built from the MixedRealityToolkit folder -->
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Editor.*" target="Plugins\" />
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Async.*" target="Plugins\" />
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.dll*" target="Plugins\" />
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.pdb*" target="Plugins\" />
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.pdb*" target="Plugins\" />
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Gltf.*" target="Plugins\" />
<!--Source commented as part of 2.1 release due to lack of support for long paths in N4U, and there is support for using source publicly yet.-->
<!--<file src="..\..\Assets\MixedRealityToolkit\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit" />-->

<!-- Assemblies that are built from the MixedRealityToolkit.Providers folder -->
<!-- Assemblies and Sources that are built from the MixedRealityToolkit.Providers folder -->
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Providers.*" target="Plugins\" />
<!--<file src="..\..\Assets\MixedRealityToolkit.Providers\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.Providers" />-->

<!-- Assemblies that are built from the MixedRealityToolkit.SDK folder -->
<!-- Assemblies and Sources that are built from the MixedRealityToolkit.SDK folder -->
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.SDK.*" target="Plugins\" />
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.SDK.Inspectors.*" target="Plugins\" />
<!--<file src="..\..\Assets\MixedRealityToolkit.SDK\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.SDK" />-->

<!-- Assemblies that are built from the MixedRealityToolkit.Services folder -->
<!-- Assemblies and Sources that are built from the MixedRealityToolkit.Services folder -->
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Services.*" target="Plugins\" />
<!--<file src="..\..\Assets\MixedRealityToolkit.Services\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.Services" />-->

<!--
link.xml is copied to the root location, so that it can catch IL2CPP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ public void AutoPan()
/// <summary>
/// Scroll sideways.
/// </summary>
/// <param name="speed"></param>
public void PanHorizontally(float speed)
{
offsetRate_Pan = new Vector2(Time.deltaTime * speed, offsetRate_Pan.y);
Expand All @@ -216,7 +215,6 @@ public void PanHorizontally(float speed)
/// <summary>
/// Scroll from top to bottom
/// </summary>
/// <param name="speed"></param>
public void PanVertically(float speed)
{
offsetRate_Pan = new Vector2(offsetRate_Pan.x, Time.deltaTime * speed);
Expand All @@ -235,7 +233,6 @@ public void DisableHandZoom()
/// <summary>
/// Resets the zoom speed and sets the correct zoom direction when first engaging with "zoom in/out"
/// </summary>
/// <param name="zoomIn"></param>
private void ZoomStart(bool zoomIn)
{
zoomSpeed = 0;
Expand Down Expand Up @@ -538,9 +535,6 @@ private IEnumerator ZoomAndStop(bool zoomIn)
/// Wrapper to ease keeping parameters up-to-date
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="objBase"></param>
/// <param name="objLocal"></param>
/// <returns></returns>
internal bool UpdateValues<T>(ref T objBase, T objLocal)
{
if (!EqualityComparer<T>.Default.Equals(objBase, objLocal))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ public void Initialize(float newAspectRatio)
/// Returns the pan speed.
/// </summary>
/// <param name="uvCursorVal">Normalized cursor position in the hit box. Center is assumed to be at [-0.5, 0.5].</param>
/// <param name="maxSpeed"></param>
/// <param name="minDistThresh"></param>
/// <returns></returns>
public override float ComputePanSpeed(float uvCursorPos, float maxSpeed, float minDistFromCenterForAutoPan)
{
// UV space from [0,1] -> Center: [-0.5, 0.5]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ Material:
m_Name: mat_destination_blue
m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
m_ShaderKeywords: _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT _DISABLE_ALBEDO_MAP
_HOVER_LIGHT _REFLECTIONS _SPECULAR_HIGHLIGHTS
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2000
stringTagMap:
Expand Down Expand Up @@ -45,6 +44,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _IridescentSpectrumMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand All @@ -69,12 +72,17 @@ Material:
- _AlbedoAlphaMode: 0
- _AlbedoAssignedAtRuntime: 0
- _BlendOp: 0
- _BlendedClippingWidth: 1
- _BorderLight: 0
- _BorderLightOpaque: 0
- _BorderLightOpaqueAlpha: 1
- _BorderLightReplacesAlbedo: 0
- _BorderLightUsesHoverColor: 1
- _BorderMinValue: 0.1
- _BorderWidth: 0.1
- _BorderMinValue: 0.05
- _BorderWidth: 0.05
- _BumpScale: 1
- _ClippingBorder: 0
- _ClippingBorderWidth: 0.025
- _ClippingPlane: 0
- _ClippingPlaneBorder: 0
- _ClippingPlaneBorderWidth: 0.025
Expand All @@ -92,26 +100,39 @@ Material:
- _EnableHoverColorOverride: 0
- _EnableLocalSpaceTriplanarMapping: 0
- _EnableNormalMap: 0
- _EnableProximityLightColorOverride: 0
- _EnableTriplanarMapping: 0
- _EnvironmentColorIntensity: 0.5
- _EnvironmentColorThreshold: 1.5
- _EnvironmentColoring: 0
- _FadeBeginDistance: 0.85
- _FadeCompleteDistance: 0.5
- _FadeMinValue: 0
- _FluentLightIntensity: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _HoverLight: 1
- _HoverLight: 0
- _HoverLightOpaque: 0
- _IgnoreZScale: 0
- _InnerGlow: 0
- _InnerGlowPower: 2.68
- _InstancedColor: 0
- _Iridescence: 0
- _IridescenceAngle: -0.78
- _IridescenceIntensity: 0.5
- _IridescenceThreshold: 0.05
- _Metallic: 0
- _Mode: 0
- _NearLightFade: 0
- _NearPlaneFade: 0
- _NormalMapScale: 1
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Reflections: 1
- _ProximityLight: 0
- _ProximityLightSubtractive: 0
- _ProximityLightTwoSided: 0
- _Reflections: 0
- _Refraction: 0
- _RefractiveIndex: 0
- _RenderQueueOverride: -1
Expand All @@ -122,20 +143,28 @@ Material:
- _RoundCorners: 0
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SpecularHighlights: 0
- _SphericalHarmonics: 0
- _SrcBlend: 1
- _Stencil: 0
- _StencilComparison: 0
- _StencilOperation: 0
- _StencilReference: 0
- _TriplanarMappingBlendSharpness: 4
- _UVSec: 0
- _VertexColors: 0
- _VertexExtrusion: 0
- _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
- _ZTest: 4
- _ZWrite: 1
m_Colors:
- _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
- _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
- _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
- _Color: {r: 0.062477753, g: 0.08642863, b: 0.33962262, a: 1}
- _Color: {r: 0.27536488, g: 0.29355088, b: 0.49056602, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
- _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
Expand All @@ -144,4 +173,7 @@ Material:
- _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
- _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
- _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
- _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Material:
m_Name: mat_destination_purple
m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
m_ShaderKeywords: _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT _DISABLE_ALBEDO_MAP
_HOVER_LIGHT _REFLECTIONS _SPECULAR_HIGHLIGHTS
_SPECULAR_HIGHLIGHTS
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -45,6 +45,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _IridescentSpectrumMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand All @@ -69,12 +73,17 @@ Material:
- _AlbedoAlphaMode: 0
- _AlbedoAssignedAtRuntime: 0
- _BlendOp: 0
- _BlendedClippingWidth: 1
- _BorderLight: 0
- _BorderLightOpaque: 0
- _BorderLightOpaqueAlpha: 1
- _BorderLightReplacesAlbedo: 0
- _BorderLightUsesHoverColor: 1
- _BorderMinValue: 0.1
- _BorderWidth: 0.1
- _BumpScale: 1
- _ClippingBorder: 0
- _ClippingBorderWidth: 0.025
- _ClippingPlane: 0
- _ClippingPlaneBorder: 0
- _ClippingPlaneBorderWidth: 0.025
Expand All @@ -92,26 +101,39 @@ Material:
- _EnableHoverColorOverride: 0
- _EnableLocalSpaceTriplanarMapping: 0
- _EnableNormalMap: 0
- _EnableProximityLightColorOverride: 0
- _EnableTriplanarMapping: 0
- _EnvironmentColorIntensity: 0.5
- _EnvironmentColorThreshold: 1.5
- _EnvironmentColoring: 0
- _FadeBeginDistance: 0.85
- _FadeCompleteDistance: 0.5
- _FadeMinValue: 0
- _FluentLightIntensity: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _HoverLight: 1
- _HoverLight: 0
- _HoverLightOpaque: 0
- _IgnoreZScale: 0
- _InnerGlow: 0
- _InnerGlowPower: 4
- _InstancedColor: 0
- _Iridescence: 0
- _IridescenceAngle: -0.78
- _IridescenceIntensity: 0.5
- _IridescenceThreshold: 0.05
- _Metallic: 0
- _Mode: 0
- _NearLightFade: 0
- _NearPlaneFade: 0
- _NormalMapScale: 1
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Reflections: 1
- _ProximityLight: 0
- _ProximityLightSubtractive: 0
- _ProximityLightTwoSided: 0
- _Reflections: 0
- _Refraction: 0
- _RefractiveIndex: 0
- _RenderQueueOverride: -1
Expand All @@ -123,19 +145,27 @@ Material:
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SphericalHarmonics: 0
- _SrcBlend: 1
- _Stencil: 0
- _StencilComparison: 0
- _StencilOperation: 0
- _StencilReference: 0
- _TriplanarMappingBlendSharpness: 4
- _UVSec: 0
- _VertexColors: 0
- _VertexExtrusion: 0
- _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
- _ZTest: 4
- _ZWrite: 1
m_Colors:
- _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
- _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
- _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
- _Color: {r: 0.41509432, g: 0.048949793, b: 0.37441173, a: 1}
- _Color: {r: 0.745283, g: 0.35506406, b: 0.70050377, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
- _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
Expand All @@ -144,4 +174,7 @@ Material:
- _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
- _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
- _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
- _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
Loading