Commit graph

3933 commits

Author SHA1 Message Date
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
f4b5933af4 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-03 11:21:39 -08:00
Seth Alves
27b239176f fix grab 2015-11-03 10:16:56 -08:00
James B. Pollack
192e4c8185 Merge pull request #6274 from ZappoMan/rightClickMenu
add example of overriding default rightClick behavior
2015-11-02 18:58:12 -08:00
Atlante45
1928753dda Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-02 18:14:53 -08:00
Seth Alves
fe2c0effd0 oops left debug on 2015-11-02 16:17:46 -08:00
Seth Alves
0a5f43bba7 fix up boolean test 2015-11-02 16:16:13 -08:00
Ryan Huffman
91a1378889 Clean up foul/strike in pitching.js 2015-11-02 16:09:51 -08:00
Ryan Huffman
1b673a99c0 Fix updating of distance/high score 2015-11-02 15:59:55 -08:00
Ryan Huffman
3cbcc6494f Update bat.js to lazy load the pitching machine 2015-11-02 15:34:42 -08:00
Ryan Huffman
def8294b60 Fix pitching machine not starting when enabled 2015-11-02 15:28:18 -08:00
Ryan Huffman
8b6db3b6c0 Add shouldRenderLocally to bat.js and fix findEntities 2015-11-02 15:13:07 -08:00
Seth Alves
181901ed19 distance grab works better with hmd on 2015-11-02 14:42:28 -08:00
Stephen Birarda
bbf5991f9a resolve conflicts on merge with huffman/baseball 2015-11-02 14:14:36 -08:00
Ryan Huffman
f4531759be Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-02 12:27:08 -08:00
Ryan Huffman
7f4a8e9d7d Merge branch 'master' of github.com:Atlante45/hifi into baseball 2015-11-02 12:25:51 -08:00
Ryan Huffman
b8d90ab28e Replace pitching.js include with relative path 2015-11-02 12:12:54 -08:00
Ryan Huffman
3820adf3f6 Add bat.js 2015-11-02 12:12:21 -08:00
Ryan Huffman
72775a7af8 Clean up pitching.js so the pitching machine code is separate 2015-11-02 12:12:05 -08:00
Brad Hefta-Gaub
b94258f953 add example of overriding default rightClick behavior 2015-11-02 11:55:50 -08:00
Eric Levin
7838683909 Merge pull request #6189 from imgntn/fjs
Add functional.js library
2015-11-02 11:10:19 -08:00
Brad Hefta-Gaub
286905c20c Merge pull request #6250 from jherico/peek
Adding peek support for endpoints
2015-10-31 16:09:27 -07:00
Seth Alves
9346366fc5 fix grab script 2015-10-31 14:28:54 -07:00
Brad Davis
abbfe15395 Adding peek support for endpoints 2015-10-31 14:26:14 -07:00
Brad Hefta-Gaub
46f9a432ab fix handControllerGrab.js 2015-10-31 14:21:50 -07:00
Seth Alves
896ed3927c merge from upstream 2015-10-30 19:17:43 -07:00
James B. Pollack
c67bfc8883 Merge pull request #6180 from huffman/line-js
Add js line library for drawing infinite poly lines
2015-10-30 17:47:31 -07:00
Seth Alves
944f0965c0 some refactoring and a bug fix -- grab script can throw things again 2015-10-30 16:35:50 -07:00
Ryan Huffman
77e0023b43 Fix lifetime bug with first PolyLine in InfiniteLine 2015-10-30 16:31:15 -07:00