Commit graph

565 commits

Author SHA1 Message Date
Garrett Finucane
daf202280d added click for non mobile 2014-07-04 16:08:01 -04:00
Garrett Finucane
94dc72d16b fixed blank thing 2014-07-04 16:04:16 -04:00
meadowstream
b63a0b88ba reduced difficulty for mobile 2014-07-04 15:05:38 -04:00
Garrett Finucane
0f959d342c Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-07-04 14:59:09 -04:00
Garrett Finucane
b0d4c4340a instructions on mobile 2014-07-04 14:58:33 -04:00
meadowstream
40cdddbb6b removed sample play at startup 2014-07-04 14:52:14 -04:00
meadowstream
283b002f2f made time between combos relative to the time between waves 2014-07-04 14:45:05 -04:00
Garrett Finucane
648a0c8be3 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-07-04 14:27:41 -04:00
Garrett Finucane
7ba2cb1bd4 changed copy 2014-07-04 14:27:33 -04:00
meadowstream
b0dad30b71 fixed merge conflicts 2014-07-04 14:15:07 -04:00
meadowstream
69eb170012 fixed "press p to continue" text occurring in mobile browsers 2014-07-04 14:14:39 -04:00
meadowstream
841a001f90 fixed "press p to continue" text occurring in mobile browsers 2014-07-04 14:09:14 -04:00
Garrett Finucane
7e575216b3 info icon 2014-07-04 13:48:23 -04:00
Garrett Finucane
9db7b8bf55 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
Conflicts:
	js/main.js
2014-07-04 13:24:08 -04:00
Garrett Finucane
a710c4299e limited infinite speed rotations 2014-07-04 13:23:00 -04:00
meadowstream
02cc263dff made combo / score text larger 2014-07-04 13:08:44 -04:00
Garrett Finucane
3aac7eb439 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
Conflicts:
	js/checking.js
2014-07-04 12:48:44 -04:00
Garrett Finucane
be3706a346 clock to hex 2014-07-04 12:47:37 -04:00
meadowstream
ec592072d3 removed merge files 2014-07-04 12:46:42 -04:00
meadowstream
f3e39a6ddd fixed merge conflicts 2014-07-04 12:45:51 -04:00
Garrett Finucane
f27cb24988 Clock to Hex 2014-07-04 12:42:44 -04:00
meadowstream
2831ad3ddc replaced comboMultiplier -> comboTime 2014-07-04 12:42:22 -04:00
Garrett Finucane
d80156e3e0 Fixed the small text 2014-07-04 09:46:14 -04:00
meadowstream
03692b426e added custom fonts to Text() object 2014-07-03 19:07:51 -04:00
meadowstream
70f1226c48 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-03 18:25:30 -04:00
meadowstream
0f27875b33 fixed block initialization animation playing during pause 2014-07-03 18:25:15 -04:00
Garrett Finucane
3be0152d14 fixed tiny text issue 2014-07-03 17:51:13 -04:00
meadowstream
1ebf854153 Replaced raw unicode with String.fromCharCode() 2014-07-03 16:39:29 -04:00
meadowstream
c1e5617f9a changed delay length 2014-07-03 16:31:45 -04:00
meadowstream
4b4471d7f7 added devMode, disabled debugging functions. first version of tutorial is done. added delay to gamePlay after pressing start to let the UI elements fade out. 2014-07-03 16:30:56 -04:00
meadowstream
01de2bd6c5 added drawKey(key, x, y) to draw any key at any given (x,y) 2014-07-03 01:24:35 -04:00
meadowstream
216da7ba81 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-02 23:51:43 -04:00
meadowstream
b100a0c722 removed entities.js from index.html 2014-07-02 23:51:34 -04:00
Garrett Finucane
3764ececd8 Fixed flickering after pause 2014-07-02 11:10:36 -04:00
Garrett Finucane
4090f36b83 Title screen fades in and out 2014-07-02 10:58:02 -04:00
meadowstream
0eebf24cd7 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-01 22:30:13 -04:00
meadowstream
94e70f9e31 standardized block fall speed on hexagon 2014-07-01 22:30:01 -04:00
Garrett Finucane
01e84ce186 unhid all the buttons 2014-07-01 11:18:13 -04:00
Garrett Finucane
429de31d14 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-07-01 11:03:06 -04:00
Garrett Finucane
d8420a753e no more -2 gameState 2014-07-01 11:02:52 -04:00
meadowstream
7fec2e36a1 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-06-30 22:45:14 -04:00
meadowstream
63d5aaa2be fixed issue in which waves would restart after resuming the game 2014-06-30 22:45:00 -04:00
Garrett Finucane
a247788fc2 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-06-30 21:56:35 -04:00
Garrett Finucane
1372087e59 fixed clicking in hextris 2014-06-30 21:56:14 -04:00
meadowstream
d871437cf0 merged 2014-06-30 21:44:22 -04:00
meadowstream
5d39205d09 removed server 2014-06-30 21:43:31 -04:00
Garrett Finucane
13c1243adb new comboTimer 2014-06-30 21:31:54 -04:00
Garrett Finucane
62c3611334 restart icon shown on resume 2014-06-30 13:34:55 -04:00
Garrett Finucane
69da2a2d03 added restart button 2014-06-30 12:29:26 -04:00
Garrett Finucane
0e6b54ef82 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-06-30 12:13:50 -04:00