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 |
|
garrettdreyfus
|
4cbd909845
|
better gamestates
|
2014-05-25 21:04:14 -04:00 |
|
garrettdreyfus
|
990b5cf83e
|
better infringement detection
|
2014-05-25 20:34:56 -04:00 |
|
lengstrom
|
b7a6bdf5c1
|
added new block destruction effects. broke pausing
|
2014-05-25 19:53:02 -04:00 |
|
lengstrom
|
2287f45e78
|
changed way that settings.creationSpeedModifier is used
|
2014-05-25 18:45:20 -04:00 |
|
lengstrom
|
09898509da
|
changed difficulty level
|
2014-05-25 18:32:49 -04:00 |
|
lengstrom
|
97a08da984
|
added mobile version
|
2014-05-25 18:27:25 -04:00 |
|
lengstrom
|
ad336749e8
|
added 1/4 retina display
|
2014-05-25 12:02:22 -04:00 |
|
lengstrom
|
eccb3a4248
|
merged html
|
2014-05-25 11:31:28 -04:00 |
|
lengstrom
|
4c1e71ce22
|
fixed falling hexagon
|
2014-05-25 11:31:05 -04:00 |
|
garrettdreyfus
|
53a3799afa
|
no extra padding
|
2014-05-25 11:24:36 -04:00 |
|
lengstrom
|
b16fa95c7e
|
Merge branch 'master' into gh-pages
|
2014-05-25 11:17:10 -04:00 |
|
lengstrom
|
114d420a49
|
Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages
|
2014-05-25 11:16:37 -04:00 |
|
lengstrom
|
f69e8e31f6
|
added scaling
|
2014-05-25 11:16:33 -04:00 |
|
garrettdreyfus
|
9dc6c0ee49
|
pausing fixed
|
2014-05-25 11:15:22 -04:00 |
|
garrettdreyfus
|
00116cc43c
|
no shadow
|
2014-05-25 11:05:05 -04:00 |
|
garrettdreyfus
|
5ce2fb994c
|
scoreScalar deleted
|
2014-05-25 10:55:49 -04:00 |
|
garrettdreyfus
|
17c4f72e8c
|
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
|
797f5da920
|
clean script created
|
2014-05-25 10:51:25 -04:00 |
|
lengstrom
|
f1744cf1c3
|
Merge branch 'gh-pages'
|
2014-05-25 10:42:31 -04:00 |
|
lengstrom
|
f5c0d7a047
|
merged
|
2014-05-25 10:42:09 -04:00 |
|
lengstrom
|
117a3f882f
|
added real scaling
|
2014-05-25 10:41:06 -04:00 |
|
garrettdreyfus
|
2976744f33
|
deleted blocks can not partake in combos
|
2014-05-25 10:20:32 -04:00 |
|
garrettdreyfus
|
18c5e8b4d0
|
got rid of useless lane calculation
|
2014-05-25 10:08:09 -04:00 |
|
garrettdreyfus
|
0113c3668f
|
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris
|
2014-05-25 10:03:42 -04:00 |
|