Commit graph

472 commits

Author SHA1 Message Date
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
meadowstream
2a4c971d67 Merge branch 'gh-pages' 2014-05-25 10:42:31 -04:00
meadowstream
3388dfa022 merged 2014-05-25 10:42:09 -04:00
meadowstream
c6613ad794 added real scaling 2014-05-25 10:41:06 -04:00
garrettdreyfus
2b52b64165 deleted blocks can not partake in combos 2014-05-25 10:20:32 -04:00
garrettdreyfus
3f0040c213 got rid of useless lane calculation 2014-05-25 10:08:09 -04:00
garrettdreyfus
fe0cbb72c9 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris 2014-05-25 10:03:42 -04:00
garrettdreyfus
79ae18dc6f added Attached lane, fixes checking 2014-05-25 10:03:28 -04:00
meadowstream
63d33c7e11 merged 2014-05-25 01:12:06 -04:00
meadowstream
10a24d092e centered, resized canvas. made system to augment different aspects of the game for different devices. 2014-05-25 01:11:24 -04:00
garrettdreyfus
aeb17cfec5 better scoring 2014-05-25 00:59:56 -04:00
garrettdreyfus
edab5b7118 added back the enter key 2014-05-25 00:44:25 -04:00
garrettdreyfus
70330a40bf Merge branch 'master' of http://github.com/teamsnowman/hextris into gh-pages
Conflicts:
	js/main.js
2014-05-25 00:41:01 -04:00
garrettdreyfus
944245f639 fixed checking 2014-05-25 00:39:23 -04:00
garrettdreyfus
8db46856f7 better input 2014-05-24 22:44:23 -04:00
meadowstream
078093eff4 readded pausing onblur, removed debugger statements 2014-05-24 22:10:12 -04:00
meadowstream
303bf084db added local font .woff 2014-05-24 21:12:57 -04:00
meadowstream
482a3ef7b9 removed false gameovers, added css for local fonts 2014-05-24 21:12:12 -04:00
meadowstream
df82f5fee8 changed ramping in difficulty 2014-05-24 19:50:57 -04:00
meadowstream
916591d46b Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-24 18:28:38 -04:00
meadowstream
10c8a0b28a fixed issues surrounding white blocks 2014-05-24 18:28:32 -04:00
meadowstream
a0a00c22cd game doesn't continue playing after you lose 2014-05-24 16:46:24 -04:00
meadowstream
f67e69b642 merge 2014-05-24 16:40:03 -04:00
meadowstream
0f9484b7e6 added ability to restart game at any time using enter, removed logging 2014-05-24 16:39:25 -04:00
meadowstream
d7ea9b6628 started to add ability to restart game at any time by pressing enter 2014-05-24 16:39:04 -04:00