Andrzej Kapolka e10ab8d546 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels		2014-01-28 15:10:34 -08:00
..
audio	remove notion of owning node from NodeData	2014-01-23 17:06:03 -08:00
avatars	Adding avatars back into ParticleCollisionSystem.	2014-01-28 14:16:34 -08:00
embedded-webserver	Compile fixes (perhaps just for my version of Qt/GCC).	2014-01-20 11:41:04 -08:00
metavoxels	Handle the case of completely identical data.	2014-01-27 17:16:02 -08:00
octree	Fix for AABox::touches(otherBox)	2014-01-27 17:51:05 -08:00
octree-server	remove notion of owning node from NodeData	2014-01-23 17:06:03 -08:00
particle-server	remove notion of owning node from NodeData	2014-01-23 17:06:03 -08:00
particles	Adding avatar info back into ParticleCollisionSystem ctor arguments.	2014-01-28 14:43:36 -08:00
script-engine	added findParticles() to JS api	2014-01-24 12:36:06 -08:00
shared	Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions	2014-01-27 18:05:39 -08:00
voxel-server	remove notion of owning node from NodeData	2014-01-23 17:06:03 -08:00
voxels	clear particles when switching domains	2014-01-24 11:07:27 -08:00