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
56e7af081e
input plugin architecture, fixed sixense
2015-07-15 18:50:44 -07:00
Anthony J. Thibault
d07a02cef3
Refactor of MyAvatar and Application HMD sensor
...
MyAvatar now uses a cached copy of the HMDSensor location,
instead of calling into Application for every access.
This allows us to simplify application to always return the
most recent pose, instead of a different one pre and post physics.
Added accessors to HMD Sensor in MyAvatar, besides being helpful,
it also an optimization to avoid extracting quaternions from the
HMD matrix on every access.
2015-07-13 12:56:33 -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
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
Sam Gondelman
81efd99ae4
merge with hifi/plugins
2015-07-02 10:13:28 -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
Brad Davis
b2b571b5a1
Fixing app includes
2015-06-30 15:52:55 -07:00
Brad Davis
e421141ec5
experimenting with input plugins
2015-06-30 09:52:54 -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
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
David Rowe
377979e380
Make field of view preference change be applied immediately
2015-06-25 15:41:10 -07:00
Sam Gondelman
19ec080e2b
Merge with master
2015-06-24 15:04:03 -07:00
Sam Gondelman
824c219fa0
started fixing camera mode issue
2015-06-23 09:26:38 -07:00
Brad Davis
967fc62da7
Working on syncing with master
2015-06-22 13:46:03 -07:00
Brad Davis
9f98547390
Merge branch 'master' into plugins
2015-06-22 13:35:40 -07:00
Brad Davis
99c217184b
Fixing the mic/camera buttons and the mirror UI buttons
2015-06-19 14:46:39 -07:00
Brad Davis
9bef5f011b
Reverting mirror functionality
2015-06-19 00:03:46 -07:00
Brad Davis
0fa6ac175f
Merge branch 'master' into overlay
2015-06-18 21:56:11 -07:00
Brad Hefta-Gaub
a7a53d8be7
Merge pull request #5148 from SamGondelman/rotationModes
...
center player in view mode
2015-06-18 18:02:47 -07:00
David Rowe
67206332e6
Make individual reload buttons reload scripts
2015-06-17 16:11:30 -07:00
David Rowe
5dab977c28
Add a reload script button after each script in list of running scripts
2015-06-17 16:11:26 -07:00
Brad Davis
4762e1a00c
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
2015-06-16 21:01:00 -07:00
Brad Davis
ba13b7820c
Working on overlay refactor
2015-06-16 09:58:03 -07:00
Sam Gondelman
22961fcc9d
added camera mode to keep player in center of view
2015-06-15 15:44:56 -07:00
Leonardo Murillo
c065269ba7
Merging with upstream
2015-06-15 11:58:52 -06:00
Brad Davis
00d8fe75ab
Breaking up overlay into rendering and compositing classes
2015-06-13 17:36:08 -07:00
Brad Davis
a26373bd3a
Fixing merge problem
2015-06-12 17:28:38 -07:00
Brad Davis
7955eeda28
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/ApplicationOverlay.h
2015-06-12 15:49:35 -07:00
Brad Hefta-Gaub
24fda9a733
Merge pull request #5085 from SamGondelman/master
...
Exposing Input Key Binding To JavaScript
2015-06-11 14:41:34 -07:00
Brad Davis
7f6a49688a
Merge branch 'master' into plugins
...
Conflicts:
interface/resources/qml/AddressBarDialog.qml
interface/src/Application.cpp
interface/src/Application.h
interface/src/Environment.cpp
interface/src/Environment.h
interface/src/devices/TV3DManager.cpp
interface/src/ui/ApplicationOverlay.h
interface/src/ui/overlays/LocalModelsOverlay.cpp
2015-06-10 14:21:48 -07:00
Leonardo Murillo
8f72763f17
Merge branch 'master' of github.com:highfidelity/hifi into auto-updater
2015-06-10 13:18:20 -06:00
Leonardo Murillo
1d785c714b
Merge branch 'master' of github.com:highfidelity/hifi into auto-updater
2015-06-09 09:01:50 -06:00
Brad Davis
c360dde71a
Merge branch 'master' into render_cursor
...
Conflicts:
interface/src/Application.cpp
2015-06-08 20:18:32 -07:00
ZappoMan
8fa31ec521
dead code removal machine
2015-06-08 14:30:31 -07:00
Brad Davis
b3534210e4
Always use GL rendered cursor
2015-06-08 11:51:35 -07:00
Brad Davis
1b7efe9a02
Working on display plugins
2015-06-05 00:00:57 -07:00
Sam Gondelman
984d449bf9
exposed input key bindings to js to enable key remapping
2015-06-04 16:29:58 -07:00
Leonardo Murillo
cefdbc3126
Checkpoint auto updater
2015-06-02 19:32:03 -06:00
Brad Davis
f22682fe39
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
2015-06-01 22:59:10 -07:00
Sam Gateau
cd7914ad9d
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk
2015-06-01 17:31:39 -07:00
Sam Gateau
bd7c22e715
Trying to transfer the rnedering from displaySide to RenderDeferredTask
2015-06-01 17:31:00 -07:00
ZappoMan
d4af454834
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-01 14:42:35 -07:00
Brad Davis
23d6725a6a
Consolidating GL display plugins
2015-05-31 00:24:19 -07:00
Brad Davis
912c003d58
Making (most) plugins into a library
2015-05-29 16:49:11 -07:00
Sam Gondelman
4c83c6918d
fixed avatar billboards not displaying
2015-05-29 16:44:16 -07:00
