Andrew Meadows 85fd1fc14f merge andrew/thermonuclear into andrew/inertia ... Conflicts: interface/src/Application.cpp libraries/entities/src/EntityItem.cpp		2014-12-18 13:46:06 -08:00
..
animation	DM users update	2014-12-16 15:32:11 -08:00
audio	Fixes for missing audio device.	2014-12-15 22:41:35 -08:00
avatars	moving Shape* back into shared lib	2014-12-01 16:03:14 -08:00
embedded-webserver	Replacing glutSolidSphere by a cached Geometry	2014-10-03 16:55:58 -07:00
entities	merge andrew/thermonuclear into andrew/inertia	2014-12-18 13:46:06 -08:00
entities-renderer	fixing derived classes to use new EntityItem API	2014-12-18 11:41:20 -08:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-12-10 15:23:27 -08:00
gpu	more Application dependency cleanup	2014-12-17 11:10:24 -08:00
metavoxels	Rather than reducing rate on first drop, wait until three consecutive packets	2014-12-09 12:14:21 -08:00
networking	Fix for crash on exit due to cache references' not being cleared.	2014-12-15 16:36:26 -08:00
octree	Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia	2014-12-15 14:46:46 -08:00
physics	remove test hack for higher than normal ground	2014-12-17 14:17:30 -08:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into librarization	2014-12-17 13:16:11 -08:00
script-engine	removed dead code	2014-12-17 13:23:12 -08:00
shared	merge andrew/thermonuclear into andrew/inertia	2014-12-18 13:46:06 -08:00
voxels	OctreeServer::createTree() is now protected	2014-12-02 11:13:37 -08:00