Stephen Birarda e72b86059e Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel		2014-10-17 14:48:43 -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	repair NetworkAccessManager returns, handle custom AS port in assignment-client	2014-10-06 14:57:38 -07:00
embedded-webserver	Replacing glutSolidSphere by a cached Geometry	2014-10-03 16:55:58 -07:00
entities	add boundingBox.dimensions to entity properties	2014-10-10 17:10:27 -07:00
fbx	group materials together when rendering models	2014-10-16 14:05:35 -07:00
metavoxels	Apply alpha restrictions when we apply the edit.	2014-10-13 16:01:38 -07:00
networking	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel	2014-10-17 14:48:43 -07:00
octree	group materials together when rendering models	2014-10-16 14:05:35 -07:00
particles	first cut at getting entities to collide	2014-09-24 15:28:04 -07:00
script-engine	added Vec3.orientedAngle()	2014-10-09 17:35:58 -07:00
shared	Merge pull request #3599 from ZappoMan/frustumCullModelParts	2014-10-15 11:56:00 -07:00
voxels	Removed redundant TREE_SCALE declaration	2014-10-09 11:48:41 -07:00