Commit graph

287 commits

Author SHA1 Message Date
ZappoMan
51f07cad88 removed some debug 2013-12-12 17:56:56 -08:00
ZappoMan
f94e000e6b Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions 2013-12-12 17:52:33 -08:00
ZappoMan
5830f1134e add particle collisions with voxels 2013-12-12 17:52:22 -08:00
Andrzej Kapolka
17b2ee6984 Fix for obnoxious C++0x warning in GCC. 2013-12-12 16:46:17 -08:00
ZappoMan
18cbb2d00f particle tree pruning on update 2013-12-12 15:09:30 -08:00
ZappoMan
d3197ef8f9 fix crash, and remove gravity while in hand 2013-12-12 13:54:36 -08:00
ZappoMan
50b93d1e2b added easy access to creating a ParticleEditHandle for a know particle ID 2013-12-12 12:40:38 -08:00
ZappoMan
cd830efdd4 fixed typo 2013-12-12 12:26:12 -08:00
ZappoMan
1a6f730659 add findClosestParticle() 2013-12-12 12:24:07 -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
5d9b7c7f75 change toy ball to use ParicleEditHandle class 2013-12-12 10:26: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
1225e20fad fix flashy particles caused by server deleting octree elements while particles still exist 2013-12-11 09:54:30 -08:00
ZappoMan
03e892d4fd make shootParticle() work better 2013-12-10 17:42:55 -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
d65479406c only render particle elements that are in view 2013-12-10 14:22:52 -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
2ca628fdf1 first cut at particle renderer cleanup particle jurisdiction listener fix storage of particles 2013-12-09 11:45:32 -08:00
ZappoMan
ebb0a792a3 particle scripting 2013-12-06 15:57:11 -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
ZappoMan
aec0e9f4aa added basic particle server renamed voxel packet names to fit standard 2013-12-04 21:00:00 -08:00
ZappoMan
3ca7dc7196 added CMakeLists.txt 2013-12-04 20:19:49 -08:00
ZappoMan
2119f0da7d Merge branch 'master' of https://github.com/worklist/hifi into more_on_particle_server
Conflicts:
	libraries/particle-server/CMakeLists.txt
	libraries/particle-server/src/ParticleServer.h
	libraries/particles/src/ParticleTree.cpp
2013-12-04 13:27:44 -08:00
ZappoMan
37466251d4 added some scripts, latest particle server work 2013-12-04 13:25:50 -08:00
ZappoMan
c24e32ce06 basic ParticleTree and ParticleTreeElement classes 2013-12-04 12:32:46 -08:00
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00