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 |
|
garrettdreyfus
|
c58a48f88d
|
added Attached lane, fixes checking
|
2014-05-25 10:03:28 -04:00 |
|
lengstrom
|
23bf29e7ab
|
merged
|
2014-05-25 01:12:06 -04:00 |
|
lengstrom
|
a56f47c9b7
|
centered, resized canvas. made system to augment different aspects of the game for different devices.
|
2014-05-25 01:11:24 -04:00 |
|
garrettdreyfus
|
3c84813469
|
better scoring
|
2014-05-25 00:59:56 -04:00 |
|
garrettdreyfus
|
671ff6c0f2
|
added back the enter key
|
2014-05-25 00:44:25 -04:00 |
|
garrettdreyfus
|
31727a9f9e
|
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
|
268d55db14
|
fixed checking
|
2014-05-25 00:39:23 -04:00 |
|
garrettdreyfus
|
ab2ca381b3
|
better input
|
2014-05-24 22:44:23 -04:00 |
|
lengstrom
|
7cb65b2d20
|
readded pausing onblur, removed debugger statements
|
2014-05-24 22:10:12 -04:00 |
|
lengstrom
|
24b236b000
|
added local font .woff
|
2014-05-24 21:12:57 -04:00 |
|
lengstrom
|
047ca6833d
|
removed false gameovers, added css for local fonts
|
2014-05-24 21:12:12 -04:00 |
|
lengstrom
|
9c5ed782eb
|
changed ramping in difficulty
|
2014-05-24 19:50:57 -04:00 |
|
lengstrom
|
96319230fd
|
Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages
|
2014-05-24 18:28:38 -04:00 |
|
lengstrom
|
050cb49d21
|
fixed issues surrounding white blocks
|
2014-05-24 18:28:32 -04:00 |
|
lengstrom
|
45525ca177
|
game doesn't continue playing after you lose
|
2014-05-24 16:46:24 -04:00 |
|
lengstrom
|
95369eda21
|
merge
|
2014-05-24 16:40:03 -04:00 |
|
lengstrom
|
c1ffee24c2
|
added ability to restart game at any time using enter, removed logging
|
2014-05-24 16:39:25 -04:00 |
|
lengstrom
|
78f020dd1b
|
started to add ability to restart game at any time by pressing enter
|
2014-05-24 16:39:04 -04:00 |
|
lengstrom
|
4b9cd0ede5
|
added ability to restart game at any time by pressing enter
|
2014-05-24 16:36:39 -04:00 |
|
lengstrom
|
cf574f8599
|
added ability to turn hexagon during startup
|
2014-05-24 16:35:32 -04:00 |
|
lengstrom
|
014b110321
|
fixed conflicts around input.js and pausing
|
2014-05-24 16:04:57 -04:00 |
|
lengstrom
|
0ce1d424b3
|
fixed speeding up used to create an additional concurrent game loop when enter was pressed
|
2014-05-24 16:02:14 -04:00 |
|
Michael Yang
|
f002726b23
|
hacky fix to drop blocks on gameover
|
2014-05-24 16:01:24 -04:00 |
|
Michael Yang
|
c981196677
|
ended spawning blocks on gameover
|
2014-05-24 15:59:13 -04:00 |
|
lengstrom
|
b2bb34bbfb
|
set paused to always call requestAnimFrame
|
2014-05-24 15:56:29 -04:00 |
|
Michael Yang
|
81f04c93b5
|
Merge branch 'master' of https://github.com/teamsnowman/hextris
|
2014-05-24 15:52:38 -04:00 |
|
Michael Yang
|
071b072c7e
|
center hex snaps on gameover
|
2014-05-24 15:52:25 -04:00 |
|
garrettdreyfus
|
8fe0c0f09b
|
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
|
2014-05-24 15:51:32 -04:00 |
|
lengstrom
|
567f212f37
|
Merge branch 'master' of https://github.com/teamsnowman/wastedtime
|
2014-05-24 15:51:13 -04:00 |
|
garrettdreyfus
|
6ade58139f
|
Merge branch 'master' of http://github.com/teamsnowman/hextris
Conflicts:
js/main.js
|
2014-05-24 15:51:03 -04:00 |
|
garrettdreyfus
|
a5539ae7be
|
deleting is back
|
2014-05-24 15:50:01 -04:00 |
|
lengstrom
|
635993dccb
|
fixed block detection
|
2014-05-24 15:48:48 -04:00 |
|
lengstrom
|
41d37b24d7
|
removed debugger statements
|
2014-05-24 15:46:35 -04:00 |
|
Michael Yang
|
c11cd336fe
|
fixed restart bug
|
2014-05-24 15:42:40 -04:00 |
|
lengstrom
|
dcf4a38dd8
|
made anim slower
|
2014-05-24 15:41:44 -04:00 |
|
lengstrom
|
36a1c2b924
|
boundary renders below hex
|
2014-05-24 15:39:27 -04:00 |
|
lengstrom
|
b02759df23
|
merged boundary systems
|
2014-05-24 15:37:21 -04:00 |
|
lengstrom
|
bd65f6da30
|
added new block initialization animation
|
2014-05-24 15:35:38 -04:00 |
|
garrettdreyfus
|
320ba2c046
|
outline
|
2014-05-24 15:31:57 -04:00 |
|
Michael Yang
|
b1a39795fa
|
whoops, now properly merged
|
2014-05-24 15:10:28 -04:00 |
|
Michael Yang
|
82d4ab6f67
|
merge conflict resolved
|
2014-05-24 15:07:58 -04:00 |
|
Michael Yang
|
9c2abda142
|
improved drawPolygon, changed inner hex
|
2014-05-24 15:06:57 -04:00 |
|
Michael Yang
|
09c0125e92
|
fixed touch maybe
|
2014-05-24 14:54:59 -04:00 |
|
garrettdreyfus
|
dc63b76cb3
|
Merge branch 'master' of http://github.com/teamsnowman/hextris
Conflicts:
js/main.js
|
2014-05-24 14:53:22 -04:00 |
|