Stephen Birarda 659ba3c784 Merge branch 'master' of https://github.com/highfidelity/hifi		2014-01-17 16:52:16 -08:00
..
audio	Merge branch 'master' of git://github.com/worklist/hifi into windows_build	2014-01-15 10:20:21 -08:00
avatars	Hand now holds a ball a bit forward, which prevents the body from colliding with the ball on throw.	2014-01-17 16:36:50 -08:00
embedded-webserver	hook OctreeServer up to embedded-webserver	2014-01-17 14:21:15 -08:00
metavoxels	Merge branch 'master' of git://github.com/worklist/hifi into windows_build	2014-01-15 10:20:21 -08:00
octree	Fix GCC warning (string split across lines).	2014-01-16 14:24:19 -08:00
octree-server	hook OctreeServer up to embedded-webserver	2014-01-17 14:21:15 -08:00
particle-server	fix linking of webserver for octree-server	2014-01-17 14:27:24 -08:00
particles	Cleanup of "soft hand paddle" collision hackery. Still a hack, but more commented and readable.	2014-01-17 16:31:06 -08:00
script-engine	initial newline removal from all QDebug calls	2014-01-14 13:09:22 -08:00
shared	adding back log about mismatching packet type	2014-01-17 11:35:16 -08:00
voxel-server	fix linking of webserver for octree-server	2014-01-17 14:27:24 -08:00
voxels	Merge branch 'master' of git://github.com/worklist/hifi into windows_build	2014-01-15 10:20:21 -08:00