Brad Hefta-Gaub bc2830d0d3 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface ... Conflicts: libraries/particles/src/ParticleCollisionSystem.cpp		2014-01-20 10:55:34 -08:00
..
clap.js	new sounds for voxelBird, clap scripts	2014-01-17 16:43:43 -08:00
collidingParticles.js
count.js	added count example	2014-01-17 09:55:34 -08:00
fountain.js	added fountain script	2014-01-17 17:10:15 -08:00
gun.js	implement new setProperties() getProperties() for Particle to allow setting all properties at once using a JS hash	2014-01-17 16:02:58 -08:00
movingVoxel.js	Added voxelBird example script	2014-01-14 17:12:14 -08:00
paintGun.js	Added voxelBird example script	2014-01-14 17:12:14 -08:00
playSound.js	new sounds for voxelBird, clap scripts	2014-01-17 16:43:43 -08:00
voxelBird.js	new sounds for voxelBird, clap scripts	2014-01-17 16:43:43 -08:00