Commit 0064f50
committed
Merge branch 'vNEXT-InputProfile' into vNEXT-TouchScreenInputSourceUpdate
# Conflicts:
# Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityInputSystemProfile.asset
# Assets/MixedRealityToolkit/_Core/Definitions/InputSystem/MixedRealityInputSystemProfile.cs
# Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityBaseConfigurationProfileInspector.cs
# Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityGesturesProfileInspector.cs
# Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityInputSystemProfileInspector.csFile tree
49 files changed
+1285
-41
lines changed- Assets
- MixedRealityToolkit-Examples
- Demos/StandardShader/Models
- StandardAssets
- Models
- Prototyping
- Prefabs
- Prototyping
- MixedRealityToolkit-SDK
- Features
- Input
- UX/Meshes/Cursors
- StandardAssets/Controllers/DebugControllers/Models
- MixedRealityToolkit/_Core
- Definitions
- Utilities
- Inspectors/Profiles
- 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.
49 files changed
+1285
-41
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