Sam Gateau f09b58c255 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0		2014-11-14 10:05:01 -08:00
..
animation	cleanup	2014-11-12 16:57:42 -08:00
audio	only debug request sound if there is a network request	2014-11-13 16:18:19 -08:00
avatars	avoid Qt QTimer thread bug by putting SoundCache on same thread	2014-11-13 14:47:28 -08:00
embedded-webserver	Replacing glutSolidSphere by a cached Geometry	2014-10-03 16:55:58 -07:00
entities	Merge pull request #3792 from ZappoMan/bugFixes	2014-11-14 08:33:49 -08:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes	2014-10-29 11:56:27 -07:00
metavoxels	Removed unused variable, fixed painting materials on heightfields with greater	2014-10-30 18:05:40 -07:00
networking	Merge pull request #3790 from Atlante45/entities_userdata	2014-11-13 20:43:57 -08:00
octree	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-14 10:05:01 -08:00
physics	move stuff out of shared and into physics library	2014-10-28 13:51:45 -07:00
script-engine	avoid Qt QTimer thread bug by putting SoundCache on same thread	2014-11-13 14:47:28 -08:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-14 10:05:01 -08:00
voxels	fix a bug produced by not setting deleted var to NULL	2014-11-10 11:03:15 -08:00