Commit graph

174 commits

Author SHA1 Message Date
Anthony J. Thibault
dff49cafaa Embiggen the stick deadspots for oculus touch controllers
This effectively splits the controller into directional zones.
This should make driving/flying navigation more predictable and less prone
to drifting in unintentional directions, which could induce nausea.
2017-11-28 17:11:44 -08:00
Cain Kilgore
dbe7cc5d1a 21540 - Make Rotation using Vive Controller Work 2017-09-18 23:38:38 +01:00
Zach Fox
33fa8c4f86 Fix bugs and also change to single setting 2017-08-09 11:44:09 -07:00
anshuman64
83e50f894a Merge pull request #11106 from seefo/tracked-objects
Added Vive pucks as an input channel and added new puck-attach script
2017-08-03 17:03:45 -07:00
seefo
106b0ad8bb Added Vive pucks as an input channel 2017-08-02 13:08:43 -07:00
David Kelly
b371c875c4 undo tab mapping to bring up tablet, for now 2017-07-31 14:46:26 -07:00
David Kelly
bd7c4b3b26 Merge remote-tracking branch 'upstream/master' into context-overlays 2017-07-31 13:14:53 -07:00
Chris Collins
853101fcbc Merge pull request #10928 from 1P-Cusack/21362
Add point and thumb up gestures to the Vive.
2017-07-26 22:07:14 -07:00
1P-Cusack
9e25c3b7d8 Renaming 'not' route to 'logicalNot'.
Build was failing on non-windows platforms because 'not' is a reserved
word in C++ (which Visual Studio happily ignores).
2017-07-25 14:47:34 -04:00
Zach Fox
40038ce54b Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-25 09:33:07 -07:00
vladest
615a3c52e4 Ooops.. 2017-07-21 21:26:33 +02:00
Zach Fox
a800f6c05a No magic numbers; Move (i) based on laser hand; Tablet to Tab key 2017-07-21 11:48:19 -07:00
vladest
33a8ab2d58 Adjusted according discussion in PR 2017-07-21 18:18:23 +02:00
1P-Cusack
7319998df9 Move ThumbUp gesture detection into json map file. 2017-07-17 10:58:30 -04:00
1P-Cusack
2cd10fd459 Move 'index point' logic into json config file. 2017-07-12 11:08:50 -04:00
1P-Cusack
f5ccf508c9 Fixing braces dropped in merge conflict edit. 2017-07-10 14:11:04 -04:00
1st Playable
2cafefaff8 Merge branch 'master' into 21362 2017-07-10 12:05:36 -04:00
1P-Cusack
1d333a24c1 Add point and thumb up gestures to the vive.
When the thumb is off the touchpad, trigger the 'thumb up' animation.
When on the thumbpad an 75% forward, trigger the 'index point animation'.

WL 21362
2017-07-10 11:51:42 -04:00
Dante Ruiz
6f30cb1825 Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop 2017-07-01 00:48:49 +01:00
Dante Ruiz
577969481d head puck working 2017-06-30 23:43:12 +01:00
David Rowe
3bdf267900 Implement fingers control 2017-06-22 23:32:06 +12:00
David Rowe
5b6a5525b6 Initial control of avatar hand positions 2017-06-18 13:03:54 +12:00
Seth Alves
48ee546545 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-01 16:15:03 -07:00
Seth Alves
7a47250aa7 oops missed a comma 2017-05-31 10:21:10 -07:00
Dante Ruiz
b3401d9762 making some final changes 2017-05-30 23:55:45 +01:00
Seth Alves
ffe844a8e7 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-05-30 13:42:20 -07:00
Seth Alves
af5ba3a90a ask display-plugins if they are head-controllers 2017-05-25 15:14:10 -07:00
Dante Ruiz
8538c700b5 saving head work 2017-05-25 21:41:41 +01:00
Dante Ruiz
8cb9bfcc81 fixed merge conflict 2017-05-24 19:35:41 +01:00
Dante Ruiz
ac3c9655ec added arms 2017-05-24 01:28:08 +01:00
Dante Ruiz
78f6d2e850 fix low velocity filter 2017-05-18 21:22:42 +01:00
Dante Ruiz
90ddc16d09 add calibration data to filters 2017-05-18 17:07:28 +01:00
Dante Ruiz
25b1bb0633 adjusted values 2017-05-16 23:34:46 +01:00
Dante Ruiz
bb4c0d972d head routed through the vive input plugin 2017-05-10 00:10:26 +01:00
Dante Ruiz
31f6038e45 limbs tracking pucks 2017-05-03 20:08:42 +01:00
Seth Alves
0cd2863df4 start on routing HMD position and rotation through controller interface
(cherry picked from commit bca5241bae7674ff7e41c037d84bb78e5152046a)
2017-04-25 11:01:52 -07:00
ZappoMan
53c439ffba add foot IK targets as actions 2017-03-30 19:11:16 -07:00
Stephen Birarda
1fe02477b0 fix LX behaviour in snap/advanced/basic 2017-03-14 14:21:21 -07:00
Stephen Birarda
0926b2df2a add LX snap turn to standard mapping 2017-03-13 15:14:20 -07:00
mike
6cba2049dd Made jumping easier on the Vive 2017-02-07 19:46:16 -08:00
Anthony J. Thibault
0ab956a0c1 A and B buttons on oculus touch no longer trigger UI Nav events 2017-01-23 17:08:25 -08:00
Anthony J. Thibault
584a9a3c98 UI navigation work with game pads
The tablet UI can be long lived, unlike the previous VRMenu.
So instead of using a dynamic mapping that was only enabled when the VRMenu was shown, standard_navigation.json.
standard_navigation is always active.  Also, standard_navigation.json has been changed.
Left and Right click and stick events never become UINav events. Only Dpad A, B, X, Y, LB and RB are mapped to UINav events.
2017-01-23 15:22:49 -08:00
Brad Hefta-Gaub
a2ba03284e Merge pull request #9186 from ZappoMan/kinectPlugin
Kinect Plugin
2016-12-13 15:29:41 -08:00
Atlante45
5def039bd4 Swap start/back xbox controller mapping to conform to Oculus standard 2016-12-09 16:41:42 -08:00
Brad Hefta-Gaub
4959a88581 first cut at kinect input plugin 2016-12-08 22:13:56 -08:00
Seth Alves
a04b486dfc Merge pull request #9123 from druiz17/touchBug
fixed context menu showing up in the correct location with oculus touch
2016-12-06 10:34:00 -08:00
Bradley Austin Davis
f112d345e8 Add dead zone to yaw controls 2016-12-06 09:38:30 -08:00
Dante Ruiz
2d28ae1ffe fixed context menu showing up in the correct location 2016-11-29 18:15:40 +00:00
Dante Ruiz
e22c36b4b7 fixed menu pop up delay 2016-11-07 17:16:24 +00:00
Chris Collins
6698b1617b Merge pull request #8945 from thoys/patch-8
Fix Oculus hand controllers to only work in HMD
2016-10-31 11:02:40 -07:00