158 commits

Author	SHA1	Message	Date
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
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
ericrius1	c03a9ddd58	Added fire to master script	2015-09-30 11:14:18 -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
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
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
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
ericrius1	04d797e964	paint can	2015-09-28 17:59:42 -07:00
ericrius1	3f83d5a99a	Animation playing for doll, but looping	2015-09-28 17:14:35 -07:00
ericrius1	d47f938f8d	blocks	2015-09-28 17:05:58 -07:00
ericrius1	afcd59a549	Moved cat to stool	2015-09-28 17:04:03 -07:00
ericrius1	a21530282b	logging frame	2015-09-28 16:56:46 -07:00
ericrius1	5e28462e2a	testing doll animation	2015-09-28 16:51:23 -07:00
James Pollack	f79414649e	add gravity to fences	2015-09-28 15:57:53 -07:00
James Pollack	09a53d553a	Add fences to Toybox master script, add gravity to bubble wand	2015-09-28 15:55:25 -07:00
ericrius1	45281f8aae	modified spraypaint can to spray out particles but no paint	2015-09-28 10:34:03 -07:00
ericrius1	660490d754	removed magBalls	2015-09-28 10:29:12 -07:00
ericrius1	bab3c6fcf2	adjust lastFrame	2015-09-28 09:31:11 -07:00
ericrius1	bcd2171491	updated chair model	2015-09-25 16:28:12 -07:00
ericrius1	534cffcf85	fixed animation bug with doll	2015-09-25 16:23:35 -07:00
ericrius1	e94d9b39fd	made pots and chair not grabbable	2015-09-25 15:42:13 -07:00
ericrius1	c53ad3c534	combined arm chair	2015-09-25 12:34:35 -07:00
ericrius1	f5e44675bb	removed start and end frame	2015-09-25 12:11:22 -07:00
ericrius1	65169da64d	removed old doll script	2015-09-25 11:58:05 -07:00
ericrius1	ccc6a343fc	updated lights to use newly named grab events	2015-09-25 11:49:51 -07:00
ericrius1	7789d8b3a8	fixed potted plant bug	2015-09-25 11:37:04 -07:00
ericrius1	d29c337e95	moved light switches up	2015-09-25 11:32:41 -07:00
ericrius1	a629701362	couch	2015-09-25 11:15:19 -07:00
ericrius1	f4007584e1	formatted master script	2015-09-25 11:02:41 -07:00
ericrius1	0815b8e939	Added polar finish to spray paint stream	2015-09-25 10:59:20 -07:00
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