Philip Rosedale 246ff1614f Merge pull request #3645 from birarda/avatar-by-name ... fix for AvatarHashMap crash when erasing avatars		2014-10-22 17:43:44 -07:00
..
animation	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
audio	Removed Unattenuated zones from mixer	2014-10-09 14:46:32 -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	Reliable delta fix.	2014-10-21 15:48:53 -07:00
networking	Networking fix.	2014-10-20 15:33:46 -07:00
octree	group materials together when rendering models	2014-10-16 14:05:35 -07:00
script-engine	Merge pull request #3638 from huffman/entity-tools-updates	2014-10-22 17:40:21 -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