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

129 commits

Author SHA1 Message Date
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
Ryan Huffman
f860ca923e revert small hack 2015-10-12 16:01:26 -07:00
Atlante45
c666c9fb9b Fix warning 2015-10-12 13:40:33 -07:00
Ryan Huffman
ebeb87ba62 test 2015-10-12 11:21:40 -07:00
Brad Davis
f77878ee79 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-12 11:05:28 -07:00
Brad Davis
14f511350d Working on refactoring the xbox hardware access and wiring up test code 2015-10-12 10:47:23 -07:00
Brad Hefta-Gaub
f8956a853b Merge pull request #6051 from jherico/marge 
Cleanup CMake files
 2015-10-11 16:22:56 -07:00
Brad Hefta-Gaub
21a473035e more CR feedback 2015-10-11 15:37:17 -07:00
Brad Hefta-Gaub
312bbf6167 CR feedback 2015-10-11 15:15:20 -07:00
Brad Hefta-Gaub
9667a103aa actually add new files 2015-10-11 15:02:11 -07:00
Brad Hefta-Gaub
0986f86c34 implement StandardController and expose it to JS as Controller.Standard.* 2015-10-11 14:55:07 -07:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00
Brad Hefta-Gaub
ded677e90f Merge branch 'master' of https://github.com/highfidelity/hifi into newControllerInterface 2015-10-10 09:33:55 -07:00
Brad Hefta-Gaub
63f3156a61 add Controler.Actions 2015-10-09 21:23:19 -07:00
Howard Stearns
7ba149fbbd Log when hydra is disconnected. 2015-10-09 16:19:14 -07:00
Brad Hefta-Gaub
37f530f97f first cut at wiring up devices and inputs to JS 2015-10-09 16:15:29 -07:00
Atlante45
cba8b0962d Fix warnings 2015-10-09 13:29:59 -07:00
Andrew Meadows
0680be0422 save sixense settings and some UI cleanup 2015-10-07 14:19:15 -07:00
Clément Brisset
5eda3095bb Merge pull request #5998 from birarda/qt-5.5 
suppress warnings for overriden methods in Xcode 7
 2015-10-05 17:00:43 -07:00
Stephen Birarda
3ddfcc10c2 override additions to input-plugins 2015-10-05 15:50:35 -07:00
Howard Stearns
844270e306 Reset (as though by apostrophe key) whenever we calibrate the hydra. 2015-10-05 12:44:22 -07:00
Andrew Meadows
e9c71f3867 cleanup comments 2015-10-02 10:02:12 -07:00