Commit graph

476 commits

Author SHA1 Message Date
meadowstream
8f5bb71bd5 reformatted index 2014-05-27 19:44:47 -04:00
meadowstream
a3d98180ea Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-27 18:43:19 -04:00
meadowstream
e1dfa444b0 view.js changes 2014-05-27 18:43:15 -04:00
garrettdreyfus
f08b6d8dc4 help screen implemented 2014-05-26 21:05:58 -04:00
garrettdreyfus
0aaafbf760 text fades in 2014-05-26 14:43:05 -04:00
garrettdreyfus
93696511e2 score fades in 2014-05-26 14:24:38 -04:00
garrettdreyfus
bc548d3240 multipliers fade out faster 2014-05-26 14:14:30 -04:00
garrettdreyfus
2e15e31fe7 combo timing based on frames 2014-05-26 14:07:07 -04:00
meadowstream
911c0faacc changed this.ct to increment every time 2014-05-26 13:46:11 -04:00
garrettdreyfus
22c4891ca5 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-26 13:38:59 -04:00
garrettdreyfus
0eb631afdc better fonts 2014-05-26 13:38:47 -04:00
meadowstream
cccdb45f55 Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-26 13:30:43 -04:00
meadowstream
5fa3102024 made center text white 2014-05-26 13:30:39 -04:00
garrettdreyfus
f1c7c93b20 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-26 13:18:44 -04:00
meadowstream
83f4db9157 Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-26 13:18:35 -04:00
garrettdreyfus
8a2fd29cad multipliers white 2014-05-26 13:18:27 -04:00
meadowstream
07938ea873 removed number render offset 2014-05-26 13:18:20 -04:00
meadowstream
1f4f911929 removed numbers going away 2014-05-26 13:18:10 -04:00
meadowstream
807051212b centered text 2014-05-26 13:11:23 -04:00
meadowstream
d5ebbc071c fixed modifying rather than accessing in findCenterOfBlocks 2014-05-26 13:09:59 -04:00
meadowstream
d2d55bcb71 Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-26 13:04:30 -04:00
meadowstream
1f34cc64f7 block function returns a center slightly otuwards 2014-05-26 13:04:26 -04:00
garrettdreyfus
f77d8d5655 score multiplier 2014-05-26 13:04:23 -04:00
meadowstream
33930833de centered text 2014-05-26 12:57:18 -04:00
garrettdreyfus
844a856f8e start is Lovello too 2014-05-26 12:54:33 -04:00
garrettdreyfus
4d1aadd8d7 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-26 12:53:08 -04:00
garrettdreyfus
6ba95b9f46 Lovello is the bomb 2014-05-26 12:52:57 -04:00
meadowstream
2a1fbbc057 Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-26 12:49:24 -04:00
meadowstream
573f2c5afb added findCenterOfBlocks 2014-05-26 12:49:20 -04:00
garrettdreyfus
71f2563db8 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-26 12:46:12 -04:00
garrettdreyfus
144fd8e9f7 floating adder color of scored 2014-05-26 12:45:52 -04:00
meadowstream
cb42564bb3 removed clock hand 2014-05-26 12:41:04 -04:00
Noah Moroze
95e7c1b0db Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-26 12:30:45 -04:00
Noah Moroze
0ce3056879 Fixed blocks starting behind hexagon on load save state 2014-05-26 12:30:30 -04:00
garrettdreyfus
2c707b62a9 adding floats up 2014-05-26 12:27:30 -04:00
garrettdreyfus
8c0692fa90 added obnoxious purple chain multiplier 2014-05-26 11:22:52 -04:00
Michael Yang
0b9cd14100 whoops 2014-05-26 01:28:37 -04:00
Michael Yang
4af9d97442 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-26 01:12:01 -04:00
Michael Yang
d6b4716bd0 added clock hand 2014-05-26 01:11:47 -04:00
Noah Moroze
05246608ce Fixed problems with not resetting save 2014-05-26 01:11:13 -04:00
Noah Moroze
bfde350f92 Fixed mistakes during merge 2014-05-26 00:07:03 -04:00
Noah Moroze
6b40e6ecdc Merge 2014-05-25 23:55:20 -04:00
Noah Moroze
56bc252977 Save state during game 2014-05-25 23:52:35 -04:00
Michael Yang
12ded6b0da Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-25 23:42:17 -04:00
Michael Yang
2313940108 display score in center 2014-05-25 23:42:06 -04:00
garrettdreyfus
7b6a910865 added combo multiplier 2014-05-25 23:12:47 -04:00
Michael Yang
ff2978b9ad refactor for days 2014-05-25 22:50:13 -04:00
Michael Yang
83607bf806 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-25 22:30:04 -04:00
Michael Yang
91b3c3f925 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-25 22:29:36 -04:00
garrettdreyfus
6ef7f09da7 you dont spell parent parrent 2014-05-25 22:29:34 -04:00