Commit 08c6f36

Stephen Hodgson

authored and

Stephen Hodgson

committed

Merge branch 'master' into MSFT_Holotoolkit-master

2 parents 7943ffd + 41407ab commit 08c6f36Copy full SHA for 08c6f36

9 files changed

+900

-97

lines changed

Assets
- HoloToolkit-Examples
  - GameControllerManipulator.meta
  - GameControllerManipulator
    - GameControllerManipulatorTest.unity.meta
    - GameControllerManipulatorTest.unity
- HoloToolkit
  - Input/Scripts
    - GameControllerManipulator.cs.meta
    - GameControllerManipulator.cs
  - SpatialMapping/Scripts
    - SpatialMappingObserver.cs
  - SpatialUnderstanding/Scripts
    - SpatialUnderstandingSourceMesh.cs
ProjectSettings
- GraphicsSettings.asset
- InputManager.asset

9 files changed

+900

-97

lines changed

`‎Assets/HoloToolkit-Examples/GameControllerManipulator.meta‎`

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

Comments

(0)