Atlante45 1c4903c346 Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix		2015-01-08 16:33:01 -08:00
..
animation	clamp frame index between 0 and 100,000	2014-12-29 21:07:04 -08:00
audio	resolve conflicts on merge, add cstring inc	2015-01-05 09:25:30 -08:00
avatars	change message size	2015-01-08 11:51:14 -08:00
embedded-webserver	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
entities	fix deleteEntity() to actually delete result	2015-01-08 12:42:16 -08:00
entities-renderer	Merge branch 'master' of https://github.com/highfidelity/hifi into tot	2015-01-05 13:23:14 -08:00
environment	more voxel-ectomy cleaning up some remaining references to voxels	2015-01-06 09:27:48 -08:00
fbx	more voxelEctomy	2014-12-30 19:58:04 -08:00
gpu	fixed pointers which were using 0 instead of NULL and syntax in resource.h	2014-12-22 11:20:04 -08:00
metavoxels	Scale back on first dropped packet, use Qt send/receive buffer size options	2014-12-30 12:30:38 -08:00
model	FIx typos	2014-12-22 15:44:46 -08:00
networking	Bump AvatarData packet number	2015-01-08 11:49:39 -08:00
octree	Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy	2014-12-31 10:50:53 -08:00
physics	merge upstream/master into andrew/inertia	2015-01-08 10:24:05 -08:00
render-utils	removed renderTriangleProxies	2015-01-06 16:01:06 -08:00
script-engine	resolve conflicts on merge with upstream master	2015-01-05 14:40:48 -08:00
shared	resolve conflicts on merge with upstream master	2015-01-05 14:40:48 -08:00