Commit graph

108 commits

Author SHA1 Message Date
Andrew Meadows
29a52bf0ba namechange collisionsWillMove --> dynamic 2016-01-15 15:23:52 -08:00
Clément Brisset
7c8f019507 Merge pull request #6663 from birarda/baseball
update link to bat script in createBatButton.js
2015-12-15 19:26:33 -08:00
Stephen Birarda
13c83bb262 update link to bat script in createBatButton.js 2015-12-15 17:23:29 -08:00
Atlante45
84bc947854 Typo 2015-12-07 14:00:06 -08:00
Atlante45
c4e43c4e0b Merge branch 'baseball-test' of github.com:Atlante45/hifi into baseball 2015-12-01 15:16:05 -08:00
Atlante45
0b93e637e8 Update bat rotation 2015-12-01 15:13:46 -08:00
Atlante45
db0083ab83 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-12-01 10:25:07 -08:00
Stephen Birarda
05862eff00 add fire sounds to assets JSON 2015-12-01 10:22:42 -08:00
Atlante45
6903cd4d8f Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-11-30 17:19:39 -08:00
Stephen Birarda
52dc2cf746 change the assets file to json 2015-11-30 17:17:06 -08:00
Atlante45
52fb711656 Move baseballCrowd to correct directory 2015-11-30 17:06:09 -08:00
Stephen Birarda
cba09beff4 add pop sounds (which don't require attribution) 2015-11-30 17:02:30 -08:00
Stephen Birarda
c451ede051 add crowd noises to assets yaml 2015-11-30 16:59:13 -08:00
Stephen Birarda
4a80e72d14 complete attribution for removed files 2015-11-30 16:48:05 -08:00
Stephen Birarda
f7537e3dc3 add initial version of asset description 2015-11-30 16:44:14 -08:00
Ryan Huffman
6fe370c4ef Remove old comment in firework.js 2015-11-30 16:02:00 -08:00
Ryan Huffman
0ed249f0e7 Update script path include in firework.js 2015-11-30 16:01:53 -08:00
Stephen Birarda
1b1efe53d9 fix for two space indentation in createBatButton.js 2015-11-30 15:59:12 -08:00
Stephen Birarda
a33e57dfdb remove audio files from history 2015-11-30 14:06:09 -08:00
Ryan Huffman
a7dfc99a2e Fix high score not updating in baseball 2015-11-13 16:14:53 -08:00
Atlante45
4f1420a5ee Tweak bat offsets 2015-11-10 17:05:27 -08:00
Atlante45
3cbe1bc4da Mirror on x instead of z 2015-11-10 14:50:22 -08:00
Ryan Huffman
03dd234253 Update pitching.js to get billboard ids lazily 2015-11-09 16:48:54 -08:00
Stephen Birarda
0b1ecdec74 use just location to go to path 2015-11-09 15:49:54 -08:00
Stephen Birarda
57b4302e0d Fix setting of location in bat.js 2015-11-09 15:44:23 -08:00
Stephen Birarda
b6c4ae757b fix reference to pitchAndHideAvatar 2015-11-09 15:41:11 -08:00
Stephen Birarda
44ab236673 Fix include in bat.js 2015-11-09 15:33:23 -08:00
Stephen Birarda
244fd86d1e add semi-colons to bat.js 2015-11-09 15:31:53 -08:00
Stephen Birarda
cea2e0fafd don't force location in continueNearGrab 2015-11-09 14:21:14 -08:00
Stephen Birarda
962881ad31 use startNearTrigger and startFarTrigger for create button 2015-11-09 13:43:52 -08:00
Stephen Birarda
d65571ea41 use the birarda baseball script on the createBatButton 2015-11-09 13:36:20 -08:00
Stephen Birarda
9ec51d822e send the avatar to /baseball on bat pickup 2015-11-09 13:35:54 -08:00
Stephen Birarda
119a702ebd Merge branch 'baseball' of https://github.com/huffman/hifi into baseball 2015-11-09 13:34:30 -08:00
Ryan Huffman
a400d63960 Cleanup Baseball in pitching.js 2015-11-09 12:02:28 -08:00
Ryan Huffman
5d4ce6aefc Update include paths in pitching.js to be relative 2015-11-09 12:02:10 -08:00
Ryan Huffman
069284d8d1 Remove unused variable and print in pitching.js 2015-11-09 11:51:08 -08:00
Ryan Huffman
278c921a50 Clean up bat.js 2015-11-09 11:35:56 -08:00
Ryan Huffman
38fcdc3eff Remove unused code from pitching.js 2015-11-09 10:59:46 -08:00
Ryan Huffman
661b2180f5 Update updateBillboard argument 2015-11-09 10:59:31 -08:00
Ryan Huffman
dad3ccb238 Cleanup pitching.js 2015-11-09 10:58:36 -08:00
Ryan Huffman
1b3d595d1e Add comment to PITCHING_MACHINE_OUTPUT_OFFSET_PCT 2015-11-09 10:58:18 -08:00
Ryan Huffman
b6d26862fd Add headers to baseball script files 2015-11-09 10:33:07 -08:00
Ryan Huffman
ec31504c11 Add detection of missing entity billboards in pitching.js 2015-11-09 10:30:21 -08:00
Ryan Huffman
20bdc7ee85 Rename getPitchingMachine to getOrCreatePitchingMachine 2015-11-09 10:10:59 -08:00
Ryan Huffman
30841169ee Move functions in baseball.js to utils.js 2015-11-09 10:04:19 -08:00
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