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
Anthony J. Thibault
07141fd1e3
rotation and thrust work in both 2d and hmd mode
...
known issue, hmd does thrust doesnt work when avatar collisons are disabled.
2015-07-08 12:25:57 -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
Anthony J. Thibault
5293effc2e
more work in progress vive room tracking
...
Found and disabled torso twist
use an old copy of the hmd pose before physics, and the most up to date
one after physics.
2015-07-07 00:12:48 -07:00
Sam Gondelman
f69b755166
merge with hifi/plugins
2015-07-06 17:41:45 -07:00
Brad Davis
95000eec3c
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/ui/overlays/LocalModelsOverlay.cpp
2015-07-06 16:22:03 -07:00
Brad Davis
ba7c3a2c27
Attempting to get UI and navigation keys/mouse working
2015-07-03 07:10:33 -07:00
Brad Davis
2a1776303d
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/avatar/SkeletonModel.cpp
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
2015-07-03 06:17:35 -07:00
Bradley Austin Davis
0034a14fc1
Working on mac functionality
2015-07-02 18:14:12 -07:00
Sam Gondelman
3f6fbd058c
merge with standing-mode, hands relative to neck
2015-07-02 17:44:19 -07:00
Sam Gateau
8d8a902328
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-02 15:06:32 -07:00
Brad Davis
d5fe6f0bdb
Inhibiting log spam unless a menu item is selected
2015-07-02 12:34:32 -07:00
Clément Brisset
b616fff222
Merge pull request #5220 from howard-stearns/avatar-collision-sounds
...
Avatar collision sounds
2015-07-02 10:27:24 -07:00
Sam Gondelman
81efd99ae4
merge with hifi/plugins
2015-07-02 10:13:28 -07:00
Anthony J. Thibault
f0d8916d8a
First crack at room scale tracking from vive HMD.
...
* modifed openvr plugin to return different eye pose matrices.
* avatar position and physics body now follow the head.
* orientation also follows head direction
2015-07-02 09:47:08 -07:00
Brad Hefta-Gaub
f16b8d5083
Merge pull request #5246 from jherico/inter_idle_timing
...
Instrument the inter-idle time and tweaking the timeout setting
2015-07-02 09:01:44 -07:00
Sam Gondelman
0333adb95b
moved controllers to input-plugins, they work now
2015-07-01 18:46:57 -07:00
Sam Gateau
d019ef4373
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-01 18:12:11 -07:00
Sam Gateau
e8b11f1198
Exposing the display Item Status to js to turn it on/off
2015-07-01 17:27:41 -07:00
Brad Davis
88a733181e
Fixing comment to reflect code
2015-07-01 16:54:59 -07:00
Brad Davis
4cffa26c01
CR comments and fixing the microsecond display
2015-07-01 16:53:12 -07:00
Brad Davis
59027959b8
CR comments and fixing the average calculation
2015-07-01 16:30:42 -07:00
Brad Hefta-Gaub
af932fde29
Merge pull request #5247 from ericrius1/handRender
...
Fixed broken rendering of hydra visualization paraphernalia
2015-07-01 16:21:32 -07:00
Brad Davis
0c88972f09
Instrument the inter-idle time and tweaking the timeout setting
2015-07-01 16:14:17 -07:00
ericrius1
8b00864175
hydra hand spheres and lasers are rendering again
2015-07-01 15:04:19 -07:00
Sam Gondelman
e54060d6bb
more working on poses, LEFT_ and RIGHT_HAND input actions
2015-07-01 14:36:12 -07:00
Clément Brisset
eb3bddfe4c
Merge pull request #5209 from ctrlaltdavid/20589
...
QA for #20589 - Vertical field of view preference change should be applied immediately
2015-07-01 13:53:25 -07:00
Brad Davis
040f7c86ea
Working on plugin menu items
2015-07-01 09:05:26 -07:00
Sam Gondelman
a154c809c0
working on using UserInputMapper::Pose, merging
2015-06-30 17:34:34 -07:00
Sam Gondelman
1ea8e85fe8
Merge remote-tracking branch 'jherico/input-plugins' into sam/vive-hand-controllers
2015-06-30 17:30:37 -07:00
Brad Davis
b2b571b5a1
Fixing app includes
2015-06-30 15:52:55 -07:00
Sam Gondelman
aaf84b47f3
Merge remote-tracking branch 'upstream/plugins' into sam/vive-hand-controllers
2015-06-30 10:37:06 -07:00
Brad Davis
e421141ec5
experimenting with input plugins
2015-06-30 09:52:54 -07:00
Sam Gondelman
a27196dfee
initial testing of hand controller tracking
2015-06-29 17:13:33 -07:00
Brad Davis
196a92c1b4
A little bit of display plugin API cleanup
2015-06-29 10:55:13 -07:00
Brad Davis
a923c044a3
Merge remote-tracking branch 'upstream/master' into plugins
2015-06-28 22:51:46 -07:00
Brad Davis
dcdf47dd66
Fix mouse interaction with overlays in HMDs
2015-06-28 22:51:26 -07:00
Howard Stearns
af4b804d37
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds
2015-06-27 12:50:13 -07:00
Seth Alves
97cd5b8b99
Merge pull request #5223 from SamGondelman/cameraMode
...
misc. key binding/camera fixes
2015-06-27 10:55:34 -07:00
Brad Davis
7ca63a4ace
Fixing overlay rendering in plugins
2015-06-27 00:43:38 -07:00
Brad Davis
69fa18c6c0
Working on overlay in plugins
2015-06-26 18:08:10 -07:00
Sam Gondelman
2f0fcba1eb
key binding fixes as suggested by ctrlaltdavid, start in 3rd person if crashed in independent mode
2015-06-26 17:28:02 -07:00
Brad Davis
4417c00ae4
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.h
interface/src/Menu.h
2015-06-26 17:02:16 -07:00
Howard Stearns
9a04fdf10a
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds
2015-06-26 16:24:27 -07:00
Howard Stearns
98f165f2ae
Avatar collision sounds.
...
collisionsSoundURL can be set in preferences:
Currently defaults to https://s3.amazonaws.com/hifi-public/sounds/Collisions-hitsandslaps/airhockey_hit1.wav .
Can be empty, which means no sound, rather than restoring default.
MyAvatar.collisionSoundURL can read/written in scripts.
Preloads when set, so that it won't have to fetch on first collision.
Plays at start of collision only, with volume proportional to "velocity change"^2.
2015-06-26 16:23:16 -07:00
David Rowe
1898c6bd55
Merge branch 'master' into 20547
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-06-26 13:05:51 -07:00
Seth Alves
a0d77c061c
lock the entity tree during physics operations that access then entity tree. if the simulation and entity-tree are both going to be locked, be sure to lock the entity tree first (and unlock it last), because this is what the network-reading thread does
2015-06-26 07:00:28 -07:00
Brad Hefta-Gaub
63812f28ad
Merge pull request #5206 from SamGondelman/cameraMode
...
fix bug that was preventing camera mode switches
2015-06-25 18:55:13 -07:00
