Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-05 08:49:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
83223 commits 69 branches 57 tags 1.2 GiB
Commit graph

321 commits

Author SHA1 Message Date
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
Andrew Meadows
940b8eb529 improve some variable names 2015-10-02 09:39:13 -07:00
Andrew Meadows
98fe06be57 cleanup sixense/hydra calibration 2015-10-02 09:30:18 -07:00
Brad Hefta-Gaub
85b2322acc more work on batch optimzation 2015-09-24 17:11:14 -07:00
Brad Hefta-Gaub
9a0e5b9870 address Sam's concerns 2015-09-23 17:37:48 -07:00
ZappoMan
65a079cb53 fix mac build 2015-09-23 16:48:34 -07:00
Brad Hefta-Gaub
ef25876c9a implement vector caching for gpu::Batch 2015-09-23 14:46:47 -07:00
Shared Vive Room
3c64db5c86 Adjust controller offset from 6 inches to 3 inches 
When using the vive controller the position of your wrist should
match your actual wrist a bit better, unless your name is Shaquille O'Neal.
 2015-09-18 12:02:05 -07:00
Brad Davis
644e81e20b Toggle mute while holding the hydras 2015-09-04 16:19:58 -07:00
Andrew Meadows
992bd5c9d2 fix sixense and vive rotation readings for palms 2015-09-02 11:37:36 -07:00
Stephen Birarda
9a4d666b0c no consts if HAVE_SIXENSE not set 2015-09-01 15:33:54 -06:00
Stephen Birarda
2ce225d76c fix for sixense not present on OS X 2015-09-01 15:33:46 -06:00
Seth Alves
3d7aa6f4d6 Merge pull request #5676 from AndrewMeadows/dubnium 
remove a few warnings from linux build
 2015-09-01 11:45:06 -07:00
Andrew Meadows
617e210fc6 fix for vive controller to place hand for IK 2015-09-01 09:51:14 -07:00
Andrew Meadows
bb63267e30 fix hand IK rotations or all models 2015-09-01 09:45:14 -07:00
Andrew Meadows
614fad0811 remove warnings from linux build 2015-08-27 19:12:25 -07:00
Seth Alves
695ffa29c7 call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
Andrew Meadows
45c846572e Merge pull request #5645 from jherico/maggie 
Fixing problems reported by static analysis tool
 2015-08-26 08:31:05 -07:00
Brad Davis
d311e4f2ea Fixing problems reported by static analysis tool 2015-08-25 19:18:55 -07:00
Brad Davis
073567558e Fix UserInputMapper event generation 2015-08-25 19:15:06 -07:00
Brad Hefta-Gaub
13a9dc4df2 cleanup controller interface, add getActionNames() and getDeviceNames() 2015-08-24 15:35:55 -07:00
Brad Hefta-Gaub
6549e47dbc fix crash in Controller when asking for device name out of bounds 2015-08-24 14:35:19 -07:00
Howard Stearns
ad0df3a47c Make sixense work in dev builds (if you put the library in the documented place). 2015-08-21 14:21:49 -07:00
Brad Davis
76f236adf6 New stereo rendering implementation 2015-08-21 00:29:24 -07:00
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -07:00
Brad Davis
aba7bebf6e Revert "Updating to the new version of the sixense library" 2015-08-19 09:44:51 -07:00
Brad Davis
86e21c91ba Case issues again 2015-08-18 18:56:00 -07:00
Brad Davis
eba446e7f6 Updating to the new version of the sixense library 2015-08-18 18:55:59 -07:00
Brad Hefta-Gaub
821063f6d2 Merge pull request #5575 from SamGondelman/sam/input-plugins 
Working on toybox script, squeezeHands, and default mappings
 2015-08-15 10:59:04 -07:00
Brad Davis
0ff283d09e Fixing crash in vive controllers 2015-08-12 12:24:53 -07:00
Brad Davis
5515b9d8ee Decouple Application and plugin definitions, cleanup container usage 2015-08-08 17:51:16 -07:00
SamGondelman
23fea1f221 working on toybox script, squeezeHands, and default mappings 2015-08-07 16:59:50 -07:00
SamGondelman
8bbdfd4223 switched vive buttons 2015-07-27 10:53:01 -07:00
Bradley Austin Davis
ba9bd6b9b5 Make OpenVR windows only for now 2015-07-27 09:45:15 -04:00
Sam Gondelman
1af51572af fixed init crash if you follow very specific startup steps 2015-07-24 17:10:39 -07:00
Sam Gondelman
0e4d065cbc Merge remote-tracking branch 'upstream/plugins' into macPluginsFix 2015-07-24 16:52:16 -07:00
Anthony J. Thibault
6fb6550641 Fix for memory corruption in Sixense ctor 
This was due to interface having a different size for SixenseManager then
input-plugins expected.  This would cause the new operator allocation to be too small.
 2015-07-24 14:03:53 -07:00
