8 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	be79101a93	Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings	2015-10-06 15:20:37 -07:00
Eric Levin	0afaf84e2a	Merge pull request #5979 from imgntn/ping_pong_gun ... [Script] Updates to Ping Pong Gun	2015-10-06 09:47:53 -07:00
James B. Pollack	8cd549c958	adjust chair and plant starting positions	2015-10-05 14:02:24 -07:00
James B. Pollack	65ae811c9c	make ping pong balls bigger and slower, change out gun model and adjust tip calculations, increase volume, add to master reset script	2015-10-05 11:16:55 -07:00
James Pollack	01044e3c05	adjust gun dimensions in toybox master script	2015-10-02 15:57:46 -07:00
Brad Hefta-Gaub	02536a5ab9	remove animationSettings from particles, add isEmitting	2015-10-02 14:17:01 -07:00
ericrius1	b595d916b6	fixed spacing issue	2015-10-02 11:10:08 -07:00
ericrius1	4dd2cf9cf5	Moved master reset script into new directory called unpublished scripts and changed relative pathing	2015-10-02 11:09:43 -07:00

Renamed from examples/toys/masterReset.js (Browse further)