Commit 87184b6
committed
Merge branch 'mrtk_development' into vNEXT-InputProfile
# Conflicts:
# Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityConfigurationProfile.asset
# Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityConfigurationProfile.cs
# Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityBaseConfigurationProfileInspector.cs
# Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityConfigurationProfileInspector.cs
# Assets/MixedRealityToolkit/_Core/Managers/MixedRealityManager.csFile tree
106 files changed
+2445
-233
lines changed- Assets
- MixedRealityToolkit-Examples
- Demos/StandardShader/Models
- StandardAssets
- Models
- Prototyping
- Prefabs
- Prototyping
- MixedRealityToolkit-SDK
- Features
- Input
- UX/Meshes/Cursors
- Utilities
- Solvers
- Profiles
- StandardAssets/Controllers/DebugControllers/Models
- MixedRealityToolkit/_Core
- Attributes
- Definitions
- Devices
- InputSystem
- Utilities
- Devices
- MixedReality
- OpenVR
- UnityInput
- VoiceInput
- Inspectors
- Profiles
- PropertyDrawers
- Interfaces
- Devices
- InputSystem
- Handlers
- Managers
- Utilities
- BuildAndDeploy
- Editor
- USB
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
106 files changed
+2445
-233
lines changedLines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
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