Sam Gondelman
7c9189cfbe trying to fix init issue 2015-07-23 16:13:27 -07:00
Bradley Austin Davis
6bc6127c2f Build error on OSX 2015-07-23 15:41:59 -04:00
Sam Gondelman
20c736dd5d cleaning up 2015-07-22 18:17:06 -07:00
SamGondelman
fe632e13b2 trying to reenable fullscreen 2015-07-22 17:58:22 -07:00
SamGondelman
e27ba86f75 fixing merge issues with plugins 2015-07-22 14:57:59 -07:00
SamGondelman
a63e65767f attempt to fix build error on mac 2015-07-22 14:18:26 -07:00
SamGondelman
505ef4c5cc set up sixense/vive menu items with correct event forwarding 2015-07-22 11:36:31 -07:00
Bradley Austin Davis
408bb082d7 Merge fixes, OSX compile fixes 2015-07-22 13:24:47 -04:00
Bradley Austin Davis
114ab9e47f Merge branch 'master' into plugins 2015-07-22 11:47:56 -04:00
SamGondelman
e3bc4b3b89 working on plugin menu manipulation 2015-07-21 13:45:33 -07:00
SamGondelman
db52729b1a forgot one, whoops 2015-07-20 16:51:30 -07:00
SamGondelman
d985d0293a correcting comments, removing dead code + back slash 2015-07-20 16:48:53 -07:00
Anthony J. Thibault
17220542d8 Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers 
Conflicts:
	examples/example/games/sword.js
 2015-07-20 15:22:19 -07:00
Anthony J. Thibault
80dea6831c Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers 
Conflicts:
	interface/src/Application.cpp
	libraries/input-plugins/src/input-plugins/SixenseManager.cpp
 2015-07-20 15:18:23 -07:00
SamGondelman
69bfd7dcc1 hydra vertical offset 2015-07-20 13:42:35 -07:00
SamGondelman
d88e484b00 hand information is in correct coordinate space, cleanup 2015-07-20 10:44:27 -07:00
Anthony J. Thibault
01c740f415 cleaning up plugin architecture, fixed hand controllers 2015-07-17 17:19:49 -07:00
Anthony J. Thibault
e8da4b9586 merge with plugins, needs testing 2015-07-16 18:47:39 -07:00
Anthony J. Thibault
060f6c19a6 almost finished plugin architecture, general plugin improvements. menu actions don't work all the time, joint controllers need to be handled better, and activate/deactive aren't always called correctly 2015-07-16 18:16:59 -07:00
Anthony J. Thibault
1083534d83 sdl2 build error fixed 2015-07-16 10:22:10 -07:00
Anthony J. Thibault
56e7af081e input plugin architecture, fixed sixense 2015-07-15 18:50:44 -07:00
Anthony J. Thibault
fb62fda2d2 started working on input plugin architecture 2015-07-15 10:26:48 -07:00
Anthony J. Thibault
561b712b5b rendered controllers in right place, missing texture 2015-07-13 14:06:26 -07:00
Anthony J. Thibault
ac9e1384c0 controllers render in right position, wrong rotation 2015-07-10 18:27:12 -07:00
Anthony J. Thibault
653b0d7789 started working on rendering controllers 2015-07-09 19:03:11 -07:00
Anthony J. Thibault
f2436bc00a controller/hand offset 2015-07-09 13:30:26 -07:00
Anthony J. Thibault
2ac6b6cd32 misc. changes 2015-07-09 09:57:12 -07:00
Anthony J. Thibault
0f30da64bc added Plugin interface to ViveControllerManager 
mostly I just added this to add the isSupported method, so it wouldn't
attempt to initialize if there was no HMD attached.
 2015-07-08 16:31:52 -07:00
Sam Gondelman
dcaa294778 removed vive zooming 2015-07-08 13:38:48 -07:00
Sam Gondelman
64118d9118 started moving hydra to use UserInputMapper::Poses, needs testing 2015-07-08 13:38:48 -07:00
Anthony J. Thibault
754e55553a modified rotation in MyAvatar::updatePosition, reenabled trackpad input 2015-07-07 17:29:46 -07:00
Anthony J. Thibault
15cf008f13 hand controllers and arrow keys now work 2015-07-07 17:29:45 -07:00
Anthony J. Thibault
4f8cf0af8c moved sdl2manager to input-plugins 2015-07-07 15:24:39 -07:00
Anthony J. Thibault
d75353eeb2 added left/right hand click actions, vive controller should be able to emulate mouse events 2015-07-07 14:35:55 -07:00
Sam Gondelman
f69b755166 merge with hifi/plugins 2015-07-06 17:41:45 -07:00
Sam Gondelman
8fbbb26b15 vertical hand offset (temporary) 2015-07-06 17:04:28 -07:00
Sam Gondelman
33e4893c17 correct hand rotation, buttons and axes work 2015-07-06 16:30:56 -07:00
Sam Gondelman
3f6fbd058c merge with standing-mode, hands relative to neck 2015-07-02 17:44:19 -07:00
Sam Gondelman
0333adb95b moved controllers to input-plugins, they work now 2015-07-01 18:46:57 -07:00
Sam Gondelman
e54060d6bb more working on poses, LEFT_ and RIGHT_HAND input actions 2015-07-01 14:36:12 -07:00
Sam Gondelman
a154c809c0 working on using UserInputMapper::Pose, merging 2015-06-30 17:34:34 -07:00
Brad Davis
db1094418d Restoring from plugins 2015-06-30 15:41:47 -07:00
Brad Davis
e421141ec5 experimenting with input plugins 2015-06-30 09:52:54 -07:00