[vNext] Merged mrtk_development into Feature/mrtk interactable. Polished example scene. #3013
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
Genericised ProcessRules
…RealityToolkit-Unity into vNEXT-InputActionRules
* Now if there is a rule, it will return. Before it would only ever return the source action * Enhanced the "Rules" check to skip over any axis not configured (zero length array)
…dgson/MixedRealityToolkit-Unity into vNEXT-InputActionRules_ProcessRulesFix
…Rules_ProcessRulesFix input action rules process rules fix
Issue seems related to the way Unity is exposing the InteractionManager and access to the data within which seems UI / polling bound.
Updated git ignore definitions
…int actions. renamed default profile asset
…t_UWPPerfFix Fixed UWP Lag issue, changed from Event Based updates to polling.
…fileedit Decreased profile selector button width
fixed a case where the MixedRealityPlayspace could return null
…ssignableFrom(type))
…m/SimonDarksideJ/MixedRealityToolkit-Unity into mrtk_development_SerializationFix
…t_SerializationFix Mrtk development serialization fix
Vector3 -> Vector2
Updated MixedRealityToolkit Unit Tests
Make FloorScale's type match floorScale's type
…owFixes fixed Build Window layout in 2018.2+
Add platform-dependent compilation section to CodingGuidelines
Fixed editor texture asset loading
…RealityToolkit-Unity into feature/mrtk_interactable
…p, balloon, cheese.
SimonDarksideJ
approved these changes
Oct 29, 2018
SimonDarksideJ
approved these changes
Oct 29, 2018
StephenHodgson
added
Feature Branch
killerantz
approved these changes
Oct 29, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 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
Merged the latest mrtk_development into mrtk_interactable. Applied changes including name change 'MixedRealityManager' to 'MixedRealityToolkit'. Updated related name changes. (Instance.GetManager to Instance.GetService)
Polished example scenes. Added HolographicButtonToggle example.
Tested with HoloLens and Immersive headset.