818 commits

Author	SHA1	Message	Date
Eric Levin	f01d4dde42	Merge pull request #6003 from imgntn/basketball_rack ... [Scripts] Basketball rack	2015-10-07 10:59:20 -07:00
James B. Pollack	7aab34975f	code quality	2015-10-06 17:08:51 -07:00
Brad Hefta-Gaub	0e5f4bc4c9	Merge pull request #5983 from ericrius1/lightFixes ... Light fixes in toybox	2015-10-06 17:02:17 -07:00
James B. Pollack	4788480186	reset balls if they move too far	2015-10-06 16:48:34 -07:00
Brad Hefta-Gaub	be79101a93	Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings	2015-10-06 15:20:37 -07:00
James B. Pollack	a37da41253	spell basketball rack correctly	2015-10-06 13:15:35 -07:00
James B. Pollack	5f2112b8a5	finish rack and add to master script, reorganize all bball related scripts	2015-10-06 11:28:36 -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
ericrius1	1ac1fcaf69	Light switches work properly now; no extra lights	2015-10-02 16:17:54 -07:00
ericrius1	e6e60e5e7a	Lights should now only be created once at start of running reset master script, no matter how many people there are in the room	2015-10-02 15:58:32 -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	4b62048fb1	more light changes	2015-10-02 12:12:36 -07:00
ericrius1	0d599458e6	Merged from toybox	2015-10-02 11:34:07 -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