Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 21:02:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
58623 commits 71 branches 56 tags 1.2 GiB
Commit graph

172 commits

Author SHA1 Message Date
Brad Hefta-Gaub
c50cd865e5 add RTClick and LTClick support to gamepad 2016-10-18 09:50:35 -07:00
Chris Collins
b41d72a9fd Merge pull request #8777 from hyperlogic/bug-fix/oculus-touch-fixes 
Bug fixes in oculus_touch default mapping
 2016-10-13 10:57:27 -07:00
Anthony J. Thibault
aa52963e5d Made the Grip buttons less sensitive to inadvertent squeezes. 2016-10-12 12:59:43 -07:00
Brad Hefta-Gaub
f532affdf3 hardwire xbox to match help 2016-10-11 14:39:45 -07:00
Anthony J. Thibault
ace8639f5b Bug fixes in oculus_touch default mapping 
* Made sticks less sensitive. Raised deadSpot min from 0.05 to 0.3.
* Fixed problem were grip and trigger was mapped to Standard triggers. This was causing all sorts of problems
  with the handControllerGrab script.  Including double lasers and a stuck right hand laser.
* mapped grip to standard grip. So now you can use the grip button to drop equipped objects.
* increased deadZone on grip to make inadvertent drops less likely to happen.
 2016-10-10 18:42:06 -07:00
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
Brad Davis
85019b2b5e Fixing logging errors on initial load of controller routes 2016-04-07 10:41:54 -07:00
Triplelexx
11af0a421b Merge branch 'master' into 20769 2016-04-03 22:57:55 +01:00
Brad Davis
f651adbd24 Correcting vive button naming 2016-03-08 15:12:54 -08:00
Brad Davis
1312901f06 Removing thumb mappings, using start/back for camera and menu 2016-03-08 15:09:45 -08:00
Brad Davis
ac1ab4b5b7 Map the primary thumbs to menu/camera as well as the secondary thumb 2016-03-08 15:09:44 -08:00
Triplelexx
087e2e7f66 revise touchscreen camera control manipulation 
Touchscreen camera control is now via a touchscreen device. Input must
be enabled with the menu option. Currently supports dragging and
gesturing to control avatar camera. Gesturing is handled by integration
of the Qt implementation.
 2016-02-19 13:47:28 +00:00
Howard Stearns
6d70584b5a Change name and use only when in HMD. 2016-02-16 18:09:56 -08:00
howard-stearns
4150d318d3 "Leave it on by default" (and change name of route variable to SnapTurn). 2016-02-15 13:39:53 -08:00
Brad Davis
900a0f7f08 Trigger selection is too twitchy 2016-01-05 09:16:44 -08:00
Brad Davis
000130617e Allow input devices to break up their mappings into multiple files 2015-12-30 22:28:10 -08:00
Brad Davis
4c26627622 Add navigation actions and wire them up in the standard controller 2015-12-30 17:14:40 -08:00
Anthony J. Thibault
dcde640acd Stub Perception Neuron input plugin 2015-12-21 10:06:36 -08:00
Brad Hefta-Gaub
3dcdfbc0f1 first cut at simulating mouse/reticle behavior with input contorllers 2015-12-15 13:59:22 -08:00
Brad Hefta-Gaub
c0bd54e8a2 change hydra secondary thumb to 0 button 2015-12-03 09:06:18 -08:00
Brad Hefta-Gaub
b122586ea5 remove camera cycle and context menu from standard mapping 2015-12-03 08:08:04 -08:00
samcake
b1d5a36dc6 removing useless differences 2015-11-06 16:40:46 -08:00
samcake
bc852d8eab removing useless differences 2015-11-06 16:39:23 -08:00
samcake
5fb2c3ccd1 resolve merge conflict 2015-11-06 16:27:47 -08:00
AlessandroSigna
6d3a79af83 changed the behaviour of Standard.LY input 2015-11-06 12:46:08 -08:00
samcake
bc5e0b7b96 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-05 09:57:11 -08:00
samcake
00797b4dea Merge pull request #6314 from jherico/homer 
Fixing step yaw to move by consistent amounts, be 'tappable'
 2015-11-04 23:33:45 -08:00
Brad Davis
86b852231e Merge pull request #6286 from EdgarPironti/master 
Spacemouse migration
 2015-11-04 19:15:35 -08:00
samcake
f4c610a0f4 Tuning the standard mapping for tbringin vertical axis 2015-11-04 18:21:04 -08:00
Brad Davis
20d1035821 Fixing step yaw to move by consistent amounts, be 'tappable' 2015-11-04 15:54:50 -08:00
samcake
d4259931b2 Setting the step yaw to 22.5 degrees 2015-11-04 10:57:39 -08:00
samcake
ce5e89ce66 removing the pulsing mechanism in MyAvatar and making a new stadnard.json mapping file 2015-11-04 10:53:53 -08:00
EdgarPironti
ade0862948 Spacemouse fixes 2015-11-04 00:49:40 -08:00
EdgarPironti
1ab683643c Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-04 00:36:38 -08:00
EdgarPironti
7adf38f781 Spacemouse migration 2015-11-03 18:22:55 -08:00
samcake
4d62c532f5 Removing dead config files 2015-11-03 15:35:13 -08:00
EdgarPironti
d99838de9c Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-03 12:25:19 -08:00
samcake
78e3f8ebbc Merge pull request #6281 from AlessandroSigna/master 
Vive - fix input drifting
 2015-11-03 10:19:59 -08:00
EdgarPironti
5d695da630 Do not merge - Spacemouse 2015-11-02 23:31:10 -08:00
AlessandroSigna
b77945d430 Vive - fix input drifting 
Conflicts:
	libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
 2015-11-02 16:06:17 -08:00
Brad Hefta-Gaub
d359aa3b65 more tweaks 2015-11-02 13:41:16 -08:00
Brad Hefta-Gaub
46bedf7667 more tweaks to hydra mappings 2015-11-02 13:35:49 -08:00
Brad Hefta-Gaub
b00f572e1a add mouseClicked inputs vs mouseButton inputs, make right-click work without right button drag 2015-11-02 09:21:15 -08:00
Brad Hefta-Gaub
70b9aa5ff1 remove right click context menu until we can make it work with camera move better 2015-11-02 07:42:52 -08:00
Brad Hefta-Gaub
e899229cde tweaks to how VrMenu is shown 2015-11-01 09:55:30 -08:00
Brad Hefta-Gaub
77816d818a make RY map to jump 2015-10-31 16:00:22 -07:00
Brad Hefta-Gaub
05dea847be add Actions.CycleCamera and wire up secondary thumb buttons to Actions.CycleCamera and Actions.ContextMenu 2015-10-31 15:47:40 -07:00
Brad Hefta-Gaub
22324eb281 more tweaking of keyboard input routes 2015-10-30 14:55:33 -07:00
Brad Hefta-Gaub
ce7fed2292 fix json 2015-10-30 13:16:31 -07:00
Brad Hefta-Gaub
b2f27054f4 Merge pull request #6239 from AlessandroSigna/controllers 
ViveController - input mapping
 2015-10-30 10:39:26 -07:00
Brad Hefta-Gaub
70f3156328 make sure CompositeEndpoints properly report readability more axis based keyboard inputs 2015-10-29 22:37:12 -07:00