James B. Pollack
402bad3417
Merge remote-tracking branch 'upstream/master' into demo_movement
2016-08-18 13:43:54 -07:00
James B. Pollack
1eaac8605f
invert the structure and make it work with oculus
2016-08-18 10:43:37 -07:00
James B. Pollack
a7ba4ce1f9
jumping
2016-08-17 15:11:07 -07:00
James B. Pollack
8bc6ca2fa1
demo changes
2016-08-17 15:08:43 -07:00
James B. Pollack
5a2c7cf58e
cleanup
2016-08-16 09:58:18 -07:00
James B. Pollack
f143c62e9c
whoops
2016-08-15 11:53:32 -07:00
James B. Pollack
a078b20f9d
make it work with click
2016-08-15 10:24:24 -07:00
James B. Pollack
493adca04f
map oculus grip to trigger
2016-08-15 10:02:53 -07:00
Brad Hefta-Gaub
8abbe27c07
Merge pull request #8387 from SamGondelman/mappingFixes
...
Fix Standard.A/B/X/Y primary thumb JSON mappings
2016-08-09 16:43:45 -07:00
SamGondelman
a5f3089fda
fix ABXY mapping for touch
2016-08-08 13:14:14 -07:00
Seth Alves
84ce29eb90
Merge branch 'master' of github.com:highfidelity/hifi into fsm-arrows-dont-walk
2016-08-05 10:44:46 -07:00
Chris Collins
2473bbf1db
Merge pull request #8313 from imgntn/tweak_lazers
...
Tweak Teleport + Hand Lasers
2016-08-03 16:40:28 -07:00
Seth Alves
40a5e4abc8
in full-screen mirror camera mode, arrow keys move camera but don't make the avatar walk
2016-08-03 13:54:25 -07:00
SamGondelman
458e43fadc
added dead zones to hydras, style fixes
2016-08-03 10:18:57 -07:00
James B. Pollack
88ebeaa4cb
start no movement mode. using actual keys since avatar speed doesnt work with gtting stuck
2016-08-02 18:46:47 -07:00
SamGondelman
1ce7623f41
added deadzones to oculus touch movements
2016-08-02 18:19:58 -07:00
James B. Pollack
7fae7e9c77
cleanup
2016-08-02 12:26:37 -07:00
James B. Pollack
a7b8f2c9df
updates
2016-08-02 12:25:24 -07:00
Brad Davis
8d5b60a266
Simulate LTClick/RTClick for Oculus Touch and Hydra controllers
2016-07-14 12:30:17 -07:00
Brad Davis
cdffb453c6
Trigger 'nav select' on the new trigger click signal, not any trigger value
2016-07-14 12:07:38 -07:00
Brad Davis
091e798267
Make hand pointer lasers 'click' on fully pressing and clicking the vive controller
2016-07-14 10:30:35 -07:00
James B. Pollack
27f70e9d52
finish merge
2016-07-11 15:13:25 -07:00
James B. Pollack
0c60d87d3b
fix some touch mappings
2016-07-01 10:32:37 -07:00
Triplelexx
97e90ed798
TouchscreenDevice DPI scaling now handled via JSON mapping
...
do the arbitrary scaling in the mapping file
2016-06-29 03:45:54 +01:00
Triplelexx
efdee523fb
coding standard fix and renaming
2016-06-28 17:57:38 +01:00
Triplelexx
19b6a04175
indentation causing some issue
...
is this resolved? Hard to tell.
2016-06-27 23:33:12 +01:00
Triplelexx
ab52fc5b3c
json indentation fix
2016-06-27 21:42:32 +01:00
Triplelexx
fd4d9761ce
merge master and resolve conflicts
...
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
2016-06-24 03:34:39 +01:00
Bradley Austin Davis
bc838ac0b4
Fix vive json
2016-06-15 11:41:28 -07:00
Bradley Austin Davis
0b0977f362
Support keyboard suppresion, control suppresion while in keyboard mode
2016-06-15 10:48:48 -07:00
Brad Davis
472a3540d7
Merge remote-tracking branch 'upstream/master' into vive-ui
...
Conflicts:
scripts/system/controllers/handControllerGrab.js
2016-06-10 10:43:09 -07:00
Brad Hefta-Gaub
fc5214c938
Merge pull request #8033 from SamGondelman/xboxFix
...
Game pads work after falling asleep and being reactivated
2016-06-08 16:27:26 -07:00
Brad Hefta-Gaub
69ae33ad9a
Merge pull request #7997 from SamGondelman/touchFixes
...
Corrected Oculus Touch coordinate system so that hands track properly
2016-06-08 15:39:17 -07:00
Brad Davis
ca6e86e767
Merge remote-tracking branch 'upstream/master' into vive-ui
...
Conflicts:
interface/resources/qml/hifi/dialogs/RunningScripts.qml
2016-06-07 21:51:47 -07:00
SamGondelman
2c1d20bd1a
removed _deviceCounts, cache joystick available inputs, added deadzone to gamepad thumbsticks
2016-06-07 17:12:24 -07:00
SamGondelman
509f889c0d
fixed constant turn of 22.5 degrees
2016-06-06 18:40:12 -07:00
SamGondelman
2367cb1995
fixing input mapping for vive/touch grip button/trigger, script needs fixing
2016-06-03 15:07:21 -07:00
SamGondelman
8b76af531b
made touch hand orientation more comfortable, fixed all the touch key mappings, exposed capacitive touch keys for use later
2016-06-02 16:52:17 -07:00
howard-stearns
c2858f847b
Partition vive trackpad by center, x, and y (not just center v outer).
2016-05-31 16:57:23 -07:00
howard-stearns
a3f1ece978
Do button mapping in C++ and simplify vive.json accordingly. Vive and
...
Hydra now use PrimaryThumb and SecondaryThumb. Fix warnings for Neuron.
2016-05-24 16:10:12 -07:00
howard-stearns
fdcd667d3c
Fix hand controller pointer after input changes.
2016-05-23 13:33:42 -07:00
Brad Davis
07562f72af
Doing a pass over the input plugins and controller code
2016-05-20 14:50:23 -07:00
Brad Davis
ba357721bf
Merge pull request #7864 from hyperlogic/tony/vive-controller-improvements
...
Fix for vive controllers sometimes not working
2016-05-11 14:32:33 -07:00
Anthony J. Thibault
c91455a291
Added mapping from Vive LSTouch and RSTouch to Standard.
2016-05-11 10:36:55 -07:00
Anthony J. Thibault
09a4e0eaa8
Fix for vive controllers sometimes not working
...
* Fixed bug with input devices that where added, removed then re-added.
The default mappings were being ignored on the second add.
* Fixed potential crash when hardware inputPlugin device poses were polled from the JavaScript thread
by taking the UserInputManager lock during pluginUpdate.
* Renamed Controller.Hardware.Vive.LB & RB to LeftGrip and RightGrip, to better match Oculus touch.
* Updated resource/controller/vive.json to reflect this new mapping.
* Exposed touch pad capacitive touch events to JavaScript as
Controller.Hardware.Vive.LSTouch and RSTouch.
* Added viveTouchpadTest.js script to test LSTouch and RSTouch events.
2016-05-10 19:32:08 -07:00
howard-stearns
d3c6662198
Take the deadband down a notch, following feedback from P.
2016-05-03 16:35:20 -07:00
Howard Stearns
773770a7fc
All but origin-correction.
2016-05-03 07:01:23 -07:00
Brad Hefta-Gaub
5287c174b4
Merge pull request #7605 from jherico/route_log_errors
...
Fixing logging errors on initial load of controller routes
2016-04-07 17:13:13 -07:00
Brad Davis
2f28c64edb
Fixing menu navigation in oculus remote
2016-04-07 13:21:00 -07:00
Brad Davis
a58a627fdf
Support oculus remote input
2016-04-07 13:20:59 -07:00
