Andrzej Kapolka
c5c9debed5
Fix for combined gyro/depth camera.
2013-07-08 13:03:53 -07:00
Andrzej Kapolka
c43994fe03
Orientation -> rotation.
2013-07-08 12:54:27 -07:00
Andrzej Kapolka
4a22154737
Fix for leaning, smoothing.
2013-07-08 11:35:42 -07:00
Andrzej Kapolka
357ac05d35
Removed debug logging.
2013-07-05 22:58:57 -07:00
Andrzej Kapolka
f9f2c66115
Merge branch 'master' of https://github.com/worklist/hifi into kinected
...
Conflicts:
interface/src/Application.cpp
interface/src/Avatar.cpp
interface/src/Avatar.h
libraries/avatars/src/AvatarData.h
2013-07-05 22:52:42 -07:00
Andrzej Kapolka
9c6e5b23e0
Alignment fixes.
2013-07-05 22:44:47 -07:00
Andrzej Kapolka
7a65ebbba3
Remove Freenect/LibUSB bits.
2013-07-05 22:17:59 -07:00
Andrzej Kapolka
9c977450e3
Finally got the rotations figured out; I had forgotten the default pose/bind
...
pose distinction.
2013-07-05 22:14:32 -07:00
Andrzej Kapolka
ff5d1455aa
More work on joint tracking.
2013-07-05 17:45:29 -07:00
Andrzej Kapolka
43258f9dcd
Use 15 blinks per minute as a base/maximum frequency.
2013-07-03 17:12:43 -07:00
Andrzej Kapolka
30f77975cf
Trying to get the right rotations, send them on the wire.
2013-07-03 17:07:22 -07:00
Stephen Birarda
0be42698b5
resolve conflicts on merge with upstream master
2013-07-03 15:12:50 -07:00
Stephen Birarda
c8b86c651f
Merge pull request #622 from birarda/master
...
remove an extra g
2013-07-03 15:06:23 -07:00
Stephen Birarda
8a4dc8446b
what is July 3rdg
2013-07-03 15:05:51 -07:00
ZappoMan
f0fdacbba8
Merge pull request #621 from birarda/master
...
remove pre-build fervor error, comment out process event bug
2013-07-03 15:05:46 -07:00
Stephen Birarda
e85e49ef3b
add a comment to disable of processEvents
2013-07-03 14:31:28 -07:00
Stephen Birarda
c44e231ab5
Merge pull request #620 from machinelevel/dev4
...
[trivial] small bracket fix per request in https://github.com/worklist/h ...
2013-07-03 14:29:59 -07:00
Stephen Birarda
0e68942674
comment out processEvents to remove event receipt bug
2013-07-03 14:27:07 -07:00
Stephen Birarda
23e1fab9be
Merge branch 'master' of github.com:worklist/hifi
2013-07-03 14:13:37 -07:00
Eric Johnston
fe46a3f0c9
[trivial] small bracket fix per request in https://github.com/worklist/hifi/pull/618/files
2013-07-03 13:11:26 -07:00
Philip Rosedale
3388fccc86
Fixes per code review
2013-07-03 13:09:55 -07:00
Philip Rosedale
c309774e3c
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-03 13:01:21 -07:00
Stephen Birarda
331351765e
remove fvversioncomparator from headers passed to qt4
2013-07-03 12:51:26 -07:00
Eric Johnston
e8ee041f20
Virtual method warning removal.
...
Warning was "Delete called on HifiLeapListener that has virtual functions but non-virtual destructor"
2013-07-03 11:46:53 -07:00
Eric Johnston
acef2bc669
Fixed two-finger touch delay, and all other hidden event-pile-up.
...
Added a processEvents() call in the idle, because otherwise calling idle updates starves the event handlers.
2013-07-03 11:37:38 -07:00
Philip Rosedale
7880c74304
smooth gyro look on by default if not in settings
2013-07-03 11:17:06 -07:00
Philip Rosedale
bf4bc22fbf
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-03 11:11:00 -07:00
Philip Rosedale
1868717520
Improve gyro look to smoothly follow the head and not move for small movements
2013-07-03 11:10:40 -07:00
Stephen Birarda
36c6912de8
your agents are now nodes
2013-07-03 10:35:09 -07:00
Andrzej Kapolka
e866c22518
Merge branch 'master' of https://github.com/worklist/hifi into kinected
...
Conflicts:
interface/src/Avatar.cpp
2013-07-03 10:15:11 -07:00
Andrzej Kapolka
ebab09e535
More work on joints.
2013-07-03 10:13:10 -07:00
Eric Johnston
fd2009738b
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-07-03 09:56:00 -07:00
Stephen Birarda
00fa688aba
Merge pull request #614 from machinelevel/dev4
...
(changed per requests and re-merged) Two Leap-related crashes fixed, plu...
2013-07-03 09:53:40 -07:00
Eric Johnston
cf8257d3e9
fixed curly-braces per request
2013-07-02 17:49:43 -07:00
Stephen Birarda
4a804a9960
Merge pull request #615 from ey6es/master
...
Fixes for gyros/webcam: restore rotation amplification, don't bother with gyro position or fusing webcam roll, blink faster.
2013-07-02 17:33:11 -07:00
Andrzej Kapolka
4ecb4ab3c6
Restore the amplification; blink faster.
2013-07-02 17:14:54 -07:00
Andrzej Kapolka
a1d0f255cc
Not crazy about the rotation amplification.
2013-07-02 17:03:37 -07:00
Eric Johnston
5d59bcbec7
(changed per requests and re-merged) Two Leap-related crashes fixed, plus Leap improvements
...
1. Fixed thread-crash at terminate() time by terminating the LeapManager properly
2. Fixed an intermittent thread-crash when Leap active by removing auto-connection between controller and listener
3. Added fingerRoot positions to display and data packet
4. Introduced a vec3-based convention so that more finger data may be added without causing trouble for old clients and servers
5. My avatar's fingers are different color from others
2013-07-02 17:03:32 -07:00
Andrzej Kapolka
b660336b2a
Fix for camera movement with webcam enabled; don't bother using roll from
...
webcam if we have the gyros; reinstate head orientation scaling; don't bother
using gyro position.
2013-07-02 16:59:03 -07:00
ZappoMan
af1de263a4
fixed FOV preference to work with view frustum code properly
2013-07-02 16:58:31 -07:00
Andrzej Kapolka
1fdfca727d
More work on Kinect-driven joints.
2013-07-02 16:49:07 -07:00
Stephen Birarda
f2dbad4e57
resolve conflicts on merge with upstream master
2013-07-02 15:42:36 -07:00
Stephen Birarda
1993601389
don't link a NOTFOUND leap library
2013-07-02 15:27:30 -07:00
Andrzej Kapolka
4f01db6dc7
Merge branch 'master' of https://github.com/worklist/hifi into kinected
2013-07-02 14:52:22 -07:00
Andrzej Kapolka
bf4757663c
Merge pull request #609 from birarda/domain-stats
...
rework Logstash to handle various stat types, add domain server node count stat
2013-07-02 14:52:08 -07:00
Andrzej Kapolka
c4deeed121
Merge branch 'master' of https://github.com/worklist/hifi into kinected
2013-07-02 14:51:45 -07:00
Andrzej Kapolka
52e7ff9a68
Working on filling in missing joint data.
2013-07-02 14:51:27 -07:00
Stephen Birarda
f7f321663a
DRY up multiple stat type sending
2013-07-02 14:42:31 -07:00
ZappoMan
147f090d56
Merge pull request #599 from PhilipRosedale/master
...
3P transition turned off, field of view now in preferences
2013-07-02 14:19:09 -07:00
Tomáš Horáček
6f6f0423a0
Merge remote-tracking branch 'worklist/master' into 19385
2013-07-02 23:05:50 +02:00
