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 |
|
garrettdreyfus
|
2a3b9c08ac
|
pauses when you leave the tab
|
2014-05-24 14:52:21 -04:00 |
|
lengstrom
|
04703ce649
|
merged
|
2014-05-24 14:42:16 -04:00 |
|
lengstrom
|
d61f35e64d
|
added fade in for hexagonal boundary
|
2014-05-24 14:41:14 -04:00 |
|
garrettdreyfus
|
a4ee273e8b
|
Merge branch 'master' of http://github.com/teamsnowman/hextris
|
2014-05-24 14:38:36 -04:00 |
|
garrettdreyfus
|
626d0ca3ad
|
not sure
|
2014-05-24 14:38:35 -04:00 |
|
Michael Yang
|
7a84ee597a
|
Merge branch 'master' of https://github.com/teamsnowman/hextris
|
2014-05-24 14:37:55 -04:00 |
|
Michael Yang
|
f304010964
|
fixed height vs originalHeight drawing
|
2014-05-24 14:37:29 -04:00 |
|
garrettdreyfus
|
0641df1492
|
wavegen back to normal
|
2014-05-24 14:15:07 -04:00 |
|
garrettdreyfus
|
ece80f89b8
|
Merge branch 'master' of http://github.com/teamsnowman/hextris
|
2014-05-24 14:12:44 -04:00 |
|
garrettdreyfus
|
c464192afe
|
blocks fade in on shoot
|
2014-05-24 14:12:33 -04:00 |
|
lengstrom
|
54c0d53a35
|
Merge branch 'master' of https://github.com/teamsnowman/wastedtime
|
2014-05-24 14:12:19 -04:00 |
|
lengstrom
|
af3bc9ce1b
|
Merge branch 'gh-pages'
|
2014-05-24 14:12:13 -04:00 |
|
lengstrom
|
adac2c4425
|
fixed importing and exporting game data
|
2014-05-24 14:12:01 -04:00 |
|
garrettdreyfus
|
99fca37ea4
|
better boundry line
|
2014-05-24 14:08:40 -04:00 |
|
garrettdreyfus
|
0474c270cf
|
pausing fixed
|
2014-05-24 13:59:01 -04:00 |
|
garrettdreyfus
|
5ff998146d
|
no undefined colors
|
2014-05-24 13:56:41 -04:00 |
|