12 commits

Author	SHA1	Message	Date
Stephen Birarda	2aaa9ce3f6	resolve conflicts on merge with upstream master	2014-01-28 12:30:43 -08:00
Stephen Birarda	4103cc1cde	packet header changes and beginning of conversion to QByteArray	2014-01-28 10:36:08 -08:00
ZappoMan	0b871c80c3	added Particles.getParticleProperties() to JS	2014-01-24 12:56:36 -08:00
ZappoMan	bcaafb25f0	added findParticles() to JS api	2014-01-24 12:36:06 -08:00
Brad Hefta-Gaub	b9ccd28428	removed some debug code	2014-01-22 14:35:38 -08:00
Brad Hefta-Gaub	85363f6603	Merge branch 'master' of git://github.com/worklist/hifi into juridiction_improvements	2014-01-22 14:23:00 -08:00
Brad Hefta-Gaub	6e9e21051d	first cut at move JurisdicionListener and JuridictionSender into non-mulitply derived classes	2014-01-22 14:05:31 -08:00
Brad Hefta-Gaub	90c841ff01	add findClosestParticle() to JS interface	2014-01-21 14:29:20 -08:00
Brad Hefta-Gaub	d831f9df5e	first cut at using partial property info in particle edits	2014-01-20 16:34:45 -08:00
Brad Hefta-Gaub	a7fd1e4565	first cut at having particle JS api return ParticleID types	2014-01-17 16:50:56 -08:00
Brad Hefta-Gaub	1e0f1adb16	added lifetime to particles	2014-01-17 14:59:40 -08:00
ZappoMan	651d2d0c81	rename voxels and particles scripting interfaces	2013-12-31 09:41:35 -08:00

Renamed from libraries/particles/src/ParticleScriptingInterface.h (Browse further)