Commit graph

3962 commits

Author SHA1 Message Date
Stephen Birarda
892167510a time TwoPole call for 256 samples 2013-06-14 12:15:12 -06:00
Stephen Birarda
593730682d add timing for TwoPole calls 2013-06-14 12:04:25 -06:00
Andrzej Kapolka
b4d4cfd994 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-14 10:31:10 -07:00
Andrzej Kapolka
4f9f2fa4ca Better iris texture. 2013-06-14 10:28:45 -07:00
Philip Rosedale
b637408b54 Merge pull request #538 from ZappoMan/localmode
added local mode to audio-mixer
2013-06-14 10:08:47 -07:00
Philip Rosedale
0cd3dd57e6 Merge pull request #525 from birarda/master
add a low-pass filter and send audio-mixer stats to logstash
2013-06-14 09:41:14 -07:00
ZappoMan
5d6a5a7377 Removed accidentally merged code 2013-06-14 09:22:14 -07:00
ZappoMan
985b8d66d2 Merge branch 'master' of https://github.com/worklist/hifi into localmode 2013-06-14 09:21:02 -07:00
ZappoMan
471c9a3dad added local mode 2013-06-14 09:18:01 -07:00
Stephen Birarda
90500a8990 send a packet with the exact number of bytes to logstash 2013-06-13 19:17:42 -06:00
Stephen Birarda
a267d5fe9f Merge branch 'master' of github.com:worklist/hifi 2013-06-13 18:31:37 -06:00
Andrzej Kapolka
ce9236e659 Merge pull request #537 from ey6es/master
Ryan's new iris texture.
2013-06-13 16:59:53 -07:00
Andrzej Kapolka
0f897340ee New iris texture from Ryan. 2013-06-13 16:42:31 -07:00
ZappoMan
620a4a8ad6 latest occlusion culling with support for checking map without adding to coverage map for checking parent nodes 2013-06-13 16:37:14 -07:00
Stephen Birarda
1ebd007f36 wrap things in brackets to correct percentage 2013-06-13 17:28:58 -06:00
Stephen Birarda
51b431aa81 Merge branch 'master' of github.com:worklist/hifi 2013-06-13 17:27:37 -06:00
Andrzej Kapolka
4b3ab2d8d5 Merge pull request #535 from PhilipRosedale/master
Everyone is now looking where they are mousing!  (myeyesareuphere.com)
2013-06-13 16:21:14 -07:00
Philip Rosedale
dd1df47c71 fixes per review 2013-06-13 16:20:28 -07:00
Stephen Birarda
be4c7fc085 fix audio-mixer sleep time calculation 2013-06-13 17:15:22 -06:00
Philip Rosedale
e6e147d86a Merge branch 'master' of https://github.com/worklist/hifi 2013-06-13 16:09:28 -07:00
Philip Rosedale
c72e3c930e Merge pull request #536 from ey6es/master
Use a bound texture for iris, added per-pixel specular highlight on it.
2013-06-13 16:08:30 -07:00
Stephen Birarda
fab53113e4 fix a divide by zero for audio-mixer stat sending 2013-06-13 17:07:25 -06:00
Andrzej Kapolka
e401663459 Added per-pixel specular highlight to irises. 2013-06-13 15:58:49 -07:00
Stephen Birarda
a141e3dc5d resolve conflicts on merge with upstream master 2013-06-13 16:31:40 -06:00
Philip Rosedale
04736fefb5 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-13 15:04:41 -07:00
Philip Rosedale
f6e6ceddfe Head camera scaling always one if gyros off so that mouse look works. 2013-06-13 14:53:10 -07:00
Andrzej Kapolka
466c062bc1 Use a bound texture for the iris, load it with Qt rather than lodepng (we can
probably just remove the lodepng dependency).
2013-06-13 14:41:06 -07:00
Philip Rosedale
1556886a64 fixing reversed lookat, rendering for all avatars 2013-06-13 14:33:09 -07:00
Philip Rosedale
8af0da754f we are always looking at something 2013-06-13 14:21:14 -07:00
ZappoMan
7fb4ed276f removed some debugging code 2013-06-13 14:10:53 -07:00
Philip Rosedale
687966c486 Other people's avatar's look where they are mousing 2013-06-13 14:04:51 -07:00
Philip Rosedale
e32f9f387a Basic random eye movements added, and fixation on camera in mirror mode. 2013-06-13 13:50:56 -07:00
ZappoMan
40c2cf2d44 removed some dead code 2013-06-13 13:31:26 -07:00
ZappoMan
8320925add Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-13 13:30:18 -07:00
ZappoMan
abb08e2482 handle out of view points 2013-06-13 13:30:04 -07:00
Andrzej Kapolka
11fcd8f72f Merge pull request #534 from ey6es/master
Fix for voxel server (etc.) not connecting.
2013-06-13 13:17:43 -07:00
Andrzej Kapolka
b57a78c414 Another fix: using strlen to determine the length of the packet is... unwise.
Remember the length when we create it.  This should fix the voxel server's not
appearing.
2013-06-13 13:15:08 -07:00
Andrzej Kapolka
78072fbde0 Merge pull request #523 from PhilipRosedale/master
Better physics, first person to third person transition
2013-06-13 12:07:06 -07:00
Philip Rosedale
b85f91a7d4 fixes per code review 2013-06-13 12:05:06 -07:00
Philip Rosedale
c8b2cc87bc Merge pull request #533 from ey6es/master
Converted double timestamps to 64-bit integers, fixed bug in domain server (was faiing to update timestamps).
2013-06-13 11:38:40 -07:00
Philip Rosedale
d517487d1b OK I wanted us to jump just a bit higher. 2013-06-13 11:35:36 -07:00
Philip Rosedale
7ed6cc18d9 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-13 11:31:52 -07:00
Philip Rosedale
61b1a2f995 First person to third person transition driven by velocity, changes to make moving and flying physics more fun. 2013-06-13 11:31:41 -07:00
Andrzej Kapolka
db729a04aa Converted double timestamps to long long (64 bit integers), fixed bug with
updating agent timestamps.
2013-06-13 11:11:59 -07:00
ZappoMan
72b2845178 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-13 09:40:45 -07:00
Philip Rosedale
c0ba2aeebe Added jumping, tuned friction model, tuned thrust 2013-06-12 23:45:59 -07:00
ZappoMan
3a33d871e8 some debug code 2013-06-12 21:46:22 -07:00
ZappoMan
b8e51943ab make sure position is in voxel units NOT TREE_SCALE 2013-06-12 21:45:45 -07:00
ZappoMan
0f234d739e remove Camera menu from frustum debugging, because its obsolete and only causes problems 2013-06-12 21:44:49 -07:00
Philip Rosedale
a5a0df09cb removed grab voxel rendering 2013-06-12 16:36:55 -07:00