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 |
|