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.

Sign up for GitHub

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

Jump to bottom

vNEXT - UX Lines feature port #2513

Merged
merged 39 commits into from
Jul 31, 2018
Merged

vNEXT - UX Lines feature port #2513

Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
d20bdb8
first pass at pointer viz
StephenHodgson Jun 15, 2018
fb68cf5
Merge branch 'mrtk_development' into MRTK-vNEXT-PointerViz
StephenHodgson Jul 25, 2018
ec41057
Added distorters to Utitlities.Physics
StephenHodgson Jul 25, 2018
e253e83
updated icons and a bit of documentation
StephenHodgson Jul 25, 2018
a9c8822
Lines and a bit of cleanup... probably more to do...
StephenHodgson Jul 25, 2018
0263e61
moved enum types to definitions.
StephenHodgson Jul 26, 2018
71aa4d8
A bit more reorg and final property passes
StephenHodgson Jul 26, 2018
c5dea6c
Merge branch 'mrtk_development' into vNEXT-PointerRayVisualization
StephenHodgson Jul 26, 2018
64513ae
cleaned up line follower a bit more and added icons
StephenHodgson Jul 26, 2018
1e86856
More cleaning up and a bit of a start on the editor scripts for the l…
StephenHodgson Jul 27, 2018
8c3462a
Merge branch 'mrtk_development' into vNEXT-PointerRayVisualization
StephenHodgson Jul 27, 2018
1528051
reverted component extension changes
StephenHodgson Jul 27, 2018
db4bb92
Merge branch 'MRTK-vNEXT-PointerViz' into vNEXT-PointerRayVisualization
StephenHodgson Jul 27, 2018
bf8e7c3
required line data provider
StephenHodgson Jul 27, 2018
657124f
Merge branch 'mrtk_development' into vNEXT-PointerRayVisualization
StephenHodgson Jul 27, 2018
94d20d9
More work on line stuff.
StephenHodgson Jul 28, 2018
8112d70
added session state to line inspectors
StephenHodgson Jul 28, 2018
ba440c4
Merge branch 'mrtk_development' into vNEXT-PointerRayVisualization
StephenHodgson Jul 28, 2018
dee199b
Example scene and a bunch more work on feature pairity
StephenHodgson Jul 29, 2018
afe8a64
updated example scene
StephenHodgson Jul 29, 2018
0f0fcac
added the last few inspectors and a bit of cleanup.
StephenHodgson Jul 29, 2018
0673c24
updated enum initialization, icons, and documentation.
StephenHodgson Jul 29, 2018
ed0450a
some documentation
StephenHodgson Jul 29, 2018
bb84e0b
Updated some value checks
StephenHodgson Jul 29, 2018
3197bef
more documentation and misc changes
StephenHodgson Jul 29, 2018
9b48520
missing inherit doc tags
StephenHodgson Jul 29, 2018
6302a28
Merge branch 'mrtk_development' into vNEXT-PointerRayVisualization
StephenHodgson Jul 29, 2018
a9a0176
updated scene name
StephenHodgson Jul 29, 2018
da78a2a
made vector3 range attribute class sealed.
StephenHodgson Jul 30, 2018
be5e04a
updated serialization of base line data provider inspector
StephenHodgson Jul 30, 2018
1609c75
made sure the loop is overridden for ellipse
StephenHodgson Jul 30, 2018
b415e86
Removed TMP assets
StephenHodgson Jul 30, 2018
39d655e
ignored TMP default asset path.
StephenHodgson Jul 30, 2018
1f9f127
sorted config profiles in context menu
StephenHodgson Jul 30, 2018
c26aa47
added range to ellipse resolution
StephenHodgson Jul 30, 2018
9849f30
CRs
StephenHodgson Jul 30, 2018
845dc82
moved materials to standard assets folder
StephenHodgson Jul 30, 2018
3619f4a
a bit more cleanup
StephenHodgson Jul 31, 2018
d267ef2
Scene updates. Added default cursor, and updated serialization
StephenHodgson Jul 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,5 @@ Assets/ThirdParty/
Assets/ThirdParty.meta

artifacts/
Assets/TextMesh Pro.meta
Assets/TextMesh Pro/
2 changes: 1 addition & 1 deletion ...ityToolkit-SDK/Features/UX/Materials.meta → ...ixedRealityToolkit-Examples/Demos/UX.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...it-SDK/Features/UX/Materials/Cursors.meta → ...alityToolkit-Examples/Demos/UX/Lines.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/MixedRealityToolkit-Examples/Demos/UX/Lines/Scenes.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading