3720 commits

Author	SHA1	Message	Date
Atlante45	e04d9de4a4	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-10-27 10:28:10 -07:00
Atlante45	2f50652544	Merge branch 'script-engine' into baseball	2015-10-26 14:17:40 -07:00
Stephen Birarda	47e8a1bdf7	connect to correct signal for sound ready	2015-10-26 12:15:08 -07:00
Stephen Birarda	61ad91aba6	hook Sound downloaded to start playback	2015-10-26 12:09:48 -07:00
Atlante45	9d6f55ea93	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-10-26 11:59:53 -07:00
Stephen Birarda	e8c6acfeb6	update baseball crowd to loop better	2015-10-26 11:58:49 -07:00
Atlante45	1e4a414f9d	Fix scripts syntax errors	2015-10-26 11:33:36 -07:00
Atlante45	667eec2f46	change collision hull	2015-10-23 16:43:59 -07:00
Atlante45	7487c7bd0a	Move baseball.js	2015-10-23 16:32:27 -07:00
Atlante45	c1cd7dd50a	Work on robot animation and bat hull	2015-10-23 16:31:38 -07:00
Atlante45	8c08ad38d7	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-10-23 10:43:18 -07:00
James B. Pollack	6392b7080b	move scripts no longer in toybox to better locations	2015-10-23 10:36:32 -07:00
Atlante45	70c32e4b13	Remove empty script	2015-10-22 16:45:57 -07:00
Atlante45	05b794259e	Script cleanup and particles on ground collisions	2015-10-22 16:43:37 -07:00
Stephen Birarda	1d5d655814	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-10-22 16:29:44 -07:00
Stephen Birarda	4f6da68a1f	add getJointPosition and getJointRotation for entities	2015-10-22 16:25:28 -07:00
Stephen Birarda	06872a6c04	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-10-22 14:45:20 -07:00
Stephen Birarda	cfa47d2fc6	use triggers to swing with robot	2015-10-22 14:45:08 -07:00
Stephen Birarda	a9bad8de66	add a script for ambient crowd noise	2015-10-22 11:12:02 -07:00
Atlante45	d8e997d91f	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-10-21 17:52:30 -07:00
Ryan Huffman	934575a78a	Refactor pitching.js	2015-10-21 16:46:07 -07:00
Ryan Huffman	8f83870e52	Update pitching.js to add audio	2015-10-21 14:19:21 -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
Eric Levin	970d189262	Merge pull request #6125 from imgntn/toybox_ac ... [Scripts] Add Toybox AC Scripts, cleanup their headers, organize	2015-10-21 11:24:59 -07:00
Stephen Birarda	e28cc12dd8	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-10-21 10:56:03 -07:00
James B. Pollack	0b06cf1dfb	cleanup	2015-10-21 10:53:32 -07:00
James B. Pollack	68d43dc576	reduce number of toybox sound scripts	2015-10-21 10:50:37 -07:00
Stephen Birarda	e9ed6b8886	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-10-21 10:10:09 -07:00
Stephen Birarda	bfd9619404	add simple script that spawns a bat when run	2015-10-21 10:10:04 -07:00
Ryan Huffman	21903b746c	CP	2015-10-21 10:06:51 -07:00
James B. Pollack	80fb12b1a4	Merge branch 'master' into toybox_ac	2015-10-21 09:58:49 -07:00
Brad Hefta-Gaub	6465bb85dd	Merge pull request #6124 from imgntn/bball_fixes ... [Scripts] Fix Basketball Solidity in Toybox	2015-10-21 09:11:12 -07:00
Seth Alves	f85ef9267b	oops	2015-10-20 18:29:27 -07:00
Seth Alves	311254c395	require user-data to have wantsTrigger in it before non-colliding calls will happen	2015-10-20 18:26:12 -07:00
Seth Alves	7dcbb5849a	another bug	2015-10-20 17:44:12 -07:00
Seth Alves	ed480f651f	missed a line	2015-10-20 17:43:31 -07:00
Seth Alves	f16b62df83	- grab script: possible fix for line disappearing ... - grab script: go from 3 pickrays back to 1 - grab script: put "sphere" test back in, but with fixed distance test	2015-10-20 17:34:35 -07:00
Ryan Huffman	c67eafffba	Add pitching.js	2015-10-20 16:59:03 -07:00
James B. Pollack	8e1c3c32d1	additions to debug and also to handle some two handed situations	2015-10-20 16:24:17 -07:00
Atlante45	8d4d4a555c	Add kinematicGrab option in handControllerGrab.js	2015-10-20 16:00:38 -07:00
Andrew Meadows	d02fe784a9	css and cfg filetypes are text in .gitattributes	2015-10-20 13:58:44 -07:00
Andrew Meadows	4ff05e8c2a	fix lin endings of some JS files	2015-10-20 13:26:19 -07:00
James B. Pollack	b0ae55ee63	update cat purr header	2015-10-20 11:28:04 -07:00
James B. Pollack	771e5a4f9d	add toybox ac scripts, write headers for them, organize	2015-10-20 11:21:09 -07:00
James B. Pollack	af09871bed	fix basketball solidity in toybox	2015-10-20 11:08:28 -07:00
Brad Hefta-Gaub	dfe3e5b1cb	fix laser lifetimes	2015-10-20 09:30:27 -07:00
Seth Alves	41f7ef1e2e	cleanups	2015-10-19 16:53:27 -07:00
Seth Alves	6138775270	put back support for spatialKey	2015-10-19 15:40:14 -07:00
Seth Alves	5a968e3c96	tweak	2015-10-19 15:20:04 -07:00
Seth Alves	8fbf081223	git rid of sphere test	2015-10-19 14:51:18 -07:00