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
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
Anthony J. Thibault
834b75f4c4
work in progress room scale tracking work.
...
sensor to world matrix stored in MyAvatar
override setPosition and setOrientation to move sensor to world matrix.
2015-07-06 18:25:42 -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
Sam Gateau
fe633cd545
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-06 15:04:02 -07:00
Brad Davis
21562c0766
Merge pull request #5258 from ericrius1/nakedGLStripping
...
Removing naked GL calls from overlay code
2015-07-06 10:25:50 -07:00
ZappoMan
74733452da
some tweaks to make stats dialog more readable
2015-07-04 11:25:27 -07:00
ZappoMan
40cdd8646e
add packets per second to octree processing stats
2015-07-03 15:53:53 -07:00
Eric Levin
3d06b011aa
adding batch to renderHUD
2015-07-03 13:27:00 -07:00
Eric Levin
9d3995ae25
Merge branch 'nakedGLStripping' of https://github.com/ericrius1/hifi into nakedGLStripping
2015-07-03 09:42:19 -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
Brad Davis
ed5835ff05
Trying to get mac display plugins working:
2015-07-02 22:29:22 -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
ZappoMan
a54cf67064
add stats for processing time per packet
2015-07-02 17:28:53 -07:00
ZappoMan
8916dd2056
add stats for elements and entities per second
2015-07-02 17:00:35 -07:00
ZappoMan
0c0b8dbbc1
add stats for elements and entities per incoming packet
2015-07-02 16:19:13 -07:00
Sam Gateau
8d8a902328
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-02 15:06:32 -07:00
ZappoMan
b568e895ec
Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats
2015-07-02 15:00:09 -07:00
Brad Hefta-Gaub
2a03f62bf2
Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership
...
Actions over wire and improved simulation ownership
2015-07-02 14:57:27 -07:00
ericrius1
8be1fd28e5
stripping naked gl calls from overlays to allow vive and oculus plugins to work
2015-07-02 13:57:00 -07:00
ZappoMan
5c4d4893de
added bytes per edit stats
2015-07-02 13:44:28 -07:00
ZappoMan
63b585da0f
added updates per second stat
2015-07-02 13:28:12 -07:00
Brad Hefta-Gaub
b11172affb
Merge pull request #5254 from jherico/timing_menu_log
...
Inhibiting log spam unless a menu item is selected
2015-07-02 12:48:01 -07:00
Brad Davis
d5fe6f0bdb
Inhibiting log spam unless a menu item is selected
2015-07-02 12:34:32 -07:00
Philip Rosedale
fba569d7db
Merge pull request #5218 from huffman/fix-hmd-displayname-orientation
...
Fix avatar displayname to point towards camera
2015-07-02 12:19:40 -07:00
ZappoMan
b13a4b2a71
add edit update stats
2015-07-02 11:07:47 -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
Philip Rosedale
0905962d90
Merge pull request #5251 from ctrlaltdavid/20600
...
Fix Show Eye Focus and Show Look-at Vectors
2015-07-02 09:16:20 -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
Howard Stearns
1f3a1f6ac8
Add comments re upcoming physics changes.
2015-07-02 10:07:14 -05:00
Howard Stearns
d0675c7f22
Side-effect new value before emit.
2015-07-02 09:56:02 -05:00
Bradley Austin Davis
54bbc841e2
Working on mac compilability
2015-07-01 23:03:33 -07:00
David Rowe
925fd71262
Fix rendering of look-at vectors
2015-07-01 22:45:47 -07:00
David Rowe
0df9ebeda3
Fix rendering of look-at avatar sphere
...
postLighting is never true.
2015-07-01 22:45:13 -07:00
Seth Alves
246861221c
rearrange things so that when EntityItem::setActionData is called before the entity-tree is set up, the data is set aside and used once the entity-tree is ready.
2015-07-01 20:17:21 -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
