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 |
|
garrettdreyfus
|
43e011e884
|
Merge branch 'master' of http://github.com/teamsnowman/hextris
Conflicts:
js/main.js
|
2014-05-24 14:53:22 -04:00 |
|
garrettdreyfus
|
e07386038f
|
pauses when you leave the tab
|
2014-05-24 14:52:21 -04:00 |
|
meadowstream
|
7d1a7ad6bf
|
merged
|
2014-05-24 14:42:16 -04:00 |
|
meadowstream
|
4aae004ba6
|
added fade in for hexagonal boundary
|
2014-05-24 14:41:14 -04:00 |
|
garrettdreyfus
|
ae13307b64
|
Merge branch 'master' of http://github.com/teamsnowman/hextris
|
2014-05-24 14:38:36 -04:00 |
|
garrettdreyfus
|
6eb89aefdd
|
not sure
|
2014-05-24 14:38:35 -04:00 |
|
Michael Yang
|
33dc99827f
|
Merge branch 'master' of https://github.com/teamsnowman/hextris
|
2014-05-24 14:37:55 -04:00 |
|
Michael Yang
|
19d02687b0
|
fixed height vs originalHeight drawing
|
2014-05-24 14:37:29 -04:00 |
|
garrettdreyfus
|
8863a41f69
|
wavegen back to normal
|
2014-05-24 14:15:07 -04:00 |
|
garrettdreyfus
|
23a15852cf
|
Merge branch 'master' of http://github.com/teamsnowman/hextris
|
2014-05-24 14:12:44 -04:00 |
|
garrettdreyfus
|
6d1b01853d
|
blocks fade in on shoot
|
2014-05-24 14:12:33 -04:00 |
|
meadowstream
|
aa75117137
|
Merge branch 'master' of https://github.com/teamsnowman/wastedtime
|
2014-05-24 14:12:19 -04:00 |
|
meadowstream
|
f28e510b9b
|
Merge branch 'gh-pages'
|
2014-05-24 14:12:13 -04:00 |
|
meadowstream
|
085e04c2c9
|
fixed importing and exporting game data
|
2014-05-24 14:12:01 -04:00 |
|
garrettdreyfus
|
3f0f3f1e86
|
better boundry line
|
2014-05-24 14:08:40 -04:00 |
|
garrettdreyfus
|
73b51be3a8
|
pausing fixed
|
2014-05-24 13:59:01 -04:00 |
|
garrettdreyfus
|
8c14cc9463
|
no undefined colors
|
2014-05-24 13:56:41 -04:00 |
|
garrettdreyfus
|
19ae89369a
|
checking working again
|
2014-05-24 13:25:33 -04:00 |
|
garrettdreyfus
|
e1979053b5
|
blocks being generated no checking happening
|
2014-05-24 13:24:03 -04:00 |
|
garrettdreyfus
|
9116411bb9
|
better modular arithmetic
|
2014-05-24 13:11:17 -04:00 |
|
meadowstream
|
7a934ca976
|
Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages
|
2014-05-24 12:57:38 -04:00 |
|
meadowstream
|
0992939823
|
fixed pausing
|
2014-05-24 12:57:27 -04:00 |
|
garrettdreyfus
|
7c8830472a
|
thread safe(lol :)) light ui
|
2014-05-24 12:48:46 -04:00 |
|
meadowstream
|
154eea7a1b
|
fixed issues around blocks not revolving + updated generation mehcanics
|
2014-05-24 12:21:29 -04:00 |
|
meadowstream
|
51c479ed77
|
made timing for wavegeneration iteration rather than time based
|
2014-05-24 12:09:46 -04:00 |
|
meadowstream
|
bfc020af6a
|
Merge branch 'master' into gh-pages
|
2014-05-23 23:28:44 -04:00 |
|
meadowstream
|
bf7cf8c0f8
|
generations of waves start at a faster speed but reach mins slower
|
2014-05-23 23:27:58 -04:00 |
|
meadowstream
|
37c015dab7
|
made # of sides more dynamic
|
2014-05-23 22:46:01 -04:00 |
|
meadowstream
|
1c56603bc2
|
added more variety in block generation
|
2014-05-23 22:41:55 -04:00 |
|
garrettdreyfus
|
3dad2f1e9c
|
less consolidateBlocks
|
2014-05-23 21:36:59 -04:00 |
|
meadowstream
|
4cc4ca6dea
|
changed randomGEneration function to have faster rampup, longer amount of time in the more fun zone
|
2014-05-23 20:49:57 -04:00 |
|
meadowstream
|
15069ee08a
|
Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages
|
2014-05-23 20:23:41 -04:00 |
|