Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-20 00:29:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
34009 commits 25 branches 0 tags 1.1 GiB
Commit graph

150 commits

Author SHA1 Message Date
AlessandroSigna
b8a2fcbb2c Vive controller - fix inverted inputs 2015-10-30 15:21:48 -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 Davis
9607812116 Fixing input plugin dependencies 2015-10-30 10:18:51 -07:00
Brad Davis
49e7d42c2c Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-30 10:07:40 -07:00
Brad Davis
fcfab0fc51 Moving SDL2, Sixense and Faceshift to external projects 2015-10-30 00:57:51 -07:00
AlessandroSigna
01d3805148 ViveController - mapping of buttons 2015-10-29 18:44:43 -07:00
AlessandroSigna
ffd2b39874 Fix vive controller - update to new input plugin register 2015-10-29 13:18:37 -07:00
Brad Hefta-Gaub
851460b2bd fix build buster for SDL2 missing builds 2015-10-29 11:26:11 -07:00
Brad Hefta-Gaub
ed87ae3d5a remove some debugging 2015-10-29 10:57:30 -07:00
Brad Hefta-Gaub
bab2a7d80f Merge branch 'controllers' of https://github.com/highfidelity/hifi into hardwareChanged 
Conflicts:
	libraries/input-plugins/src/input-plugins/SixenseManager.cpp
	libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
 2015-10-29 10:56:01 -07:00
Brad Hefta-Gaub
a3cd032a41 register/remove devices when the input plugins are activated/deactivated 2015-10-29 10:06:21 -07:00
Brad Davis
c4e82a85d9 Remove DeviceProxy in favor of InputDevice 2015-10-29 09:32:56 -07:00
Brad Davis
b8f189dea7 Fixing hydras 2015-10-27 16:37:16 -07:00
Brad Davis
ef2d71e576 Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	libraries/input-plugins/src/input-plugins/SixenseManager.cpp
 2015-10-27 09:41:58 -07:00
howard-stearns
cbade6a095 Do not shut down hydra when it says there are no devices. Count to 
allowedHydraFailures in settings.
 2015-10-26 19:27:22 -07:00
Brad Davis
b2c3311947 Merge pull request #6174 from samcake/controllers 
Controllers : Adding a moving average for the velocity field returned by the Hydra controller
 2015-10-26 13:46:32 -07:00
samcake
a8872d065b MOve the movingAverage class to shared next to SimpleMovingAverage 2015-10-26 11:23:13 -07:00
Brad Davis
f38303a9a5 Adding vive default mapping 2015-10-26 10:36:31 -07:00
samcake
d400c694f6 Cleaning up for release 2015-10-23 18:09:54 -07:00
samcake
be843a0035 adding a rnning average on the velocity values returned by the hydra and adding a simple js to test 2015-10-23 17:32:54 -07:00
samcake
f14a321d03 Adding a amoving Average for the velocity of the hydra 2015-10-23 15:03:04 -07:00
samcake
2db87e0d2d Remove hydramove.js and expose the velocity and angular Velocity for hydra 2015-10-22 15:55:36 -07:00
Brad Hefta-Gaub
8772b5dbf2 Merge pull request #6143 from jherico/controllers 
Controllers Branch - Cleanup of enums and JS names
 2015-10-21 16:24:30 -07:00
Brad Hefta-Gaub
63e6452630 fix hydra left right arm flip 2015-10-21 16:17:58 -07:00
Brad Hefta-Gaub
9b11b2091f fix hydra left right arm flip 2015-10-21 16:17:11 -07:00
Brad Davis
4a1df286fd Cleanup of enums and JS names 2015-10-21 15:57:37 -07:00
Brad Davis
84e2ace0ea Prevent crash on connecting gamepad 2015-10-21 12:57:48 -07:00
Brad Davis
de57c3b4d6 Merge remote-tracking branch 'upstream/controllers' into controllers 
Conflicts:
	libraries/controllers/src/controllers/UserInputMapper.cpp
 2015-10-20 21:59:00 -07:00
samcake
da55011c2a Trying to merge 2015-10-20 16:38:41 -07:00
Brad Davis
eacd6af032 Get conditional routes working 2015-10-20 16:32:00 -07:00
Brad Davis
bea6fdd890 Working on JSON parsing and cleanup 
Conflicts:
	libraries/controllers/src/controllers/Route.cpp
	libraries/controllers/src/controllers/ScriptingInterface.cpp
	libraries/controllers/src/controllers/StandardController.cpp
	libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
 2015-10-20 10:20:28 -07:00
samcake
07aac6b2c7 Merging with upstream 2015-10-20 10:13:47 -07:00
samcake
8701d73ee9 DOing the groundwork to pass along the pose 
still not working
 2015-10-19 19:05:37 -07:00
Brad Hefta-Gaub
9acff9497c fix several warnings 2015-10-19 17:34:59 -07:00
Brad Davis
22602fb6f6 Fixing line endings 2015-10-19 10:00:16 -07:00
Brad Davis
184303d3c9 Using JS mappings for joystick, updating test code 2015-10-18 20:44:32 -07:00
Brad Davis
734a39f962 Breaking up UserInputMapper, restoring some mappings 2015-10-18 18:58:03 -07:00
Brad Davis
db0fa6b8ed Update hydra mappings and test code 2015-10-16 17:23:09 -07:00
Brad Hefta-Gaub
52021f573d Merge branch 'controllers' of https://github.com/highfidelity/hifi into renameInputPlugins 
Conflicts:
	libraries/controllers/src/controllers/UserInputMapper.cpp
 2015-10-14 19:05:41 -07:00
Brad Hefta-Gaub
46e40ed032 work on device names 2015-10-14 18:52:19 -07:00
Brad Davis
e39219c2b5 Fixes and PR comments 2015-10-14 16:51:52 -07:00
Brad Hefta-Gaub
4107f4ea9f guard sixense from updating before activated 2015-10-14 15:32:10 -07:00
Brad Davis
0063f9ae1d Merging old and new controller interfaces 2015-10-14 15:16:54 -07:00
Brad Davis
619fce0d7f Fixing namespace usage in input-plugins 2015-10-14 13:40:22 -07:00
Brad Davis
0c31fb1b1b Merge pull request #6069 from ZappoMan/controllers 
Hack in NewControllers into the JS layer of interface to allow testing
 2015-10-13 19:08:26 -07:00
Brad Hefta-Gaub
7846965fbc Merge pull request #6068 from jherico/controllers 
Making anonymous mappings work
 2015-10-13 16:23:24 -07:00
Brad Davis
910629c287 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-13 13:32:05 -07:00
Brad Davis
261384b4bb Fixing build breakage 2015-10-13 11:47:06 -07:00
Brad Davis
7f8f5f66c7 Working on plugin active concept 2015-10-13 10:01:01 -07:00
Ryan Huffman
9a9bdbbc44 hack in mappings to interface 2015-10-12 17:59:58 -07:00