Commit graph

10 commits

Author SHA1 Message Date
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
13c1243adb new comboTimer 2014-06-30 21:31:54 -04:00
Garrett Finucane
6edb912365 new combotimer 2014-06-30 12:13:21 -04:00
meadowstream
54a4759b9c combo lines now match the faded blocks during menu screen play 2014-06-27 22:09:36 -04:00
Garrett Finucane
fdf92b5b2f timer drawn beneath blocks and goes backwards 2014-06-24 13:22:47 -04:00
Garrett Finucane
38164ebe1f Line Wraps around now 2014-06-24 11:44:40 -04:00
Garrett Finucane
e574fbb4c7 boundary lines denote comboTimer 2014-06-24 10:53:26 -04:00