Andrew Meadows 961dc5a231 merge andrew/thermonuclear into andrew/inertia ... Conflicts: libraries/entities/src/EntityItem.cpp libraries/entities/src/EntityItem.h		2014-11-19 15:41:53 -08:00
..
animation	cleanup	2014-11-12 16:57:42 -08:00
audio	Give noisy mutes their own packet type	2014-11-17 10:26:47 -08:00
avatars	Default avatar fixes.	2014-11-14 13:02:02 -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-11-19 15:41:53 -08:00
fbx	Eliminate wacky scales in favor of newfangled "meters."	2014-11-14 12:23:47 -08:00
metavoxels	Removed unused variable, fixed painting materials on heightfields with greater	2014-10-30 18:05:40 -07:00
networking	connect to sandbox domain by default	2014-11-18 15:35:11 -08:00
octree	cleanup/optimization of Octree::readElementData()	2014-11-17 16:39:26 -08:00
physics	cleanup and moving things around	2014-11-19 15:31:17 -08:00
script-engine	avoid Qt QTimer thread bug by putting SoundCache on same thread	2014-11-13 14:47:28 -08:00
shared	fix comment for actual time format	2014-11-18 17:02:28 -08:00
voxels	fix a bug produced by not setting deleted var to NULL	2014-11-10 11:03:15 -08:00