189 commits

Author	SHA1	Message	Date
James B. Pollack	59c1c7ee6a	Update masterReset.js ... remove file versioning	2015-10-01 18:40:12 -07:00
James B. Pollack	f200fcdfa2	Update cat.js	2015-10-01 18:35:34 -07:00
James B. Pollack	6cc2df9052	Update cat.js ... hook into isPlaying for sounds	2015-10-01 18:34:22 -07:00
James B. Pollack	3565d96ffb	Update sprayPaintCan.js ... add a header, cleanup	2015-10-01 18:21:15 -07:00
James B. Pollack	54a51e6b8b	Update and rename masterResetEntity.js to masterReset.js ... remove reference to 'entities' in the file name since this script does more than that. also update the header file.	2015-10-01 18:19:36 -07:00
James B. Pollack	6523a057a8	Update lightSwitchHall.js ... fix header file	2015-10-01 18:18:27 -07:00
James B. Pollack	cfb9728fdb	Update doll.js ... remove some unused code	2015-10-01 18:17:35 -07:00
James B. Pollack	9098585e2f	Update cat.js ... remove a lot of unused code and add flag for whether cat is already meowing so that it doesn't start another one until its done. unfortunately i dont know how to read the audio isplaying state so we have to use a lame timeout	2015-10-01 18:14:08 -07:00
James B. Pollack	b352ab4736	Update lightSwitchGarage.js ... fix header and spacing issues	2015-10-01 18:04:37 -07:00
ericrius1	d0be47bae9	fix merge	2015-10-01 17:22:12 -07:00
ericrius1	bf9a948ca9	Merge branch 'master' into toybox	2015-10-01 17:17:12 -07:00
ericrius1	407b6b8158	Fixed bug in spray paint where sometimes would not spray	2015-10-01 16:10:29 -07:00
ericrius1	0fb51a6777	got rid of unneeded light test code	2015-10-01 15:56:16 -07:00
ericrius1	cdb249c6ff	original master script	2015-10-01 15:53:28 -07:00
ericrius1	25e25726d5	only lights	2015-10-01 15:43:25 -07:00
James Pollack	8e2c1a6b17	Add ping pong ball gun, add basketball hoop, reduce gate gravity, lint code	2015-10-01 15:22:45 -07:00
Seth Alves	716ebf487f	Merge pull request #5952 from imgntn/ping_pong_gun ... [Scripts] Ping Pong Gun	2015-10-01 15:06:48 -07:00
James B. Pollack	4a7e3c66bd	Update createPingPongGun.js ... use relative paths	2015-10-01 15:05:25 -07:00
James Pollack	7bcb4e4ae3	Merge branch 'master' into ericrius1-toybox	2015-10-01 14:59:54 -07:00
ericrius1	55c6b9d9c4	Added collision sound to blocks	2015-10-01 14:57:03 -07:00
ericrius1	5aef7475d6	Sound position updates every frame based on new position of can	2015-10-01 14:42:51 -07:00
James Pollack	861aa91572	shoot out of the right end of the gun	2015-10-01 12:27:45 -07:00
James Pollack	c55d627e9b	Different model, different sounds, release interval	2015-09-30 16:12:27 -07:00
James Pollack	0865f94106	magic numbers	2015-09-30 11:31:33 -07:00
James Pollack	8bdf428f41	First version of ping pong gun	2015-09-30 11:21:51 -07:00
ericrius1	c03a9ddd58	Added fire to master script	2015-09-30 11:14:18 -07:00
James Pollack	ecad7f34f6	moar	2015-09-30 10:58:21 -07:00
James Pollack	99fbed6143	mostly working	2015-09-30 10:49:47 -07:00
James Pollack	c3dfea4712	initial files	2015-09-30 10:26:24 -07:00
ericrius1	00cab85a11	Removed whiteboard from reset script	2015-09-29 18:33:31 -07:00
ericrius1	259391a40b	Merge branch 'toybox' of https://github.com/ericrius1/hifi into toybox	2015-09-29 18:32:56 -07:00
Eric Levin	68615e171a	Update masterResetEntity.js	2015-09-29 17:40:05 -07:00
ericrius1	d8e7da7b73	added painting to whiteboard	2015-09-29 15:43:59 -07:00
James Pollack	b9a83be4d3	cleanup	2015-09-29 14:31:13 -07:00
ericrius1	7681d8d77d	fixed commenting	2015-09-29 14:05:57 -07:00
ericrius1	81c5d0c388	more whiteboard work	2015-09-29 13:57:17 -07:00
James Pollack	cbd55ddba6	Add the hoop	2015-09-29 13:24:49 -07:00
ericrius1	da16a6f55b	fixed merge	2015-09-29 13:02:00 -07:00
James Pollack	66ef92b659	thicker, heavier gates, wand collision shape	2015-09-29 12:52:34 -07:00
James Pollack	a58cf66f2e	wand adjustments	2015-09-29 11:07:21 -07:00
James Pollack	63c02712c1	add shape types	2015-09-29 10:52:54 -07:00
James Pollack	337909b539	actual model url	2015-09-29 10:47:32 -07:00
ericrius1	932f7ce92c	up to date	2015-09-29 10:39:07 -07:00
James Pollack	676c02c77e	file updates	2015-09-29 10:19:39 -07:00
ericrius1	1662471583	whiteboard changes	2015-09-29 10:16:44 -07:00
James Pollack	1ceefc3c63	add model key and url	2015-09-29 10:00:45 -07:00
ericrius1	8857042363	whiteboard	2015-09-29 09:46:49 -07:00
ericrius1	80405450ce	Paint can now just sprays out stream	2015-09-29 09:00:12 -07:00
James B. Pollack	4c86b1ce03	ballin	2015-09-28 18:47:32 -07:00
ericrius1	04d797e964	paint can	2015-09-28 17:59:42 -07:00