7 commits

Author	SHA1	Message	Date
ZappoMan	a54e401377	Merge branch 'master' of https://github.com/worklist/hifi into particle_collions_penetration ... Conflicts: libraries/script-engine/src/Vec3.cpp	2014-03-05 18:04:57 -08:00
ZappoMan	d89cb2bf5e	added penetration support to particle collisions JS callbacks	2014-03-05 15:03:54 -08:00
ZappoMan	374af9eeb5	first cut at flocking birds, change willEmitVisualCallback to update	2014-03-04 14:40:49 -08:00
Stephen Birarda	9015b24aa5	update the script examples for new nomenclature	2014-01-31 14:41:24 -08:00
ZappoMan	08b06cc59c	support for global collision callbacks in JS	2014-01-29 17:52:17 -08:00
Brad Hefta-Gaub	c3b681786a	make particles and voxels JS APIs all operate on meters not domain units	2014-01-22 11:12:52 -08:00
Philip Rosedale	7f09aff297	Added voxelBird example script	2014-01-14 17:12:14 -08:00