Commit graph

85 commits

Author SHA1 Message Date
Mathew Huusko V
8f3d2e3797 Organize project slightly, clean html 2014-05-18 14:12:33 -04:00
garrettdreyfus
92af3b1e56 the meta tag 2014-05-18 11:49:27 -04:00
garrettdreyfus
c5f8bfc216 touch smi-working 2014-05-18 11:43:49 -04:00
Noah Moroze
990fb5c6e8 asdf 2014-05-17 19:29:51 -04:00
lengstrom
826544b5ac added hackexeter comments 2014-05-17 19:26:31 -04:00
lengstrom
69726178c7 added catch 2014-05-17 19:23:59 -04:00
lengstrom
3d0704c0d9 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 19:21:22 -04:00
lengstrom
d32e16b205 trying to fix white gaps 2014-05-17 19:21:19 -04:00
Michael Yang
4d66c50464 Create README.md 2014-05-17 19:17:28 -04:00
garrettdreyfus
181a6546f6 Merge branch 'master' of http://github.com/teamsnowman/wastedtime 2014-05-17 19:16:57 -04:00
garrettdreyfus
3e6eed4697 4 in a row 2014-05-17 19:16:55 -04:00
Michael Yang
a18387cc84 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 19:07:10 -04:00
Michael Yang
d6ede4673b edited end screen message 2014-05-17 19:06:51 -04:00
Michael Yang
d1ef109877 added overlays to modal screens 2014-05-17 19:02:28 -04:00
Noah Moroze
f87e84563f Fixed merge conflicts 2014-05-17 18:55:03 -04:00
Noah Moroze
d26b8e5fb8 Gray line 2014-05-17 18:54:37 -04:00
lengstrom
9109c73d10 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 18:52:19 -04:00
lengstrom
5756881d69 added gravity 2014-05-17 18:52:15 -04:00
Michael Yang
0514e560ea added init/reset function 2014-05-17 18:47:37 -04:00
Michael Yang
b31789f17e added start and end screens 2014-05-17 18:34:02 -04:00
Noah Moroze
c5e769713e Score 2014-05-17 18:22:12 -04:00
Noah Moroze
3d57cc0e09 Added score 2014-05-17 17:38:11 -04:00
lengstrom
fb16e5c189 added formatting 2014-05-17 17:37:52 -04:00
garrettdreyfus
08628860bd checking working no anims 2014-05-17 17:28:15 -04:00
Michael Yang
d7fc58cc11 oops 2014-05-17 17:19:23 -04:00
Michael Yang
076b5d0864 holy crap wow how did we fix these merge conflicts 2014-05-17 17:15:55 -04:00
Michael Yang
4be426fe84 added modals, changed game shape, changed colors 2014-05-17 17:10:35 -04:00
lengstrom
d7c7466d43 fixed collision detection 2014-05-17 17:02:24 -04:00
lengstrom
39231c75aa added bad collision detection 2014-05-17 16:53:14 -04:00
lengstrom
846bf5115e sort of fixing collision detection 2014-05-17 16:48:55 -04:00
lengstrom
6fdc17827a added more stuff 2014-05-17 15:08:10 -04:00
lengstrom
b2f379994f merged 2014-05-17 15:02:19 -04:00
lengstrom
3a79b488de fixed fps issue + doing some cd 2014-05-17 15:01:16 -04:00
Noah Moroze
9002775d34 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 14:46:22 -04:00
Noah Moroze
b57b26aba7 blah 2014-05-17 14:46:14 -04:00
lengstrom
b15af9dd10 Revamped collision system 2014-05-17 14:25:22 -04:00
garrettdreyfus
bad7f9160e CHECKING WORKS 2014-05-17 14:15:16 -04:00
Noah Moroze
12a6a2059f fixed merge conflict, adjusted width of block 2014-05-17 14:08:09 -04:00
Noah Moroze
15f553693e changed blocks to trapezoids 2014-05-17 14:02:09 -04:00
lengstrom
701e5e0848 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 13:55:10 -04:00
lengstrom
0ce085fa34 added collision detection 2014-05-17 13:55:02 -04:00
Noah Moroze
82bc8deeb1 Addin fat stacks 2014-05-17 13:43:56 -04:00
Michael Yang
ba1e55d8e7 fixed block width calculation 2014-05-17 13:34:57 -04:00
lengstrom
f41c210f20 merged 2014-05-17 13:04:15 -04:00
lengstrom
4ad7fafed5 merged + added lines 2014-05-17 13:03:50 -04:00
Michael Yang
2d61f08e19 with noah, fixed clock rotation 2014-05-17 12:57:48 -04:00
Michael Yang
b13a649539 noah is kewl 2014-05-17 12:50:12 -04:00
garrettdreyfus
02fb7b4df9 included checking.js 2014-05-17 12:45:22 -04:00
garrettdreyfus
496c577389 no === 2014-05-17 12:43:40 -04:00
lengstrom
03dc0643de merged 2014-05-17 12:43:27 -04:00