Andrew Meadows 43f965c90a Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions		2014-01-29 09:25:00 -08:00
..
audio	remove notion of owning node from NodeData	2014-01-23 17:06:03 -08:00
avatars	fix for crash bug #1728.	2014-01-28 18:04:42 -08:00
embedded-webserver	serve a 301 redirect when trailing slash is missing, closes #1712	2014-01-28 16:25:04 -08:00
metavoxels	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-01-23 16:13:42 -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