208 commits

Author	SHA1	Message	Date
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 B. Pollack	588a256304	Merge branch 'master' into ping_pong_gun	2015-10-05 10:54:21 -07:00
James Pollack	1ff5f11e29	merge	2015-10-02 15:56:39 -07:00
James Pollack	9427ba1a5a	ping pong gun	2015-10-02 15:56:26 -07:00
ericrius1	0497de47ea	No longer removing non-existent entities from spray paint can; color tweaks to paint stream	2015-10-02 12:40:14 -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
James Pollack	c6fa132dc2	cleanup	2015-10-02 10:44:26 -07:00
James Pollack	82828fdd14	reduce gravity and gun force so ball goes through less objects	2015-10-02 10:41:49 -07:00
ericrius1	f6c888599e	Fixed a bug where particles weren't moving with can.	2015-10-02 10:22:48 -07:00
ericrius1	9f5a3066b8	changed masterResetEntity back to masterReset	2015-10-02 10:07:43 -07:00
ericrius1	71fe9b216c	Removed extraneous masterReset script, and extra call to lightSwitches in correct script	2015-10-02 10:02:28 -07:00
ericrius1	a6df6c53f1	fixed more syntax errors	2015-10-02 09:55:41 -07:00
ericrius1	36f7bba87e	Fixed some syntax errors, tweaked cat script so doesn't meow while it's already meowing	2015-10-02 09:53:30 -07:00
James B. Pollack	a3c91b12b9	Update cat.js	2015-10-01 18:56:38 -07:00
James B. Pollack	0ce6a305bd	Update cat.js	2015-10-01 18:52:08 -07:00
James Pollack	6131875f67	set whichhand to null on release	2015-10-01 18:49:07 -07:00
James B. Pollack	d0e079ee9d	Update cat.js ... add globals, lint the code	2015-10-01 18:46:32 -07:00
James B. Pollack	55d20e9d4c	Update cat.js	2015-10-01 18:41:24 -07:00
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
James Pollack	7f841b3828	prevent most other-hand accidental firing	2015-10-01 17:55:47 -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