Commit graph

476 commits

Author SHA1 Message Date
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
Garrett Finucane
6edb912365 new combotimer 2014-06-30 12:13:21 -04:00
meadowstream
4a9a6e20a1 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-06-29 14:35:18 -04:00
meadowstream
93b8e4276a Removed spacebar speedup 2014-06-29 14:35:10 -04:00
meadowstream
c92124375c fixed bug in which pause btn didn't show up after resuming a game 2014-06-29 14:25:40 -04:00
Logan Engstrom
ccff790299 Update README.md 2014-06-29 12:00:38 -04:00
meadowstream
feea8c4b85 removed useless opacity settings 2014-06-28 15:33:31 -04:00
meadowstream
32eef0bc72 fixed demo level faultily calling the game over after start 2014-06-28 14:42:55 -04:00
meadowstream
b07a0a140c reverted changes around transition from start screen -> gameplay 2014-06-28 14:34:30 -04:00
meadowstream
b3aac51fd3 removed white gaps, changed method for starting previously saved game to calling resumeGame (after init is called) 2014-06-28 13:44:43 -04:00
meadowstream
f90ba95cd5 fixed white gaps, added saveState to .unload handler 2014-06-28 12:01:41 -04:00
meadowstream
efba90831d fixed white gaps caused by constant, needless scaling during export 2014-06-28 11:57:22 -04:00
meadowstream
1b59126ed7 fixed start btn not starting saved games, removed useless debugging lines 2014-06-28 11:48:45 -04:00
meadowstream
b1676d912e fixed clicking on btn, started adding start->play transition anims 2014-06-28 11:24:47 -04:00
meadowstream
5e60841fb6 converted animLoop to a switch case 2014-06-27 22:15:16 -04:00
meadowstream
54a4759b9c combo lines now match the faded blocks during menu screen play 2014-06-27 22:09:36 -04:00
meadowstream
6f731d8598 converted completely to hex, added legacy support 2014-06-27 21:39:32 -04:00
meadowstream
60a3947264 fixed issues surrounding checking and faulty hex -> rgb translations 2014-06-27 21:31:59 -04:00
meadowstream
0e29354d02 fixed initial setup not rendering correctly in menu 2014-06-27 21:19:57 -04:00
meadowstream
1c20d0faf3 extended reset to enter key press as well in the title screen 2014-06-27 19:10:53 -04:00
meadowstream
d73953d027 fixed issue in which imported data would continue to play after startup and the hexagon would not be cleared 2014-06-26 22:19:41 -04:00
Garrett Finucane
353709c079 moved incrementing MainClock.ct from render to update 2014-06-24 13:41:40 -04:00
Garrett Finucane
fdf92b5b2f timer drawn beneath blocks and goes backwards 2014-06-24 13:22:47 -04:00
Garrett Finucane
f6b56382cf fixed the whole weird stuff 2014-06-24 13:16:46 -04:00
Garrett Finucane
38164ebe1f Line Wraps around now 2014-06-24 11:44:40 -04:00
Garrett Finucane
002fc1132a Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-06-24 10:53:53 -04:00
Garrett Finucane
e574fbb4c7 boundary lines denote comboTimer 2014-06-24 10:53:26 -04:00
meadowstream
102a9f5a6f fixed restart method not clearing the screen, started fixing distFromHex changing
after restart
2014-06-24 09:47:15 -04:00
meadowstream
79ee722e9c fixed issue in which blocks were added twice (init was called twice) 2014-06-24 09:23:43 -04:00
Garrett Finucane
413158ca16 minor fixes 2014-06-24 00:15:03 -04:00
Garrett Finucane
c2498cdf11 falling blocks dont continue falling on refresh 2014-06-23 23:12:38 -04:00
Garrett Finucane
2c3b9cbba0 refreshing no longer clears at start 2014-06-23 22:31:25 -04:00
meadowstream
eef29f1c3e Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-06-23 22:26:05 -04:00
meadowstream
ee450aa90a added previous game display on the title 2014-06-23 22:26:00 -04:00
Garrett Finucane
767ba0e727 high scores better 2014-06-23 22:21:36 -04:00
meadowstream
9cac1a3fc6 merged 2014-06-23 20:58:07 -04:00
meadowstream
c4728bb5e6 added start screen 2014-06-23 20:55:04 -04:00
Garrett Finucane
96c2e56956 re-whitened text 2014-06-23 20:18:32 -04:00
Garrett Finucane
967ce66b38 text inverts 2014-06-23 19:21:09 -04:00
Garrett Finucane
233538c745 faded to immediate background 2014-06-23 18:47:29 -04:00