Andrzej Kapolka
ff5d1455aa
More work on joint tracking.
2013-07-05 17:45:29 -07:00
Andrzej Kapolka
30f77975cf
Trying to get the right rotations, send them on the wire.
2013-07-03 17:07:22 -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
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
Stephen Birarda
64f3b55aaa
split logstash stash methods to stat types
2013-07-02 12:10:46 -07:00
Andrzej Kapolka
2a0d3310de
Merge branch 'master' of https://github.com/worklist/hifi into kinected
2013-07-02 09:46:07 -07:00
Philip Rosedale
e7113d26f8
Add field of view as an option in preferences
2013-07-01 23:00:39 -07:00
Philip Rosedale
6fbab462f0
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-01 22:30:06 -07:00
tosh
f062319c2b
introduces named constants for bandwidth meter channel indices / max. drag length
2013-07-02 03:53:49 +02:00
Tomáš Horáček
66de431d67
re #19385 : add hot-fix to allow import of big PNGs
...
sendVoxelsOperation() is sending data too fast, printf slows it down.
Better fix is required.
2013-07-02 02:57:55 +02:00
Andrzej Kapolka
d2e9686c81
Need to resize this.
2013-07-01 17:52:17 -07:00
Andrzej Kapolka
095782af45
Smooth the joints, get the head position/orientation from there.
2013-07-01 17:46:05 -07:00
Tomáš Horáček
b5e5806988
re #19385 : fill gaps between neighbourhood voxels
2013-07-02 01:16:20 +02:00
Tomáš Horáček
c4c2d46847
re #19385 : first version of PNG import
...
works for size <= 128px
2013-07-02 01:16:20 +02:00
Andrzej Kapolka
da6a9a342a
Need to wrap the using statement in ifdef, too.
2013-07-01 15:07:10 -07:00
Andrzej Kapolka
182f4e70af
More work on skeleton tracking.
2013-07-01 15:01:36 -07:00
tosh
7ebd912788
improves defaults and inline documentation of bandwidth meter layout constants
2013-07-01 23:38:00 +02:00
Andrzej Kapolka
4e9595f794
Merge branch 'master' of https://github.com/worklist/hifi into kinected
2013-07-01 09:49:01 -07:00
Andrzej Kapolka
a1cab3ddc6
Working on getting skeleton data.
2013-07-01 09:48:36 -07:00
tosh
3f62edd68e
makes bandwidth details dialog properly close (and reopen) on ESC key
2013-07-01 10:53:49 +02:00
tosh
639858dfc9
Merge branch 'master' of git://github.com/worklist/hifi into 19377
2013-07-01 10:29:56 +02:00
tosh
98589adef5
Bandwidth meter: Bytes -> bits, number formatting (colors, digits, aligment) on dialog
2013-07-01 10:28:17 +02:00
Philip Rosedale
138b8d7f64
Merge pull request #585 from birarda/owning-agent
...
boolean helper for Avatar isMyAvatar check
2013-06-30 23:26:32 -07:00
Philip Rosedale
d464ae4158
Merge pull request #578 from birarda/fervor
...
add an autoupdater for release OS X builds
2013-06-30 23:25:42 -07:00
tosh
fdf9f10e82
increases height of bandwidth meters by 8 pixels
2013-06-30 17:32:44 +02:00
tosh
f1e5a56347
adds code to show bandwidth details upon click and adds a checkbox to the menu to set visibility of the bandwidth bars
2013-06-30 17:08:01 +02:00
tosh
435b958671
polishes bandwidth meter
2013-06-29 20:52:07 +02:00
tosh
46f8136f2e
combined bandwidth display at automatic scale
2013-06-29 20:30:12 +02:00
tosh
c88642bac2
keeps audio from crashing when sound device is unavailable
2013-06-29 15:58:25 +02:00
tosh
c18400f8b7
Merge branch 'master' of git://github.com/worklist/hifi into 19377
2013-06-29 15:41:56 +02:00
Andrzej Kapolka
b4b09b0070
Back up and running, now with OpenNI rather than libfreenect.
2013-06-28 17:31:49 -07:00
Andrzej Kapolka
ea9566596a
Build OpenNI/NITE into interface if available.
2013-06-28 16:47:08 -07:00
