SamGondelman
|
0bfe3ea817
|
added support for disabling vsync on macs, but doesn't work with the rift
|
2016-06-27 11:34:44 -07:00 |
|
SamGondelman
|
284fcc8a0b
|
better check for oculus display in oculus legacy plugin because the sdk is buggy
|
2016-06-23 13:50:17 -07:00 |
|
Ryan Huffman
|
9ff742c97c
|
Fix typo
|
2016-06-22 12:09:12 -07:00 |
|
Ryan Huffman
|
2233b5ba64
|
Add user activity tracking for OculusLegacyDisplayPlugin
|
2016-06-22 11:57:41 -07:00 |
|
Ryan Huffman
|
23f57367e3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions
|
2016-06-22 08:55:22 -07:00 |
|
Ryan Huffman
|
310adb0f45
|
Update spacemouse deviceConnected implementation
|
2016-06-21 16:42:39 -07:00 |
|
Ryan Huffman
|
70be7b3273
|
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions
|
2016-06-21 16:39:25 -07:00 |
|
Ryan Huffman
|
da71fcb57f
|
Update connected device detection implementation
|
2016-06-21 16:37:58 -07:00 |
|
Brad Hefta-Gaub
|
f2f7e21eaf
|
remove dead refereince to PluginContainer.h from space mouse
|
2016-06-21 16:17:43 -07:00 |
|
Ryan Huffman
|
251e2137d3
|
Remove old use of connectedDevice
|
2016-06-21 13:31:10 -07:00 |
|
Brad Hefta-Gaub
|
160a5de271
|
CR feedback
|
2016-06-21 12:49:42 -07:00 |
|
Brad Hefta-Gaub
|
c322317878
|
rework plugins to not depend on PluginContainer unless they want to
|
2016-06-21 12:07:05 -07:00 |
|
Atlante45
|
5560ba9a4c
|
Quit application when SteamVR requests it
|
2016-06-14 16:29:50 -07:00 |
|
SamGondelman
|
df9fd6c7fc
|
reset vive grip buttons to 0 if not pressed
|
2016-06-13 18:35:39 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Brad Davis
|
73342b2758
|
PR feedback
|
2016-05-20 14:50:24 -07:00 |
|
Brad Davis
|
07562f72af
|
Doing a pass over the input plugins and controller code
|
2016-05-20 14:50:23 -07:00 |
|
Howard Stearns
|
3088a84035
|
Just bringing the code up to date and forcing a build to see how Jenkins/osx is doing.
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving
|
2016-05-20 08:04:38 -07:00 |
|