ZappoMan c3d1d13fa9 Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes		2014-10-29 11:56:27 -07:00
..
animation	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
audio	Cleanup	2014-10-24 15:02:09 -07:00
avatars	move stuff out of shared and into physics library	2014-10-28 13:51:45 -07:00
embedded-webserver	Replacing glutSolidSphere by a cached Geometry	2014-10-03 16:55:58 -07:00
entities	move sitting points back to a contained element to fix the crash Ryan was seeing	2014-10-29 10:13:48 -07:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes	2014-10-29 11:56:27 -07:00
metavoxels	Avoid killing the updater twice.	2014-10-27 15:04:03 -07:00
networking	Merge pull request #3661 from Atlante45/reverb_fixed	2014-10-28 18:11:14 -07:00
octree	Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes	2014-10-29 11:56:27 -07:00
physics	move stuff out of shared and into physics library	2014-10-28 13:51:45 -07:00
script-engine	Merge pull request #3679 from AndrewMeadows/inertia	2014-10-28 15:25:38 -07:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes	2014-10-29 11:56:27 -07:00
voxels	Removed redundant TREE_SCALE declaration	2014-10-09 11:48:41 -07:00