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.

Sign up for GitHub

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

Jump to bottom

Mrtk development -> mr dev summit #2646

Merged
merged 61 commits into from
Aug 27, 2018
Merged

Mrtk development -> mr dev summit #2646

merged 61 commits into from
Aug 27, 2018

Conversation

david-c-kline
Copy link

Overview

Changes

  • Fixes: # .

@StephenHodgson
added controller images
3b09b53
@StephenHodgson
renamed flipped images
a51d4fd
@StephenHodgson
Merge branch 'mrtk_development' into vNEXT-ControllerCallouts
ba99720
@StephenHodgson
Added controller popup window
08e88df
@StephenHodgson
added some regions
053a29c
@StephenHodgson
WYSIWYG Input Action Positions.
64fed26
@StephenHodgson
added ability to flip labels and added better mouse position handling…
e75b1b3 
… when dragging
@StephenHodgson
fixed line height
5ff430a
@StephenHodgson
added vive wand editor gui label positions.
921d7d8 
cleaned up controller popup window a bit
@StephenHodgson
a bit of reorg and cleanup
a7ee985
@StephenHodgson
removed unused exception catch.
7911246
@StephenHodgson
Window didn't need to be public
0633f6e
@StephenHodgson
a bit more cleanup
e847470
@StephenHodgson
broke data classes out into their own files
737b2b3
@StephenHodgson
added default controller mappings
a45b77e
@StephenHodgson
Initialize controller's with default mapping when new profile is created
31cfb99
@StephenHodgson
more cleanup.
0295c1e
@StephenHodgson
removed test profile
71520d0
@StephenHodgson
Updated Oculus Remote controller and created black/white textures.
6baf740 
Added Oculus line art Attribution text
@StephenHodgson
Enabled Oculus Remote popup window.
bd0d1d9 
Added missing meta files
@StephenHodgson
updated oculus remote images
68f43d7
@StephenHodgson
removed duplicate source images
7549cde
@StephenHodgson
updated input action label positions for oculus remote controller
805a4ee
@StephenHodgson
Updated Oculus Remote controllers
7a16d0c
@StephenHodgson
added background for text legibility and updated when we create our f…
3544c82 
…lipped label style
@StephenHodgson
Don't reload images every time we focus, and added non pro label back…
2c9cfd4 
…ground color
@StephenHodgson
Merge branch 'mrtk_development' into vNEXT-ControllerCallouts
dc56ee2
@StephenHodgson
removed temp profile
d6a7251
@StephenHodgson
Reset default controller profile. Added input axis to pop up window
ed24d8c
@StephenHodgson
moved controller texture lookup outside of popup window
1000032
StephenHodgson and others added 29 commits August 25, 2018 14:17
@StephenHodgson
set oculus remote input actions
98e55a9
@StephenHodgson
Fixed an issue with resetting controller interactions.
9e1ec08 
Mapped a bit more controlers
@StephenHodgson
mapped the hand gestures and added check if controller texture is null
23f6ca2
@StephenHodgson
Synchronized Input Actions
8a9d65c
@StephenHodgson
removed unused parameter
1d602cb
@StephenHodgson
updated WMR Controller mappings to have the same constraints and type…
2c4e5ae 
…s so synchronization works correctly
@StephenHodgson
a bit of PR review cleanup
e1baaf9
@StephenHodgson
Made the menu a bit prettier with controller buttons
3e95780
@SimonDarksideJ
Cleaned up the UI to make it a little more usable
71fed21 
Outstanding tasks
---
* Replace or create smaller images for Inspector
* Recreate the "Default" asset so the images are ordered correctly
@StephenHodgson
Merge pull request #28 from SimonDarksideJ/vNEXT-ControllerCallouts_U…
ad78490 
…ICleanup

Cleaned up the UI to make it a little more usable
@StephenHodgson
Updated controller profile button layout and added scaled down contro…
2a559ca 
…ller images
@StephenHodgson
Fixed build errors
171132a
@StephenHodgson
sorted the regions a bit
d884ce0
@StephenHodgson
removed duplicate invert
13615e9
@StephenHodgson
Fixed an issue with updating the generic controller types
054c50d
@StephenHodgson
Updated HL grip with Grip Pose Action
7ee4549
@StephenHodgson
Fixed a small issue making a new generic controller
7acf6eb
@StephenHodgson
added back missing invert X toggle
9f63eae
@StephenHodgson
right hand generic OVR Controller was missing action assignments
e9bde57
@StephenHodgson
Fixed assigning generic unity type
bf581e3
@StephenHodgson
fixed an issue when the serialized list doesn't match the instance re…
bbb0f60 
…presentation
@StephenHodgson
cleaned up HoloLens Gesture window so it didn't show unrelated inputs
1ed8df8
@StephenHodgson
removed controller images until licensing is resolved
6d6942a
@StephenHodgson
Merge branch 'mrtk_development' into vNEXT-ControllerCallouts
b42eb37
@StephenHodgson
added fallback controller Image
601245f
@StephenHodgson
fallback to ordered list when no controller image found for popout wi…
f54ce9c 
…ndow
@StephenHodgson
Merge branch 'mrtk_development' into vNEXT-ControllerCallouts
c7342af
@StephenHodgson
removed xbox controller images until official ones are provided by MSFT
126ff3d
Merge pull request #2639 from StephenHodgson/vNEXT-ControllerCallouts
0d9a785 
Controller Input Action Mapping Popout Menus
@david-c-kline david-c-kline merged commit a8d9231 into mrdevsummit_2018_08 Aug 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@david-c-kline @SimonDarksideJ @heatherbarry @StephenHodgson