49 commits

Author	SHA1	Message	Date
James B. Pollack	ff2b5fc8da	with child glow box	2015-11-12 19:49:52 -08:00
James B. Pollack	7774f9096b	work	2015-11-12 12:31:53 -08:00
James B. Pollack	361a89ad46	redraw pre notch strings after firing	2015-11-12 11:32:25 -08:00
James B. Pollack	c719f25fb2	Merge branch 'master' into bow	2015-11-12 10:37:13 -08:00
James B. Pollack	2b8ad51b41	cleanup orientation of	2015-11-11 18:07:05 -08:00
James B. Pollack	595c628c39	it works!	2015-11-11 17:32:03 -08:00
Brad Hefta-Gaub	a721b13e46	Merge pull request #6364 from imgntn/cleanuptoybox ... Remove Bball and Targets AC Resetter Script from Toybox	2015-11-11 16:23:33 -08:00
James B. Pollack	9681145a1f	storage	2015-11-11 14:28:19 -08:00
James B. Pollack	b6bb54da32	Merge branch 'master' into bow	2015-11-10 15:30:50 -08:00
James B. Pollack	e7a2e82745	remove bball and targets resetter AC since we are doing this with hidden reset entities now	2015-11-10 13:58:07 -08:00
Ryan Huffman	08c2759947	Remove unused include in createTargets.js	2015-11-10 11:39:50 -08:00
Ryan Huffman	031a93cb0e	Fix utils include in createPingPongGun.js	2015-11-10 11:39:31 -08:00
Ryan Huffman	5f084730d9	Remove old includes in doll.js	2015-11-10 11:39:12 -08:00
Ryan Huffman	a264ed4795	Remove old includes in bubblewand	2015-11-10 11:38:57 -08:00
James B. Pollack	8fc702485b	werk	2015-11-09 14:39:30 -08:00
James B. Pollack	45ad2cce39	Merge branch 'master' into bow	2015-11-09 11:58:39 -08:00
James B. Pollack	b496240283	Merge branch 'master' into bow	2015-11-09 10:54:54 -08:00
James B. Pollack	ef7caa8da9	Add new collision hull and sound to ping pong gun	2015-11-09 10:48:12 -08:00
James B. Pollack	1d41ef868b	update bubblewand model refs	2015-11-06 13:11:06 -08:00
James B. Pollack	31b540ca38	mid test	2015-11-05 14:29:58 -08:00
James B. Pollack	87503ca4c6	Merge branch 'master' into bow	2015-11-05 11:00:51 -08:00
James B. Pollack	c898d9a474	set wantstrigger correctly on lightswitch	2015-11-05 10:48:16 -08:00
Seth Alves	4a3b434fd4	change grabbing-non-colliding to trigger. fix whiteboard and some other scripts	2015-11-05 10:35:02 -08:00
James B. Pollack	f0fbd67e93	merge	2015-11-03 13:00:25 -08:00
James B. Pollack	ad9cfbab50	end of day	2015-10-29 17:24:43 -07:00
James B. Pollack	342760de56	Merge branch 'master' into bow	2015-10-29 15:58:57 -07:00
James B. Pollack	48a295f4bc	werk	2015-10-29 15:24:04 -07:00
Brad Hefta-Gaub	1f53e425eb	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-10-29 12:28:28 -07:00
James B. Pollack	7166c6ddd2	through arrow in notch with rotation	2015-10-29 12:23:32 -07:00
James B. Pollack	028ea584b8	updating bow	2015-10-29 11:23:03 -07:00
James B. Pollack	8695963dd1	end of day	2015-10-28 19:10:16 -07:00
James B. Pollack	24a5cdc19e	through notching the arrow	2015-10-28 14:00:37 -07:00
James B. Pollack	68a4365fa5	changes for arrow entity reload	2015-10-28 13:27:31 -07:00
James B. Pollack	4e6234741a	reenable both hands to pick up arrow	2015-10-28 10:24:09 -07:00
James B. Pollack	369cf8e454	update model paths	2015-10-28 10:22:51 -07:00
James B. Pollack	0003eecf08	remove reload feature to prep for arrow netity	2015-10-28 10:20:35 -07:00
James B. Pollack	8b78278a79	end of day	2015-10-27 18:26:12 -07:00
James B. Pollack	da5db326e8	make cat quieter	2015-10-26 16:03:10 -07:00
Brad Davis	d91d0a2027	Fixing spray can script	2015-10-26 12:47:31 -07:00
James B. Pollack	fc8184ffed	add arcade sound	2015-10-26 12:25:51 -07:00
James B. Pollack	fb5b600211	bow work	2015-10-26 12:25:01 -07:00
Brad Davis	34b5178393	Fixing ping-ping entity script	2015-10-26 11:55:23 -07:00
James B. Pollack	c0cb8b542e	add notching system, add fire	2015-10-25 22:47:02 -07:00
James B. Pollack	29de3581dd	end of day	2015-10-23 17:39:03 -07:00
James B. Pollack	6e8d505726	updates	2015-10-23 14:38:17 -07:00
James B. Pollack	63d18acf91	bow updates	2015-10-23 14:12:56 -07:00
James B. Pollack	ca0aad7d3b	update after updating models	2015-10-22 17:25:15 -07:00
James B. Pollack	b8f0972228	move bow into toybox	2015-10-21 14:00:51 -07:00
James B. Pollack	384a6a8154	rename /toys to /toybox, remove non toybox scripts, update master refs	2015-10-21 11:36:49 -07:00