Stephen Birarda d5b4e643c8 resolve conflicts on merge with upstream/master		2014-01-23 18:10:40 -08:00
..
Particle.cpp	set default particle lifetime to 10 seconds, make sure lifetime is always honored	2014-01-23 13:46:12 -08:00
Particle.h	set default particle lifetime to 10 seconds, make sure lifetime is always honored	2014-01-23 13:46:12 -08:00
ParticleCollisionSystem.cpp	resolve conflicts on merge with upstream/master	2014-01-23 18:10:40 -08:00
ParticleCollisionSystem.h	applyHardCollision() now takes a CollisionInfo rather than two vectors ("penetration" and "addedVelocity")	2014-01-17 17:14:57 -08:00
ParticleEditPacketSender.cpp	remove ParticleEditHandle, and change ParticleCollisionSystem to use new particle edit API	2014-01-22 15:21:58 -08:00
ParticleEditPacketSender.h	replace packetSenderNotify with signal/slot combo	2014-01-23 15:55:36 -08:00
ParticlesScriptingInterface.cpp	tweaks to JS particle editing api	2014-01-21 20:05:00 -08:00
ParticlesScriptingInterface.h	removed some debug code	2014-01-22 14:35:38 -08:00
ParticleTree.cpp	ok, one more shot at fixing particle-server crash	2014-01-23 13:01:07 -08:00
ParticleTree.h	fixed types	2014-01-22 14:09:39 -08:00
ParticleTreeElement.cpp	Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface	2014-01-21 20:21:22 -08:00
ParticleTreeElement.h	implemented support for PACKET_TYPE_PARTICLE_ERASE	2014-01-21 13:24:35 -08:00