114 commits

Author	SHA1	Message	Date
ericrius1	baf4777750	Can now hold spray paint can without painting unless squeezing hard	2015-09-24 17:13:45 -07:00
ericrius1	c2f1141d69	fix cat script	2015-09-24 16:40:20 -07:00
ericrius1	5ba8f15d9f	test	2015-09-24 16:32:01 -07:00
ericrius1	ce0a726eb9	Fixed spraypaint for new particles	2015-09-24 16:27:17 -07:00
Brad Hefta-Gaub	c75284ccde	Merge pull request #5891 from imgntn/doll_updates_1 ... [Scripts] Doll Updates	2015-09-24 15:58:57 -07:00
James Pollack	bc6a0c08f9	Fix merge conflict	2015-09-24 15:29:44 -07:00
James Pollack	49d3b7e93b	fix indentation	2015-09-24 15:26:19 -07:00
James Pollack	83a8636a36	Remove whitespace, batch entity edits	2015-09-24 14:49:28 -07:00
ericrius1	5da8b689c5	fix missing commas	2015-09-24 14:41:22 -07:00
ericrius1	4eb76b47a9	Merge remote-tracking branch 'origin/toybox' into toybox ... Conflicts: examples/toys/masterResetEntity.js	2015-09-24 14:40:18 -07:00
ericrius1	536adf8981	testing paintcan	2015-09-24 14:39:11 -07:00
James Pollack	c1f8cbd1a3	Remove space before function calls, add spaces before functions	2015-09-24 14:07:15 -07:00
ericrius1	16f9140a08	updated master script so objects with fewer properties are on one line	2015-09-24 14:04:37 -07:00
ericrius1	203af7cbba	Merge branch 'master' into toybox	2015-09-24 12:03:21 -07:00
ericrius1	8609769c20	cat now listens for touch event from controller	2015-09-24 11:58:54 -07:00
ericrius1	1e1cfb6aae	Flipped lights so up is lights on and vica versa	2015-09-24 10:15:50 -07:00
Brad Hefta-Gaub	ba73acf3b4	Merge pull request #5843 from ctrlaltdavid/20681 ... Replace point and vector particle emitter with spheroid emitter	2015-09-24 08:19:49 -07:00
James Pollack	7efd15c3a2	Update doll to stop screaming when released, use only one hand a a time, spatialize audio position	2015-09-23 18:01:18 -07:00
James Pollack	82f178a353	tweaks	2015-09-23 17:43:08 -07:00
ericrius1	81c175eabf	toggle light switch	2015-09-23 17:34:37 -07:00
ericrius1	153a30de0d	flip	2015-09-23 17:24:56 -07:00
ericrius1	d0b5d62bb7	Updated master script to make jslint happy	2015-09-23 16:21:36 -07:00
ericrius1	a1dccc2a92	Changed cat position	2015-09-23 16:13:31 -07:00
Thijs Wenker	6bb873d327	createFlashlight.js - Close script after running ... Close the createFlashlight.js script after running once to prevent a flashlight from being created each time you start Interface	2015-09-24 00:43:50 +02:00
ericrius1	276b0b71cb	Added tin can to master script and changed its position	2015-09-23 14:52:59 -07:00
ericrius1	a2b0e66e13	Sound working for spraypaint	2015-09-23 13:36:00 -07:00
ericrius1	2c20a12f13	refactoring spraypaint to use new events	2015-09-23 13:34:21 -07:00
James Pollack	6b468ee87b	Add the doll	2015-09-23 13:10:25 -07:00
ericrius1	b0923acc2f	Reorg for pathing	2015-09-23 12:34:10 -07:00
ericrius1	6bd89f9689	Toys re-org	2015-09-23 12:22:18 -07:00
David Rowe	eb01ba9812	Merge branch 'master' into 20681	2015-09-23 09:42:56 -07:00
Brad Hefta-Gaub	3fe4de4511	Merge pull request #5751 from imgntn/bubblewand_hotfix_2 ... Bubble Wand	2015-09-22 20:35:58 -07:00
James Pollack	fa1d5be310	Reduce volume, JSLint, Coding standards	2015-09-22 18:20:23 -07:00
James Pollack	3e3d7a8bfa	JS Linting and Coding Standards	2015-09-22 18:12:51 -07:00
James Pollack	1e09c2501c	This updates the flashlight to have sounds when it turns on and off	2015-09-22 14:21:14 -07:00
James Pollack	561b4ca8e1	Remove update loop refs, remove unload method	2015-09-22 12:52:24 -07:00
James Pollack	e5c42c76a2	Remove update loop refs	2015-09-22 12:41:00 -07:00
James Pollack	0ad238a508	Enlarge flashlight	2015-09-22 12:39:48 -07:00
James B. Pollack	bf22d5a942	dont delete wand at cleanup from createWand.js	2015-09-21 17:43:05 -07:00
James B. Pollack	f8d743aff0	Update to use new grab methods, only specifically request properties that we are actually using	2015-09-21 17:38:49 -07:00
James B. Pollack	81358b7f14	wand changes	2015-09-21 17:01:31 -07:00
James B. Pollack	cd6ad306ac	start transitioning to new grab methods	2015-09-21 16:45:23 -07:00
James B. Pollack	d79c1bec95	remove query string	2015-09-21 16:13:24 -07:00
James B. Pollack	fd67a2b86f	Add on/off by pressure; add point bulb to end of flashlight	2015-09-21 16:10:08 -07:00
James B. Pollack	f3eef9322c	Remove toybox reference in spawner script	2015-09-21 11:10:42 -07:00
James B. Pollack	c2a2abe615	Remove nested bubble entities and related code	2015-09-21 11:05:51 -07:00
James B. Pollack	ccf125c047	Cleanup comments	2015-09-18 15:40:39 -07:00
James B. Pollack	c364189bc8	Update file header	2015-09-18 15:26:34 -07:00
James B. Pollack	dc17985e29	Add some logic for turning off the flashlight when squeeze trigger pressure is low, and turning it back on when squeeze pressure goes over certain amount	2015-09-18 15:24:44 -07:00
James B. Pollack	a897c17eb2	Remove grab-frame and reset position code	2015-09-18 14:31:40 -07:00