Andrzej Kapolka 003d2f031a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels		2014-10-23 16:15:11 -07:00
..
animation	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
audio	Fix header	2014-10-20 17:23:58 -07:00
avatars	don't erase from the AvatarHashMap on the wrong thread	2014-10-22 17:35:28 -07:00
embedded-webserver	Replacing glutSolidSphere by a cached Geometry	2014-10-03 16:55:58 -07:00
entities	wire up collision signals	2014-10-13 14:36:06 -07:00
fbx	Merge pull request #3623 from ey6es/master	2014-10-20 09:00:06 -07:00
metavoxels	More gradual improvements to heightfield voxelization.	2014-10-23 16:01:51 -07:00
networking	bump audio version number	2014-10-23 09:28:48 -07:00
octree	group materials together when rendering models	2014-10-16 14:05:35 -07:00
script-engine	Merge pull request #3636 from Atlante45/reverb	2014-10-22 21:51:57 -07:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles	2014-10-16 20:36:28 -07:00
voxels	Removed redundant TREE_SCALE declaration	2014-10-09 11:48:41 -07:00