Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Working on streaming edits.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Adding AABox::touches(box)
Adding ParticleTreeElement::findParticles(box, QVector<Particles*>)
Adding ParticleTreeElement::findParticles(box, QVector<Particles*>)
Adding ParticleTree::findParticles(box, QVector<Particle*>) method
Working on sending edits.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Moving applyHardCollision to the Particle class.  Adding daming and elasticity to CollisionInfo.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
MetavoxelDataPointer -> MetavoxelData, grid spacing as power of 2.
Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions
Streaming fix.
more efficient ParticleTree::getParticles() and adding ParticleTree::getParticlesForUpdate()
implement local edits in ParticleScriptingInterface
first part of getting local particle tree in agent
tweaks to editParticle example