Commit graph

10 commits

Author SHA1 Message Date
lengstrom
ea2f8f0d3c removed merge files 2014-07-04 12:46:42 -04:00
lengstrom
88c1ac2607 fixed merge conflicts 2014-07-04 12:45:51 -04:00
Garrett Finucane
109edf092e Clock to Hex 2014-07-04 12:42:44 -04:00
lengstrom
55dcf3af02 replaced comboMultiplier -> comboTime 2014-07-04 12:42:22 -04:00
Garrett Finucane
14e1f662cc new comboTimer 2014-06-30 21:31:54 -04:00
Garrett Finucane
b2abf7dabd new combotimer 2014-06-30 12:13:21 -04:00
lengstrom
71dd048738 combo lines now match the faded blocks during menu screen play 2014-06-27 22:09:36 -04:00
Garrett Finucane
83152a24ea timer drawn beneath blocks and goes backwards 2014-06-24 13:22:47 -04:00
Garrett Finucane
4b434de3ef Line Wraps around now 2014-06-24 11:44:40 -04:00
Garrett Finucane
1a8ee2388a boundary lines denote comboTimer 2014-06-24 10:53:26 -04:00