Commit graph

864 commits

Author SHA1 Message Date
lengstrom
c97a77bbdf made center text white 2014-05-26 13:30:39 -04:00
garrettdreyfus
3cdc6228f5 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-26 13:18:44 -04:00
lengstrom
3b4e69b46e Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-26 13:18:35 -04:00
garrettdreyfus
a9c7d1668c multipliers white 2014-05-26 13:18:27 -04:00
lengstrom
ad15dc2fb7 removed number render offset 2014-05-26 13:18:20 -04:00
lengstrom
cca78adfc1 removed numbers going away 2014-05-26 13:18:10 -04:00
lengstrom
5502c3a39f centered text 2014-05-26 13:11:23 -04:00
lengstrom
00e250b80e fixed modifying rather than accessing in findCenterOfBlocks 2014-05-26 13:09:59 -04:00
lengstrom
4c219e2ddf Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-26 13:04:30 -04:00
lengstrom
b1be42241b block function returns a center slightly otuwards 2014-05-26 13:04:26 -04:00
garrettdreyfus
7fa3481bb3 score multiplier 2014-05-26 13:04:23 -04:00
lengstrom
37fcd47e37 centered text 2014-05-26 12:57:18 -04:00
garrettdreyfus
bca95619b3 start is Lovello too 2014-05-26 12:54:33 -04:00
garrettdreyfus
e97a437e34 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-26 12:53:08 -04:00
garrettdreyfus
2f2ed11c9c Lovello is the bomb 2014-05-26 12:52:57 -04:00
lengstrom
667787235f Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-26 12:49:24 -04:00
lengstrom
420ed9d43e added findCenterOfBlocks 2014-05-26 12:49:20 -04:00
garrettdreyfus
94650522b5 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-26 12:46:12 -04:00
garrettdreyfus
5abb300163 floating adder color of scored 2014-05-26 12:45:52 -04:00
lengstrom
c6fcfb4a04 removed clock hand 2014-05-26 12:41:04 -04:00
Noah Moroze
f24055bc6a Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-26 12:30:45 -04:00
Noah Moroze
d6d738e298 Fixed blocks starting behind hexagon on load save state 2014-05-26 12:30:30 -04:00
garrettdreyfus
d53768bf48 adding floats up 2014-05-26 12:27:30 -04:00
garrettdreyfus
3c895b6e56 added obnoxious purple chain multiplier 2014-05-26 11:22:52 -04:00
Michael Yang
febf41fd5b whoops 2014-05-26 01:28:37 -04:00
Michael Yang
ff50557d25 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-26 01:12:01 -04:00
Michael Yang
95ac06bc13 added clock hand 2014-05-26 01:11:47 -04:00
Noah Moroze
09f6a0f83c Fixed problems with not resetting save 2014-05-26 01:11:13 -04:00
Noah Moroze
06bacb800f Fixed mistakes during merge 2014-05-26 00:07:03 -04:00
Noah Moroze
25c0d69b0d Merge 2014-05-25 23:55:20 -04:00
Noah Moroze
3421f54db0 Save state during game 2014-05-25 23:52:35 -04:00
Michael Yang
a239c13bee Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-25 23:42:17 -04:00
Michael Yang
ed736e18f7 display score in center 2014-05-25 23:42:06 -04:00
garrettdreyfus
0de8d54e79 added combo multiplier 2014-05-25 23:12:47 -04:00
Michael Yang
a89f66723c refactor for days 2014-05-25 22:50:13 -04:00
Michael Yang
0546c8abdf Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-25 22:30:04 -04:00
Michael Yang
2421d08ade Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-25 22:29:36 -04:00
garrettdreyfus
466b7f4c73 you dont spell parent parrent 2014-05-25 22:29:34 -04:00
Michael Yang
4c1ea98f8e fixed onblur pausing bug 2014-05-25 22:28:04 -04:00
garrettdreyfus
155ece8b0b more comments in entities 2014-05-25 22:17:26 -04:00
garrettdreyfus
79f5e856d7 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-25 22:06:28 -04:00
garrettdreyfus
a79ec65bed no circular references halfway comments 2014-05-25 22:06:15 -04:00
Noah Moroze
9b297dbfa0 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-25 21:59:47 -04:00
Noah Moroze
12caecdbeb Wrote exportSaveState 2014-05-25 21:59:33 -04:00
Michael Yang
6344039e69 Merge branch 'master' of https://github.com/teamsnowman/hextris 2014-05-25 21:49:18 -04:00
Michael Yang
5dc31d2e54 create update.js, render.js 2014-05-25 21:49:03 -04:00
garrettdreyfus
67fd88aeda Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-25 21:47:37 -04:00
garrettdreyfus
1abc55242f added comments for checking 2014-05-25 21:47:21 -04:00
lengstrom
9eb41988f3 Merge branch 'master' into gh-pages 2014-05-25 21:25:45 -04:00
Michael Yang
79e79c5a32 remove test.js 2014-05-25 21:07:46 -04:00