34291 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ryan Huffman	e145d4955c	Update tunnel detection to reverse all axes	2015-11-06 15:30:25 -08:00
Ryan Huffman	bc035b7e1e	Adjust baseball speed to 7-15 m/s	2015-11-06 15:29:57 -08:00
Ryan Huffman	51b14386a0	Adjust baseball pitch speed to 5-20 m/s	2015-11-06 15:08:35 -08:00
Ryan Huffman	c964363ce5	Disable automatic playing of show in firework.js	2015-11-06 12:25:13 -08:00
Ryan Huffman	42e2c683fd	Rename fireSounds to launchSounds	2015-11-06 12:24:52 -08:00
Ryan Huffman	4cce57881f	Remove MAX_SIMULTANEOUS_FIREWORKS from firework.js	2015-11-06 12:24:19 -08:00
Ryan Huffman	fbb47ecdda	Remove hard-coded fireworks position from firework.js	2015-11-06 11:39:46 -08:00
Ryan Huffman	94bf2ecf27	Remove emitter pool from firework.js	2015-11-06 10:45:22 -08:00
Ryan Huffman	d5336db039	Cleanup print statements in pitching.js	2015-11-06 10:04:19 -08:00
Ryan Huffman	7da611d44b	Adjust fireworks configuration in pitching.js	2015-11-06 10:03:57 -08:00
Ryan Huffman	5d2df1abbb	Add helped function findEntity	2015-11-06 09:55:18 -08:00
Ryan Huffman	1c9e3434a9	Adjust behavior of tunnel-detection in pitching.js	2015-11-04 16:01:08 -08:00
Ryan Huffman	6ae4ef78dd	Update max fireworks in pitching.js to be 10	2015-11-04 14:38:48 -08:00
Ryan Huffman	4d5ed2efcf	Fix fireworks not being deleted	2015-11-04 14:38:30 -08:00
Ryan Huffman	e0ad714ab7	Clean up print messages in pitching.js	2015-11-04 13:11:34 -08:00
Ryan Huffman	2a115fc9ab	Remove preallocation of particles in firework.js	2015-11-04 13:11:20 -08:00
Ryan Huffman	de69b2298b	Decrease number of fireworks on high score	2015-11-04 12:55:18 -08:00
Ryan Huffman	8056498f39	Update pitching machine to shoot fewer fireworks	2015-11-04 12:11:07 -08:00
Ryan Huffman	bed7a1f5c3	Improve performance of fireworks	2015-11-04 12:10:42 -08:00
Ryan Huffman	d0d3aaa09c	Update bat.js to ensure pitching machine is running in continueNearGrab	2015-11-04 12:10:19 -08:00
Ryan Huffman	cb2a698488	Update urls in baseball scripts to be absolute	2015-11-04 09:22:05 -08:00
Ryan Huffman	f5c89dedb5	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-11-04 08:56:01 -08:00
Stephen Birarda	9ae3c8b593	change bat relative rotation yaw to 90	2015-11-03 16:58:30 -08:00
Stephen Birarda	e7bc2e349a	use real userData in createBatButton script	2015-11-03 16:55:11 -08:00
Stephen Birarda	9488a8ed24	use HTTP URL for bat script URL	2015-11-03 16:42:31 -08:00
Stephen Birarda	5b3809b543	update the bat script URL	2015-11-03 16:13:14 -08:00
Stephen Birarda	804db537bf	volume changes for crowd, bat avatar suppression fix	2015-11-03 16:11:13 -08:00
Stephen Birarda	8c0592caba	add semicolons to createBatButton script	2015-11-03 14:52:40 -08:00
Ryan Huffman	5211824e0e	Fix script include paths in firework.js and pitching.js	2015-11-03 14:43:43 -08:00
Stephen Birarda	501b905e7a	change script URL for bat to HTTP	2015-11-03 14:25:38 -08:00
Stephen Birarda	06dbe2693a	fix for created bat properties	2015-11-03 14:21:52 -08:00
Ryan Huffman	644e1008bd	Fix bat.js not setting pitchingMachine variable	2015-11-03 13:32:28 -08:00
Ryan Huffman	2b8c6ebaf1	Add firework show when distance hit > 200	2015-11-03 12:14:55 -08:00
Ryan Huffman	3056432b0c	Add fireworks	2015-11-03 12:14:04 -08:00
Atlante45	9be8d1edf9	Remove now unecessary vive hack	2015-11-03 11:44:33 -08:00
Atlante45	570777e6f3	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-11-03 11:42:00 -08:00
Atlante45	2bdd282708	Merge branch 'vive' of github.com:Atlante45/hifi into baseball	2015-11-03 11:40:45 -08:00
Atlante45	0508091130	Rebase fixes	2015-11-03 11:37:57 -08:00
Atlante45	52c61f069f	Merge branch 'master' of https://github.com/highfidelity/hifi into vive	2015-11-03 11:21:54 -08:00
Atlante45	f4b5933af4	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-03 11:21:39 -08:00
Clément Brisset	c63fc8557c	More baseball test code	2015-11-03 11:14:59 -08:00
Clément Brisset	40ce2416e8	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-03 11:13:57 -08:00
Ryan Huffman	e8b550be9f	Clean up foul/strike in pitching.js	2015-11-03 11:13:57 -08:00
Ryan Huffman	14cdc5801e	Fix updating of distance/high score	2015-11-03 11:13:57 -08:00
Ryan Huffman	bb0ce67f6b	Update bat.js to lazy load the pitching machine	2015-11-03 11:13:57 -08:00
Ryan Huffman	d535bb6ed8	Fix pitching machine not starting when enabled	2015-11-03 11:13:56 -08:00
Ryan Huffman	f18d8f5fbb	Add shouldRenderLocally to bat.js and fix findEntities	2015-11-03 11:13:56 -08:00
Ryan Huffman	03a338dfe6	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-11-03 11:13:56 -08:00
Stephen Birarda	57a68edaa3	resolve conflicts merging with huffman/baseball	2015-11-03 11:13:54 -08:00
Stephen Birarda	8cd41b9383	resolve conflicts on merge with huffman/baseball	2015-11-03 11:13:15 -08:00