garrettdreyfus
|
bf3c247533
|
clean script created
|
2014-05-25 10:51:25 -04:00 |
|
meadowstream
|
2a4c971d67
|
Merge branch 'gh-pages'
|
2014-05-25 10:42:31 -04:00 |
|
meadowstream
|
3388dfa022
|
merged
|
2014-05-25 10:42:09 -04:00 |
|
meadowstream
|
c6613ad794
|
added real scaling
|
2014-05-25 10:41:06 -04:00 |
|
garrettdreyfus
|
2b52b64165
|
deleted blocks can not partake in combos
|
2014-05-25 10:20:32 -04:00 |
|
garrettdreyfus
|
3f0040c213
|
got rid of useless lane calculation
|
2014-05-25 10:08:09 -04:00 |
|
garrettdreyfus
|
fe0cbb72c9
|
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris
|
2014-05-25 10:03:42 -04:00 |
|
garrettdreyfus
|
79ae18dc6f
|
added Attached lane, fixes checking
|
2014-05-25 10:03:28 -04:00 |
|
meadowstream
|
63d33c7e11
|
merged
|
2014-05-25 01:12:06 -04:00 |
|
meadowstream
|
10a24d092e
|
centered, resized canvas. made system to augment different aspects of the game for different devices.
|
2014-05-25 01:11:24 -04:00 |
|
garrettdreyfus
|
aeb17cfec5
|
better scoring
|
2014-05-25 00:59:56 -04:00 |
|
garrettdreyfus
|
edab5b7118
|
added back the enter key
|
2014-05-25 00:44:25 -04:00 |
|
garrettdreyfus
|
70330a40bf
|
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
|
944245f639
|
fixed checking
|
2014-05-25 00:39:23 -04:00 |
|
garrettdreyfus
|
8db46856f7
|
better input
|
2014-05-24 22:44:23 -04:00 |
|
meadowstream
|
078093eff4
|
readded pausing onblur, removed debugger statements
|
2014-05-24 22:10:12 -04:00 |
|
meadowstream
|
303bf084db
|
added local font .woff
|
2014-05-24 21:12:57 -04:00 |
|
meadowstream
|
482a3ef7b9
|
removed false gameovers, added css for local fonts
|
2014-05-24 21:12:12 -04:00 |
|
meadowstream
|
df82f5fee8
|
changed ramping in difficulty
|
2014-05-24 19:50:57 -04:00 |
|
meadowstream
|
916591d46b
|
Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages
|
2014-05-24 18:28:38 -04:00 |
|
meadowstream
|
10c8a0b28a
|
fixed issues surrounding white blocks
|
2014-05-24 18:28:32 -04:00 |
|
meadowstream
|
a0a00c22cd
|
game doesn't continue playing after you lose
|
2014-05-24 16:46:24 -04:00 |
|
meadowstream
|
f67e69b642
|
merge
|
2014-05-24 16:40:03 -04:00 |
|
meadowstream
|
0f9484b7e6
|
added ability to restart game at any time using enter, removed logging
|
2014-05-24 16:39:25 -04:00 |
|
meadowstream
|
d7ea9b6628
|
started to add ability to restart game at any time by pressing enter
|
2014-05-24 16:39:04 -04:00 |
|
meadowstream
|
df17ce6ed2
|
added ability to restart game at any time by pressing enter
|
2014-05-24 16:36:39 -04:00 |
|
meadowstream
|
bf6368cdba
|
added ability to turn hexagon during startup
|
2014-05-24 16:35:32 -04:00 |
|
meadowstream
|
70b404e161
|
fixed conflicts around input.js and pausing
|
2014-05-24 16:04:57 -04:00 |
|
meadowstream
|
74cf58facc
|
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
|
598acaae87
|
hacky fix to drop blocks on gameover
|
2014-05-24 16:01:24 -04:00 |
|
Michael Yang
|
6c073cacdb
|
ended spawning blocks on gameover
|
2014-05-24 15:59:13 -04:00 |
|
meadowstream
|
bc11f11d07
|
set paused to always call requestAnimFrame
|
2014-05-24 15:56:29 -04:00 |
|
Michael Yang
|
477c5aba6d
|
Merge branch 'master' of https://github.com/teamsnowman/hextris
|
2014-05-24 15:52:38 -04:00 |
|
Michael Yang
|
7e762ebe77
|
center hex snaps on gameover
|
2014-05-24 15:52:25 -04:00 |
|
garrettdreyfus
|
18299e433b
|
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
|
2014-05-24 15:51:32 -04:00 |
|
meadowstream
|
2645e32474
|
Merge branch 'master' of https://github.com/teamsnowman/wastedtime
|
2014-05-24 15:51:13 -04:00 |
|
garrettdreyfus
|
5eb36f205a
|
Merge branch 'master' of http://github.com/teamsnowman/hextris
Conflicts:
js/main.js
|
2014-05-24 15:51:03 -04:00 |
|
garrettdreyfus
|
68273a6a23
|
deleting is back
|
2014-05-24 15:50:01 -04:00 |
|
meadowstream
|
cbba963675
|
fixed block detection
|
2014-05-24 15:48:48 -04:00 |
|
meadowstream
|
f6d208917e
|
removed debugger statements
|
2014-05-24 15:46:35 -04:00 |
|
Michael Yang
|
367bbd8656
|
fixed restart bug
|
2014-05-24 15:42:40 -04:00 |
|
meadowstream
|
4491ef2d28
|
made anim slower
|
2014-05-24 15:41:44 -04:00 |
|
meadowstream
|
e853555ef5
|
boundary renders below hex
|
2014-05-24 15:39:27 -04:00 |
|
meadowstream
|
d0b8c563c6
|
merged boundary systems
|
2014-05-24 15:37:21 -04:00 |
|
meadowstream
|
2c6759262a
|
added new block initialization animation
|
2014-05-24 15:35:38 -04:00 |
|
garrettdreyfus
|
5cdc671f0d
|
outline
|
2014-05-24 15:31:57 -04:00 |
|
Michael Yang
|
eebc76cb06
|
whoops, now properly merged
|
2014-05-24 15:10:28 -04:00 |
|
Michael Yang
|
a3b74202b8
|
merge conflict resolved
|
2014-05-24 15:07:58 -04:00 |
|
Michael Yang
|
19fa87eb5a
|
improved drawPolygon, changed inner hex
|
2014-05-24 15:06:57 -04:00 |
|
Michael Yang
|
af612dcedb
|
fixed touch maybe
|
2014-05-24 14:54:59 -04:00 |
|