Commit graph

496 commits

Author SHA1 Message Date
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
Michael Yang
035ae2da91 fixed onblur pausing bug 2014-05-25 22:28:04 -04:00
garrettdreyfus
58d8016a28 more comments in entities 2014-05-25 22:17:26 -04:00
garrettdreyfus
b7fb4ab89d Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-25 22:06:28 -04:00
garrettdreyfus
c7061997f6 no circular references halfway comments 2014-05-25 22:06:15 -04:00
Noah Moroze
e64577f3b1 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-25 21:59:47 -04:00
Noah Moroze
85fe438cf0 Wrote exportSaveState 2014-05-25 21:59:33 -04:00
Michael Yang
41afa3ca46 Merge branch 'master' of https://github.com/teamsnowman/hextris 2014-05-25 21:49:18 -04:00
Michael Yang
918c8ab924 create update.js, render.js 2014-05-25 21:49:03 -04:00
garrettdreyfus
eaca4de571 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-25 21:47:37 -04:00
garrettdreyfus
7e7c583d0a added comments for checking 2014-05-25 21:47:21 -04:00
meadowstream
b0cfe52534 Merge branch 'master' into gh-pages 2014-05-25 21:25:45 -04:00
Michael Yang
94a6610977 remove test.js 2014-05-25 21:07:46 -04:00
garrettdreyfus
0ddf85c921 better gamestates 2014-05-25 21:04:14 -04:00
garrettdreyfus
666fa8b511 better infringement detection 2014-05-25 20:34:56 -04:00
meadowstream
4371164e45 added new block destruction effects. broke pausing 2014-05-25 19:53:02 -04:00
meadowstream
37dff530b8 changed way that settings.creationSpeedModifier is used 2014-05-25 18:45:20 -04:00
meadowstream
f01e89248c changed difficulty level 2014-05-25 18:32:49 -04:00
meadowstream
464a7dde43 added mobile version 2014-05-25 18:27:25 -04:00
meadowstream
0e9db3d7ab added 1/4 retina display 2014-05-25 12:02:22 -04:00
meadowstream
8c448a0fa0 merged html 2014-05-25 11:31:28 -04:00
meadowstream
a01bf3d26a fixed falling hexagon 2014-05-25 11:31:05 -04:00
garrettdreyfus
99762b127d no extra padding 2014-05-25 11:24:36 -04:00
meadowstream
8fb791fbac Merge branch 'master' into gh-pages 2014-05-25 11:17:10 -04:00
meadowstream
1921d43060 Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-25 11:16:37 -04:00
meadowstream
9c3521880b added scaling 2014-05-25 11:16:33 -04:00
garrettdreyfus
16c4502a1c pausing fixed 2014-05-25 11:15:22 -04:00
garrettdreyfus
1db9d66474 no shadow 2014-05-25 11:05:05 -04:00
garrettdreyfus
b8526741c3 scoreScalar deleted 2014-05-25 10:55:49 -04:00
garrettdreyfus
138e0e5b2c Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
Conflicts:
	js/main.js
2014-05-25 10:52:20 -04:00
garrettdreyfus
bf3c247533 clean script created 2014-05-25 10:51:25 -04:00