Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mrtk dev master sync #1089

Merged
merged 29 commits into from
Oct 6, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
74e0d93
Input Feature area folder reorganization
Oct 5, 2017
2788032
moved speech input handler
Oct 5, 2017
d4b8e47
Renamed GesturesInputSource to InteractionInputSource
Oct 5, 2017
5968bb8
Renamed ManualHandControl to EditorInputControl.
Oct 5, 2017
381b62b
Moved Xbox Controller classes into their own folder
Oct 5, 2017
4f80915
Merge pull request #1085 from StephenHodgson/MRTK-InputAbstraction
StephenHodgson Oct 5, 2017
3c7b32a
Merge branch 'MRTK-Master' into MRTK-Dev-MasterSync
Oct 5, 2017
aeab7ef
Moved Voice Chat scripts that had dependencies to MicStream dll
Oct 5, 2017
d1ff2cf
a bit more organization of MicSream Scripts in test folder
Oct 5, 2017
5c1972b
Merge pull request #1090 from StephenHodgson/MRTK-InputReorg
StephenHodgson Oct 5, 2017
27c8c63
Merge branch 'MRTK-Master' into MRTK-Dev-MasterSync
Oct 5, 2017
0b28120
Renamed UI feature area to UX in preparation of HUX integration.
Oct 5, 2017
8c5f5a4
Renamed SpatialSound to Audio
Oct 5, 2017
de67f19
updated title
StephenHodgson Oct 5, 2017
6548845
Updated title
StephenHodgson Oct 5, 2017
f76db1b
Updated Readme with folder name changes.
StephenHodgson Oct 5, 2017
248bab2
updated readme.
StephenHodgson Oct 5, 2017
79bc0c5
Revert "Renamed SpatialSound to Audio"
Oct 5, 2017
bc3409e
Revert "updated title"
Oct 5, 2017
8c82e80
reverted audio changes in readme
StephenHodgson Oct 5, 2017
5fa5f73
Merged Test and Examples folders
Oct 5, 2017
1238dce
Added SR mesh back.
Oct 5, 2017
338e0c2
More organization
Oct 5, 2017
2b82588
Moved Scene Launcher assets into Utilities
Oct 5, 2017
f13ddb7
Merge branch 'MRTK-Dev-Master' into MRTK-Dev-MasterSync
Oct 5, 2017
bef3dd2
Merge pull request #1091 from StephenHodgson/MRTK-UXrename
StephenHodgson Oct 5, 2017
70b3936
Merge branch 'MRTK-Master' into MRTK-Dev-MasterSync
Oct 6, 2017
210c748
Merge pull request #1093 from StephenHodgson/MRTK-TestsExamplesMerge
StephenHodgson Oct 6, 2017
20c6a6c
Merge branch 'MRTK-Master' into MRTK-Dev-MasterSync
Oct 6, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 0 additions & 10 deletions Assets/HoloToolkit-Examples/GamePad.meta

This file was deleted.

9 changes: 0 additions & 9 deletions Assets/HoloToolkit-Examples/InteractiveElements.meta

This file was deleted.

9 changes: 5 additions & 4 deletions Assets/HoloToolkit-Examples/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# HoloToolkit-Examples
This folder will host samples/examples that exemplify the HoloToolkit to help solve interesting scenarios.

This folder will host test scenes and assets that verify functionality of HoloToolkit-Unity components and host samples/examples that exemplify the HoloToolkit to help solve interesting scenarios.

The reason these are examples is because they are specific scenarios which may be difficult to make a into a generic prefab.
These examples can eventually be incorporated into the core HoloToolkit.

#### When considering an example:

1. Examples are not like unit tests which exist in the Tests folder of each feature area.
1. Examples are not like unit tests which exist in the UnitTests folder of each feature area. Scenes in this folder may be automated and moved into HoloToolkit-UnitTests when/if such tests are written for them.
2. Examples are ideas which use the HoloToolkit to show developers how they can solve problems on HoloLens using Unity.
3. Examples that are more of an end-end app, do not fit into the HoloToolkit-Examples folder.
4. Examples that are not maintained regularly will be deprecated.
Expand All @@ -15,4 +16,4 @@ These examples can eventually be incorporated into the core HoloToolkit.
1. Create a new folder under HoloToolkit-Examples and give it a name that best describes your project.
2. You can add your example scenes under that folder.
3. Ensure you add a README.md so developers can read about the purpose and steps to run your example code.
4. Do not change the Project Settings for HoloToolkit-Unity with updates specific to your example.
4. Do not change the Project Settings for HoloToolkit-Unity with updates specific to your example.
9 changes: 0 additions & 9 deletions Assets/HoloToolkit-Examples/SavingSpatialMeshes.meta

This file was deleted.

9 changes: 0 additions & 9 deletions Assets/HoloToolkit-Examples/SceneLauncher.meta

This file was deleted.

9 changes: 0 additions & 9 deletions Assets/HoloToolkit-Examples/SceneLauncher/Prefabs.meta

This file was deleted.

9 changes: 0 additions & 9 deletions Assets/HoloToolkit-Examples/SceneLauncher/Scenes.meta

This file was deleted.

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

9 changes: 0 additions & 9 deletions Assets/HoloToolkit-Examples/SpatialMappingComponent.meta

This file was deleted.

Loading