Граф коммитов

118 Коммитов

Автор SHA1 Сообщение Дата
Dong Yoon Park 2dfcf717eb Assigned BrushController to the right controller model in the completed scene. 2017-11-03 17:18:56 -07:00
Kurtis 5d05e2b706
Merge pull request #4 from keveleigh/ToolkitUpdate
MixedRealityToolkit update
2017-11-03 16:24:49 -07:00
Kurtis Eveleigh 0da470700b Adding some null checks & updating prefabs and scenes 2017-11-03 16:23:04 -07:00
Kurtis Eveleigh f0686c44d0 Updating existing scripts to work with the new Toolkit drop 2017-11-03 15:38:29 -07:00
Kurtis Eveleigh 24e1074d21 Moving Scenes folder to the root 2017-11-03 15:37:59 -07:00
Kurtis Eveleigh a697bea402 Removing temp controller prefabs 2017-11-03 15:37:21 -07:00
Kurtis Eveleigh 41555922af Toolkit motion controller script update re-additions 2017-11-03 15:22:57 -07:00
Kurtis Eveleigh 483b7495f0 Updating project version 2017-11-02 15:36:18 -07:00
Kurtis Eveleigh b5fa2cf44e Another Toolkit update
As of
Microsoft/MixedRealityToolkit-Unity@7627ef6b47
2017-11-02 15:34:22 -07:00
Kurtis Eveleigh 377a6ee88b New drop of the MixedRealityToolkit
Up-to-date as of
Microsoft/MixedRealityToolkit-Unity@445c816359
2017-11-01 16:57:38 -07:00
Lars Simkins 851f2e36fb Fixed missing Select element 2017-10-27 11:26:07 -07:00
Lars Simkins 24535afae6 Merge pull request #3 from Microsoft/ScriptCleanup
Script cleanup
2017-10-24 09:09:08 -07:00
Lars Simkins f5f7443dd0 Merge pull request #2 from Microsoft/master
Merging Kurtis' script cleanup with master.
2017-10-24 09:05:53 -07:00
Lars Simkins 817f69fbe0 Updated prefab names 2017-10-18 12:19:24 -07:00
Lars Simkins 4ff5be71d5 Removed Cayenne controllers, renamed Oasis assets to MotionController 2017-10-18 11:56:21 -07:00
Lars Simkins 79aa98cf34 Updated color mask shader for clarity 2017-10-18 11:51:48 -07:00
Lars Simkins af2c3ee17a Merge branch 'master' of https://github.com/Microsoft/MixedReality213 2017-10-18 11:31:50 -07:00
Lars Simkins fe68a7c016 Added default GLTF Material to MotionControllerVisualizer in scenes 2017-10-18 11:31:45 -07:00
Lars Simkins 44dbb777de Deleting alternate controller models for simplicity 2017-10-18 11:06:09 -07:00
Kurtis Eveleigh b54cc9e288 Fixing platform controller loading 2017-10-17 16:39:32 -07:00
Kurtis Eveleigh de11b040e0 General code formatting to align with MRTK formatting. 2017-10-17 16:07:34 -07:00
Kurtis 64f1a24ea9 Removing packages folders 2017-10-17 11:28:49 -07:00
Kurtis 099a9f33ef Updating README and CONTRIBUTING 2017-10-16 12:24:01 -07:00
Kurtis 574cbac397 Adding/updating code headers 2017-10-16 11:47:33 -07:00
Lars Simkins 3931a03078 Fixed brush color bug 2017-10-16 09:55:10 -07:00
Lars Simkins 4f8fc8c888 Removed references to unnamed nodes 2017-10-13 12:27:50 -07:00
Lars Simkins c134f3354e Renamed Oasis controller textures 2017-10-13 11:35:01 -07:00
Lars Simkins aeba75c027 Added Cayenne controller, renamed Oasis controllers 2017-10-13 11:31:20 -07:00
Lars Simkins 6c61e450b0 Added BrushController 2017-10-12 14:42:16 -07:00
Dong Yoon Park b86ace98e3 Updating comments on brush tools 2017-10-10 14:29:44 -07:00
Lars Simkins 705e70c01c Touchpad Press is now set 2017-10-10 11:50:48 -07:00
Lars Simkins c691ae7a36 Removed audio source reference in ObjectSpawner 2017-10-10 11:38:48 -07:00
Lars Simkins 4374e18588 Added left/right input detection to touchpad 2017-10-10 11:27:49 -07:00
Lars Simkins fd57668cd2 Added ColorDab radial menu (ignore for now) 2017-10-09 15:24:01 -07:00
Lars Simkins 429548564e Deleted unnecessary assets, reorganized project for tutorial
Followed conventions set by MixedReality250 project.
Created directory 'AppPrefabs.'
Below that is 'Support' with all scripts, materials, textures etc.
Tuutorial scene is in 'AppPrefabs/Support/Scenes/MixedReality213.unity'
2017-10-09 11:09:18 -07:00
REDMOND\dongpark a00d99ff31 Updating the scene environment. 2017-10-06 16:54:27 -07:00
Lars Simkins e6d2f6b9d7 Added pointer interaction 2017-10-06 12:51:47 -07:00
Lars Simkins 8baca92c5e Removed unnecessary materials, updated environment 2017-10-06 10:44:31 -07:00
Lars Simkins 9454695305 Fixed links in tutorial scene 2017-10-06 10:41:03 -07:00
Lars Simkins 68f949f9b0 MotionControllerVisualizer changes
Now stores controllers by handedness
Now enabled / disables controllers instead of destroying them
Runtime / Editor behavior should work now
2017-10-06 10:36:16 -07:00
Kurtis 75eb18662f Re-adding Controller script edits 2017-10-05 18:52:20 -07:00
Kurtis 9401a64abf Updating Toolkit
Current as of
7d6390d2a2
2017-10-05 18:05:15 -07:00
Lars Simkins fe30a2811a Added consistent Start IEnumerators 2017-10-04 15:21:13 -07:00
Lars Simkins 0962cbd7f1 Fixed color picker position offset, added gizmo to line renderer 2017-10-04 14:17:00 -07:00
Lars Simkins 69564445be Fixed texture problem, removed temp texture 2017-10-04 11:27:36 -07:00
Lars Simkins cde8007992 Updated brushes and brush selection menu 2017-10-04 09:46:22 -07:00
Lars Simkins ded718b6ae Added eraser jitter 2017-10-03 12:39:21 -07:00
Dong Yoon Park e0458b94a2 Merge branch 'master' of https://github.com/Microsoft/MixedReality213 2017-10-02 16:41:18 -07:00
Dong Yoon Park 507ded2a5c Update to fix runtime build errors. 2017-10-02 16:41:04 -07:00
REDMOND\dongpark e8978c9489 Updating skybox 2017-10-02 15:56:43 -07:00