Andrew Meadows f3f1539111 Splitting avatar collision check in two: vs hands and vs skeleton.		2014-01-30 09:28:21 -08:00
..
audio	Missing includes.	2014-01-29 13:47:13 -08:00
avatars	Splitting avatar collision check in two: vs hands and vs skeleton.	2014-01-30 09:28:21 -08:00
embedded-webserver	serve a 301 redirect when trailing slash is missing, closes #1712	2014-01-28 16:25:04 -08:00
metavoxels	packet header changes and beginning of conversion to QByteArray	2014-01-28 10:36:08 -08:00
octree	resolve conflicts on merge with upstream master	2014-01-29 12:23:06 -08:00
octree-server	cleanup Node types, closes #1726	2014-01-28 13:38:33 -08:00
particle-server	cleanup Node types, closes #1726	2014-01-28 13:38:33 -08:00
particles	Splitting avatar collision check in two: vs hands and vs skeleton.	2014-01-30 09:28:21 -08:00
script-engine	resolve conflicts on merge with upstream master	2014-01-29 12:23:06 -08:00
shared	Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction	2014-01-29 14:12:22 -08:00
voxel-server	cleanup Node types, closes #1726	2014-01-28 13:38:33 -08:00
voxels	cleanup Node types, closes #1726	2014-01-28 13:38:33 -08:00