24 commits

Author	SHA1	Message	Date
James B. Pollack	23f10659b0	update to new trigger method	2015-11-24 14:00:23 -08:00
James B. Pollack	aba65bd9b8	rename linearDamping to damping	2015-11-20 15:45:08 -08:00
James B. Pollack	12e2178dd3	cleanup	2015-11-18 11:28:07 -08:00
James B. Pollack	5f3e3ed9d1	cleanup	2015-11-18 11:06:48 -08:00
James B. Pollack	d3ee0d4998	handle bubble solidity	2015-11-18 10:44:24 -08:00
James B. Pollack	de953ce14d	better spatialkey	2015-11-18 10:41:53 -08:00
James B. Pollack	eb48342d07	add inversiona nd spatialkey	2015-11-18 09:10:04 -08:00
James B. Pollack	e0a9048287	new bubble model	2015-11-17 16:59:14 -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	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	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	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
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	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
Brad Davis	34b5178393	Fixing ping-ping entity script	2015-10-26 11:55:23 -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