39 commits

Author	SHA1	Message	Date
Andrew Meadows	f78b7cda6f	Merge pull request 1435 into https://github.com/worklist/hifi 'master' ... Conflicts: libraries/particles/src/ParticleCollisionSystem.cpp	2014-01-02 13:01:45 -08:00
Andrew Meadows	5843c745cb	minor formatting and code standard enforcement to Particle.*	2014-01-02 09:30:14 -08:00
ZappoMan	48b2d7d3fa	scripting for particle to voxel collisions	2013-12-31 11:33:43 -08:00
ZappoMan	651d2d0c81	rename voxels and particles scripting interfaces	2013-12-31 09:41:35 -08:00
ZappoMan	5057517b78	pass scriptable particle on collisions	2013-12-30 16:35:58 -08:00
ZappoMan	8e6f924c73	add access to Voxels and Particles inside of collision scripts	2013-12-30 15:48:50 -08:00
ZappoMan	f4b28041fa	first cut at running scripts on particle collisions	2013-12-30 14:59:00 -08:00
ZappoMan	d71bc248f4	support adjusting particles based on clockSkew	2013-12-19 14:49:58 -08:00
ZappoMan	864fc10d3a	debug cleanup and change to Particle::update() to handle clock skew slightly better	2013-12-19 10:39:42 -08:00
ZappoMan	b48161ae26	cleanup debug	2013-12-19 09:59:36 -08:00
ZappoMan	e2b7e08398	revert back to timestamps, fix a couple other bugs	2013-12-19 09:50:53 -08:00
ZappoMan	d430558ea9	fix expectedBytes() mismatch between edit packets and normal packets	2013-12-18 21:08:34 -08:00
ZappoMan	95df772707	make really old 30 seconds not 300	2013-12-18 19:36:34 -08:00
ZappoMan	5b36953e81	cleanup clockSkew debug options and remove some chatty logs	2013-12-18 19:33:52 -08:00
ZappoMan	920ef65ccb	removed _lastedEdited changed to editedAgo	2013-12-18 19:01:42 -08:00
ZappoMan	c68a226094	removing of created timestamp from wire format, still supports lifetime	2013-12-18 17:43:48 -08:00
ZappoMan	1badc8dc5d	first pass at removing timestamps from particles removed _lastUpdated/getLastUpdated()	2013-12-18 16:59:36 -08:00
ZappoMan	11a5ff2eb8	added edited times to particles and don't change local tree if particle has not been edited	2013-12-17 12:39:35 -08:00
ZappoMan	8f1fbec057	added versioning to SVO files and Particle inHand support	2013-12-16 19:49:22 -08:00
ZappoMan	524a41468c	multiple scripts running at same time, menu interface for scripts	2013-12-16 09:16:51 -08:00
ZappoMan	e2fbb7beb4	first cut at splitting out scripting engine from agent to add to client	2013-12-14 08:14:38 -08:00
ZappoMan	aaf4ff7dfc	added lifetime to particles	2013-12-13 14:30:29 -08:00
ZappoMan	d3197ef8f9	fix crash, and remove gravity while in hand	2013-12-12 13:54:36 -08:00
ZappoMan	bc80862825	removed some debugging	2013-12-12 11:07:13 -08:00
ZappoMan	e1b3b9d967	fixed indent, added some damping debugging	2013-12-12 10:59:28 -08:00
ZappoMan	5ec8de1bf3	have ParticleEditHandle update local tree as well	2013-12-12 10:41:55 -08:00
ZappoMan	4acadabaa5	adding better support for ParticleEditHandle to allow access to particles after being created	2013-12-11 17:46:18 -08:00
ZappoMan	03c72134cb	first cut at creatorTokenIDs for creating particles	2013-12-11 15:38:52 -08:00
ZappoMan	ae1576b9f5	CR cleanup and add shootParticle() to application	2013-12-10 17:07:11 -08:00
ZappoMan	542019a491	add script to the particle wire and disk format	2013-12-10 15:28:59 -08:00
ZappoMan	ba9a113720	added gravity, damping, and shouldDie behavior to particles	2013-12-10 12:53:42 -08:00
ZappoMan	7a828794be	more work with particles added javascript support to particle update	2013-12-10 11:27:18 -08:00
ZappoMan	99e3a58a68	more work on update	2013-12-09 16:33:12 -08:00
ZappoMan	68a51f5205	added update to particle	2013-12-09 15:34:52 -08:00
ZappoMan	2783770e2b	got particles sending from server to client and rendering	2013-12-09 13:29:44 -08:00
ZappoMan	91ffb5b167	added node type to jurisdiction messages and more work on particle editing	2013-12-06 15:56:51 -08:00
ZappoMan	426c89b639	First cut at new ParticleEditPacketSender class	2013-12-05 18:00:56 -08:00
ZappoMan	072ced0185	first cut at PACKET_TYPE_PARTICLE_ADD implementation	2013-12-05 15:38:36 -08:00
ZappoMan	86ffbc3d33	first pass at adding actual particles to the ParticleTree	2013-12-05 12:07:52 -08:00