Atlante45 5d146a00e7 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb ... Conflicts: interface/CMakeLists.txt		2014-10-16 15:21:34 -07:00
..
animation	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
audio	Merge branch 'master' of https://github.com/highfidelity/hifi into reverb	2014-10-14 15:13:50 -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	use OPENSSL_free to free DER private and public key buffers	2014-10-16 15:13:45 -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	remove deprecated _engine member from ScriptEngine	2014-10-14 15:17:31 -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