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
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
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
Sam Gateau
4d48b98364
For a fistfull of magic numbers
2015-07-06 14:22:09 -07:00
Sam Gateau
95f5b14d45
CLenaing the interface of Item::Status to be more explicit and removing magic numbers
2015-07-06 12:47:35 -07:00
Sam Gateau
e63be58251
CLenaing the interface of Item::Status to be more explicit
2015-07-06 12:23:57 -07:00
Sam Gateau
2bbffff22f
Fixing typos
2015-07-06 10:22:25 -07:00
ZappoMan
c4a5160b89
CR feedback
2015-07-04 19:13:35 -07:00
ZappoMan
40cdd8646e
add packets per second to octree processing stats
2015-07-03 15:53:53 -07:00
ZappoMan
2aa345dfc6
Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats
2015-07-03 15:04:59 -07:00
ZappoMan
29a7584ee6
remove dead code
2015-07-03 11:29:59 -07:00
Brad Davis
b529901b1a
Attempting to protect against infinite recursion
2015-07-03 07:09:57 -07:00
Brad Davis
e459d0cb83
Fixing the 0.6 Oculus plugin
2015-07-03 07:08:48 -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
Sam Gateau
e3c06a30a1
removing dead code
2015-07-02 19:29:09 -07:00
ZappoMan
e1530b3ce9
added a FIXME STUTTER note
2015-07-02 18:15:24 -07:00
samcake
f9562bedd9
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-02 18:14:45 -07:00
Bradley Austin Davis
6b85db268c
Working on mac oculus support
2015-07-02 18:14:38 -07:00
Bradley Austin Davis
0034a14fc1
Working on mac functionality
2015-07-02 18:14:12 -07:00
Sam Gateau
76ca093e05
something working ?
2015-07-02 18:12:03 -07:00
Stephen Birarda
812b18c74e
Merge pull request #5205 from SeijiEmery/unit-tests
...
Unit tests
2015-07-02 20:58:09 -04:00
Sam Gondelman
3f6fbd058c
merge with standing-mode, hands relative to neck
2015-07-02 17:44:19 -07:00
samcake
0c55130548
maybe i have solved the passing of the status
2015-07-02 17:31:29 -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
dcd61fd417
improvment ?
2015-07-02 16:13:54 -07:00
Sam Gateau
79be37f78f
improvment ?
2015-07-02 16:00:56 -07:00
Sam Gateau
bf052162bb
improvment ?
2015-07-02 15:53:02 -07:00
Sam Gateau
8d8a902328
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-02 15:06:32 -07:00
Sam Gateau
be8fe25338
Trying to finalize the look and behavior of th estatus indicators
2015-07-02 15:06:07 -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
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
Leonardo Murillo
9440546619
Don't display update dialog if this is a PR build
2015-07-02 14:17:36 -06:00
Sam Gondelman
a6cbc09eac
reverted to openvr 0.9.1
2015-07-02 12:32:35 -07:00
ZappoMan
b13a4b2a71
add edit update stats
2015-07-02 11:07:47 -07:00
samcake
faea97d3c7
Merge pull request #5221 from Atlante45/web
...
Fix Web entities
2015-07-02 10:45:20 -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