Commit graph

33 commits

Author SHA1 Message Date
Garrett Finucane
62fb2ee074 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
Conflicts:
	index.html
	js/input.js
	style/style.css
2014-05-31 19:39:07 -04:00
Garrett Finucane
1a719a4fa4 changed first screen 2014-05-31 19:37:23 -04:00
meadowstream
1ced9339a8 added click support for rotating the hexagon. consolidated touch
support. created pause button. created unselectable class for menus.
fixed being able to restart game while paused. now render every frame for
the pause menu now to avoid difficulties when resizing.
2014-05-31 18:12:35 -04:00
meadowstream
4aa17f79ef consolidated style sheets, made pause anim take 300 ms rather than 500, made game not start until becoming unblurred 2014-05-31 11:26:15 -04:00
Garrett Finucane
66fbad3cb5 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
Conflicts:
	index.html
2014-05-31 11:16:48 -04:00
Garrett Finucane
4c91ec5a29 html pause 2014-05-31 11:13:40 -04:00
meadowstream
610282628b added spacebar to speed 2014-05-31 10:22:42 -04:00
meadowstream
411fd4b6d5 added spacebar to make game go twice as fast 2014-05-31 09:56:38 -04:00
Garrett Finucane
8cb927920c fade in on restart 2014-05-30 21:05:01 -04:00
garrettdreyfus
f08b6d8dc4 help screen implemented 2014-05-26 21:05:58 -04:00
Michael Yang
41afa3ca46 Merge branch 'master' of https://github.com/teamsnowman/hextris 2014-05-25 21:49:18 -04:00
Michael Yang
918c8ab924 create update.js, render.js 2014-05-25 21:49:03 -04:00
garrettdreyfus
0ddf85c921 better gamestates 2014-05-25 21:04:14 -04:00
meadowstream
4371164e45 added new block destruction effects. broke pausing 2014-05-25 19:53:02 -04:00
garrettdreyfus
edab5b7118 added back the enter key 2014-05-25 00:44:25 -04:00
garrettdreyfus
8db46856f7 better input 2014-05-24 22:44:23 -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
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
bc11f11d07 set paused to always call requestAnimFrame 2014-05-24 15:56:29 -04:00
Michael Yang
7e762ebe77 center hex snaps on gameover 2014-05-24 15:52:25 -04:00
Michael Yang
367bbd8656 fixed restart bug 2014-05-24 15:42:40 -04:00
garrettdreyfus
73b51be3a8 pausing fixed 2014-05-24 13:59:01 -04:00
garrettdreyfus
e1979053b5 blocks being generated no checking happening 2014-05-24 13:24:03 -04:00
meadowstream
0992939823 fixed pausing 2014-05-24 12:57:27 -04:00
Michael Yang
2a398e255b added navbar, added pausing, changed score rendering 2014-05-23 00:51:03 -04:00
Noah Moroze
642ef7cd31 Removed space-to-speed-up until we figure out an alternative 2014-05-22 20:36:48 -04:00
meadowstream
f0b279274d added recording system 2014-05-22 17:04:57 -04:00
meadowstream
c9ef3d04b2 added import/export system 2014-05-22 16:36:32 -04:00
meadowstream
5c8da16e10 made keys fire on keydown rather than keyup 2014-05-19 17:07:18 -04:00
Mathew Huusko V
4965e7a956 Some simple reformatting, fix a couple linting errors 2014-05-18 14:15:13 -04:00
Mathew Huusko V
4f3c746212 Organize project slightly, clean html 2014-05-18 14:12:33 -04:00
Renamed from input.js (Browse further)