[vNext][UX] Feature/mrtk interactable dev merge #3380
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…r name and do not start with a number.
…table_demo2938AndInspectorUpdates [vNext] Feature/mrtk interactable demo2938 and inspector updates
…RealityToolkit-Unity into feature/mrtk_interactable
…p, balloon, cheese.
…actable_merge_development [vNext] Merged mrtk_development into Feature/mrtk interactable. Polished example scene.
…ctable_layout3D [vNext][UX] Feature/mrtk interactable layout3D and InspectorFields
…t. Fixed SeeIt-SayIt functionality, General bug fixes and filled in missing themes and receivers. Expanded custom receiver example
…ode back into Interactables and the tile grid into collections. There is other stuff coming that is better.
…. Fixed a null reference bug from testing in the Editor, and added a check for voice commands and toggles setting the dimensions value.
…hub.com/killerantz/HoloToolkit-Unity into feature/mrtk_interactable_isGlobalFixes
…ctable_isGlobalFixes Fixed issues with double click events and see-it/say-it functionality
…rtk_interactable # Conflicts: # Assets/MixedRealityToolkit/_Core/Resources/Icons/mic_icon.png # Assets/MixedRealityToolkit/_Core/Resources/Icons/script_icon.png # Assets/MixedRealityToolkit/_Core/Resources/Icons/settings_icon.png # Assets/MixedRealityToolkit/_Core/Resources/Icons/shapes_icon.png # Assets/MixedRealityToolkit/_Core/Resources/Icons/spatial_icon.png # Assets/MixedRealityToolkit/_Core/Resources/Icons/spatial_understanding_icon.png # Assets/MixedRealityToolkit/_Core/Resources/Icons/toolkit_icon.png # Assets/MixedRealityToolkit/_Core/Resources/Icons/ux_icon.png # ProjectSettings/ProjectVersion.txt
…-merged-and-fixed Merge from latest mrtk_development into mrtk_interactable + fixes
…n the unselected state.
…trols sense it does not animate from activated to non activated. Finished a feature I started implimenting a while ago to remove the easing controls when a theme property does not require animation, like strings and audio clips. We could add themes later to fade audio or animate strings.
…oxFix Updated radial and checkBox themes
…RealityToolkit-Unity into feature/mrtk_interactable
…actable_merge_mrtk_dev Updated feature/mrtk_interactable branch
…table Update feature/mrtk_interactable with mrtk_development
cre8ivepark
changed the title
Railboy
approved these changes
Jan 31, 2019
cre8ivepark
approved these changes
Feb 1, 2019
|
Tested on the device. Works well! |
26 tasks
24 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
All the interactable work is ready to move into development.
Changes