Atlante45 79b9a898de Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating		2015-01-12 17:34:13 -08:00
..
animation	Set different caches size depending on cache type	2015-01-12 15:36:36 -08:00
audio	Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating	2015-01-12 16:42:35 -08:00
avatars	Clement doesn't know how to use radians	2015-01-09 14:31:34 -08:00
embedded-webserver	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
entities	Merge pull request #4086 from huffman/std-to-qstring	2015-01-12 16:19:28 -08:00
entities-renderer	remove lock at EntityTreeRenderer::loadEntityScript	2015-01-11 10:44:36 -08:00
environment	more voxel-ectomy cleaning up some remaining references to voxels	2015-01-06 09:27:48 -08:00
fbx	Update std::string instances to QString	2015-01-09 16:22:52 -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	Set different caches size depending on cache type	2015-01-12 15:36:36 -08:00
model	FIx typos	2014-12-22 15:44:46 -08:00
networking	Remove glm dependency	2015-01-12 17:00:39 -08:00
octree	Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy	2014-12-31 10:50:53 -08:00
physics	remove some TODO comments	2015-01-09 09:28:01 -08:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating	2015-01-12 17:34:13 -08:00
script-engine	Hopefully fixes the windows compile error	2015-01-12 17:34:07 -08:00
shared	Hopefully fixes the windows compile error	2015-01-12 17:34:07 -08:00