Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-17 12:57:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
44100 commits 69 branches 56 tags 1.2 GiB
Commit graph

193 commits

Author SHA1 Message Date
Bradley Austin Davis
f3c47acbb2 Fix offset when UI transform is not identity 2016-06-14 09:49:25 -07:00
Bradley Austin Davis
6707f889b8 Fixing laser offset, support laser in Oculus 2016-06-13 17:33:18 -07:00
Bradley Austin Davis
62051ad297 Working on touch 2016-06-13 14:40:15 -07:00
Brad Davis
bb3722d915 trying again to fix mac build. 2016-06-13 13:04:11 -07:00
Brad Davis
9640727f51 Hand laser rendering support in HMD plugins. 2016-06-13 13:04:11 -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
8434aa9416 Merge pull request #8027 from SamGondelman/exposeHaptics 
Expose haptics to JS
 2016-06-08 16:17:04 -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
40778d7f29 Allow env disabling of the keyboard. Show keyboard after short delay to avoid flickers 2016-06-08 10:41:19 -07:00
Brad Davis
79c68b2ecb Working on positioning of the keyboard 2016-06-07 21:52:22 -07:00
Brad Davis
c2aa9e7f61 Update SteamVR keyboard behavior 2016-06-07 21:52:21 -07:00
Brad Davis
eab611acc0 Enable Steam VR text input 2016-06-07 21:52:20 -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
5daccba235 xbox controller works on restart 2016-06-07 15:14:08 -07:00
SamGondelman
2e71a63574 cr fixes 2016-06-07 13:28:10 -07:00
SamGondelman
ff2405437b can set strength to 0 2016-06-07 12:19:38 -07:00
SamGondelman
7a3cba8580 warning be gone 2016-06-06 17:06:59 -07:00
SamGondelman
8fa52fa159 trying to fix warning in joystick.cpp 2016-06-06 16:48:21 -07:00
SamGondelman
b59d597780 if overlapping calls, haptics take on strength and duration of call that will finish last 2016-06-06 15:35:12 -07:00
SamGondelman
cea0d74c35 fix spaces and touch duration 2016-06-06 15:20:10 -07:00
SamGondelman
e7743cd8e2 added options for both hands (default), all devices, short pulse, and fixed touch timing mechanism 2016-06-06 15:03:08 -07:00
Atlante45
b635e32933 Rename Mac only Oculus display plugin 2016-06-06 13:28:36 -07:00
Atlante45
3dadb515f3 Add plugins name to their metadata file 2016-06-06 13:28:36 -07:00
SamGondelman
afca0ec2c9 moved vive pulses to correct thread, works with duration 2016-06-06 13:25:05 -07:00
SamGondelman
b01a00584a Merge branch 'exposeHaptics' of https://github.com/SamGondelman/hifi into exposeHaptics 2016-06-06 10:35:29 -07:00
SamGondelman
f51cb7ce0c trying to add duration support for vive 2016-06-06 10:34:32 -07:00
Brad Davis
b7d1659852 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-06 09:32:33 -07:00
howard-stearns
849bee977a Do not send stale vive data as valid after deactivating. 
(cherry picked from commit e6cc1fabe0)
 2016-06-04 09:07:51 -07:00
Brad Hefta-Gaub
c2a34f24cb Merge pull request #7999 from howard-stearns/do-not-send-stale-vive-data-as-valid 
Do not send stale vive data as valid after deactivating.
 2016-06-04 08:41:26 -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
c1eab61241 sdl haptics aren't working, but might be a bug in sdl: http://stackoverflow.com/questions/23974908/why-is-sdl-hapticopenfromjoystick-not-working-in-sdl-2 2016-06-03 11:22:06 -07:00
SamGondelman
e2c4b4d306 added haptic support to sdl and touch (needs testing) 2016-06-03 10:17:08 -07:00
SamGondelman
912b35693b added vive single pulse haptics 2016-06-02 18:13:33 -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
e6cc1fabe0 Do not send stale vive data as valid after deactivating. 2016-06-02 12:38:54 -07:00
SamGondelman
c9ea85e659 fixed left hand rotation 2016-06-02 10:50:22 -07:00
SamGondelman
9984667742 touch properly sets pose.valid and further corrected hand rotation 2016-06-02 10:09:41 -07:00
SamGondelman
7bd29c13b0 corrected oculus touch rotation and converted hand pose to avatar coordinate system 2016-06-02 09:09:25 -07:00
Howard Stearns
f0133013c2 typo 2016-06-01 07:30:26 -07:00
Howard Stearns
922468ce1c fix cut and paste error with extraneous namespace qualifiers. 2016-05-31 20:47:58 -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
Brad Davis
ac5912df01 Fix crash on shutdown of SteamVR 2016-05-27 13:40:47 -07:00
howard-stearns
9ff1a695f0 Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-26 13:52:23 -07:00
howard-stearns
2accccef9e Merge branch 'reset-hud-on-driving' of https://github.com/howard-stearns/hifi into reset-hud-on-driving 2016-05-25 11:32:01 -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
Anthony J. Thibault
f82c3ba4f2 Revert "OpenVRDispalyPlugin: fix one-frame lag in resetSensors." 
This reverts commit 8381e74fb3.
 2016-05-23 16:30:05 -07:00
Anthony J. Thibault
097b16aadc Fix for sensor reset on oculus. 2016-05-23 15:40:29 -07:00
howard-stearns
fa78eea434 Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-20 16:50:54 -07:00