Commit graph

496 commits

Author SHA1 Message Date
Garrett Finucane
4e3bcecc24 Merge branch 'master' of http://github.com/teamsnowman/hextris 2014-05-19 13:25:31 -04:00
Garrett Finucane
8979d8250b some nice sounds 2014-05-19 13:25:20 -04:00
Noah Moroze
eef78ff7e1 Added rotation animation for hexagon 2014-05-19 13:18:49 -04:00
Garrett Finucane
a56c017467 Fixed checking as far as I can tell 2014-05-19 10:36:13 -04:00
Garrett Finucane
0d4dff2f4d more sensible timing 2014-05-18 23:35:11 -04:00
Garrett Finucane
7e4b9a2106 more sensoble timing 2014-05-18 23:34:05 -04:00
Noah Moroze
dbebe07139 Fixed the WHITTEEEE GAPS 2014-05-18 23:14:55 -04:00
Logan Engstrom
9e49c5bd89 Merge pull request #1 from mhuusko5/master
Some quick/small, but important changes to Hextris
2014-05-18 16:52:15 -04:00
Mathew Huusko V
ee706f3704 Support retina displays (multiple X rendering) 2014-05-18 14:48:50 -04:00
Mathew Huusko V
70790b7e18 Make game fully responsive (try resizing window...) 2014-05-18 14:26:08 -04:00
Mathew Huusko V
4965e7a956 Some simple reformatting, fix a couple linting errors 2014-05-18 14:15:13 -04:00
Mathew Huusko V
4f3c746212 Organize project slightly, clean html 2014-05-18 14:12:33 -04:00
garrettdreyfus
257eebfdc7 the meta tag 2014-05-18 11:49:27 -04:00
garrettdreyfus
030c4c0daa touch smi-working 2014-05-18 11:43:49 -04:00
Noah Moroze
b4e09dd32c asdf 2014-05-17 19:29:51 -04:00
meadowstream
70bb409299 added hackexeter comments 2014-05-17 19:26:31 -04:00
meadowstream
8bf3c902e2 added catch 2014-05-17 19:23:59 -04:00
meadowstream
0f1633fe8f Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 19:21:22 -04:00
meadowstream
9274a1c272 trying to fix white gaps 2014-05-17 19:21:19 -04:00
Michael Yang
4abbde653b Create README.md 2014-05-17 19:17:28 -04:00
garrettdreyfus
1f8ffac489 Merge branch 'master' of http://github.com/teamsnowman/wastedtime 2014-05-17 19:16:57 -04:00
garrettdreyfus
ab48e918b8 4 in a row 2014-05-17 19:16:55 -04:00
Michael Yang
7a2a860966 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 19:07:10 -04:00
Michael Yang
79462e405e edited end screen message 2014-05-17 19:06:51 -04:00
Michael Yang
db974845ea added overlays to modal screens 2014-05-17 19:02:28 -04:00
Noah Moroze
fee067ac51 Fixed merge conflicts 2014-05-17 18:55:03 -04:00
Noah Moroze
d450e9056b Gray line 2014-05-17 18:54:37 -04:00
meadowstream
faba5329e0 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 18:52:19 -04:00
meadowstream
555981a4b9 added gravity 2014-05-17 18:52:15 -04:00
Michael Yang
8d2d966b09 added init/reset function 2014-05-17 18:47:37 -04:00
Michael Yang
9fc709fb9c added start and end screens 2014-05-17 18:34:02 -04:00
Noah Moroze
8ece1c2775 Score 2014-05-17 18:22:12 -04:00
Noah Moroze
a60a56a84e Added score 2014-05-17 17:38:11 -04:00
meadowstream
e8cd912112 added formatting 2014-05-17 17:37:52 -04:00
garrettdreyfus
0cbbc2f463 checking working no anims 2014-05-17 17:28:15 -04:00
Michael Yang
86c73baa75 oops 2014-05-17 17:19:23 -04:00
Michael Yang
0503349d92 holy crap wow how did we fix these merge conflicts 2014-05-17 17:15:55 -04:00
Michael Yang
8e4d09e322 added modals, changed game shape, changed colors 2014-05-17 17:10:35 -04:00
meadowstream
57f6e61c53 fixed collision detection 2014-05-17 17:02:24 -04:00
meadowstream
575a9f62e8 added bad collision detection 2014-05-17 16:53:14 -04:00
meadowstream
dafc21cd2b sort of fixing collision detection 2014-05-17 16:48:55 -04:00
meadowstream
c72aca0a57 added more stuff 2014-05-17 15:08:10 -04:00
meadowstream
bbf990f3ad merged 2014-05-17 15:02:19 -04:00
meadowstream
e71fc74eb7 fixed fps issue + doing some cd 2014-05-17 15:01:16 -04:00
Noah Moroze
b843b42712 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 14:46:22 -04:00
Noah Moroze
e24de152fb blah 2014-05-17 14:46:14 -04:00
meadowstream
bda88c3531 Revamped collision system 2014-05-17 14:25:22 -04:00
garrettdreyfus
fd2b237e44 CHECKING WORKS 2014-05-17 14:15:16 -04:00
Noah Moroze
753adc4c65 fixed merge conflict, adjusted width of block 2014-05-17 14:08:09 -04:00
Noah Moroze
3ebe08d047 changed blocks to trapezoids 2014-05-17 14:02:09 -04:00