Andrew Meadows c61f071ab7 merge of latest upstream work in preparation for pull request #1500 ... Conflicts: libraries/particles/src/ParticleCollisionSystem.cpp		2014-01-10 17:03:45 -08:00
..
audio	fix reference to downloaded byte array samples	2014-01-05 17:41:33 -08:00
avatars	Merge pull request #1492 from stojce/19466	2014-01-10 11:19:43 -08:00
metavoxels	merge pull request 1446	2014-01-10 15:55:38 -08:00
octree	more cast coding standard fixes	2014-01-09 19:00:57 -08:00
octree-server	fix bug in Octree server that wasn't properly surpressing duplicate packets	2014-01-09 19:13:17 -08:00
particle-server	removed some debugging	2013-12-12 11:07:13 -08:00
particles	merge of latest upstream work in preparation for pull request #1500	2014-01-10 17:03:45 -08:00
script-engine	use ScriptEngine in Particle::collideWithXXX() methods so that we get all script interfaces	2014-01-04 03:16:47 -08:00
shared	merge of latest upstream work in preparation for pull request #1500	2014-01-10 17:03:45 -08:00
voxel-server	attempt to fix build buster	2013-12-04 21:29:25 -08:00
voxels	first cut at local voxel cache	2014-01-09 12:05:09 -08:00