Commit graph

172 commits

Author SHA1 Message Date
meadowstream
ee450aa90a added previous game display on the title 2014-06-23 22:26:00 -04:00
Garrett Finucane
767ba0e727 high scores better 2014-06-23 22:21:36 -04:00
meadowstream
9cac1a3fc6 merged 2014-06-23 20:58:07 -04:00
meadowstream
c4728bb5e6 added start screen 2014-06-23 20:55:04 -04:00
Garrett Finucane
967ce66b38 text inverts 2014-06-23 19:21:09 -04:00
meadowstream
b94a6e1734 added intro.json 2014-06-23 15:31:48 -04:00
meadowstream
291fb9002c updated settings for mobile version 2014-06-22 22:58:15 -04:00
meadowstream
e94a59600a reduced rate at which fading text is scaled relative to the size of hte canvas 2014-06-22 22:53:36 -04:00
meadowstream
67420ec9c7 cleaned up some variable declarations 2014-06-22 16:52:51 -04:00
meadowstream
6956d611be fixed white gaps/misaligned blocks that occur at certain screen dimensions at startup 2014-06-22 16:49:26 -04:00
Garrett Finucane
5179a5f434 reworked endgame 2014-06-21 16:58:18 -04:00
meadowstream
3ff76d7cd6 reformatting 2014-06-04 14:33:40 -04:00
meadowstream
90c68d21ef lowered difficulty 2014-05-31 21:54:23 -04:00
Garrett Finucane
04aaa6bc45 continues to draw score and background hex after pause 2014-05-31 20:10:32 -04:00
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
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
808ee41538 fixed issues with savestate around rendering old text 2014-05-31 11:04:57 -04:00
meadowstream
411fd4b6d5 added spacebar to make game go twice as fast 2014-05-31 09:56:38 -04:00
Garrett Finucane
eb3d720bb1 window on blur no longer unpauses 2014-05-30 21:23:32 -04:00
Garrett Finucane
8cb927920c fade in on restart 2014-05-30 21:05:01 -04:00
Garrett Finucane
5a9ed8a17e saveState working now, the falling blocks don't fall into clock now 2014-05-30 19:06:16 -04:00
garrettdreyfus
f08b6d8dc4 help screen implemented 2014-05-26 21:05:58 -04:00
Noah Moroze
95e7c1b0db Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-26 12:30:45 -04:00
Noah Moroze
0ce3056879 Fixed blocks starting behind hexagon on load save state 2014-05-26 12:30:30 -04:00
Michael Yang
4af9d97442 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-26 01:12:01 -04:00
Michael Yang
d6b4716bd0 added clock hand 2014-05-26 01:11:47 -04:00
Noah Moroze
05246608ce Fixed problems with not resetting save 2014-05-26 01:11:13 -04:00
Noah Moroze
6b40e6ecdc Merge 2014-05-25 23:55:20 -04:00
Noah Moroze
56bc252977 Save state during game 2014-05-25 23:52:35 -04:00
Michael Yang
035ae2da91 fixed onblur pausing bug 2014-05-25 22:28:04 -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
7e7c583d0a added comments for checking 2014-05-25 21:47:21 -04:00
garrettdreyfus
666fa8b511 better infringement detection 2014-05-25 20:34:56 -04:00
meadowstream
4371164e45 added new block destruction effects. broke pausing 2014-05-25 19:53:02 -04:00
meadowstream
f01e89248c changed difficulty level 2014-05-25 18:32:49 -04:00
meadowstream
464a7dde43 added mobile version 2014-05-25 18:27:25 -04:00
meadowstream
0e9db3d7ab added 1/4 retina display 2014-05-25 12:02:22 -04:00
meadowstream
a01bf3d26a fixed falling hexagon 2014-05-25 11:31:05 -04:00
meadowstream
8fb791fbac Merge branch 'master' into gh-pages 2014-05-25 11:17:10 -04:00
meadowstream
1921d43060 Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-25 11:16:37 -04:00
meadowstream
9c3521880b added scaling 2014-05-25 11:16:33 -04:00
garrettdreyfus
16c4502a1c pausing fixed 2014-05-25 11:15:22 -04:00
garrettdreyfus
138e0e5b2c Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
Conflicts:
	js/main.js
2014-05-25 10:52:20 -04:00
garrettdreyfus
bf3c247533 clean script created 2014-05-25 10:51:25 -04:00
meadowstream
c6613ad794 added real scaling 2014-05-25 10:41:06 -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
944245f639 fixed checking 2014-05-25 00:39:23 -04:00
meadowstream
078093eff4 readded pausing onblur, removed debugger statements 2014-05-24 22:10:12 -04:00
meadowstream
482a3ef7b9 removed false gameovers, added css for local fonts 2014-05-24 21:12:12 -04:00
meadowstream
10c8a0b28a fixed issues surrounding white blocks 2014-05-24 18:28:32 -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
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
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
68273a6a23 deleting is back 2014-05-24 15:50:01 -04:00
Michael Yang
367bbd8656 fixed restart bug 2014-05-24 15:42:40 -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
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
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
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
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
0992939823 fixed pausing 2014-05-24 12:57:27 -04:00
meadowstream
51c479ed77 made timing for wavegeneration iteration rather than time based 2014-05-24 12:09:46 -04:00
garrettdreyfus
3dad2f1e9c less consolidateBlocks 2014-05-23 21:36:59 -04:00
meadowstream
518c72f844 added beginnings of new wave system 2014-05-23 20:23:31 -04:00
meadowstream
95f9613899 added bouncing anim v2 2014-05-23 16:50:18 -04:00
meadowstream
3ec79fcb35 added new startanim 2014-05-23 16:13:28 -04:00
Noah Moroze
47e0e9632d Properly set default highscores 2014-05-23 13:01:51 -04:00
Michael Yang
324aaa7b5d added localStorage highscores 2014-05-23 01:51:16 -04:00
Michael Yang
aef9eb31c9 added high score displaying 2014-05-23 01:10:12 -04:00
Michael Yang
2a398e255b added navbar, added pausing, changed score rendering 2014-05-23 00:51:03 -04:00
meadowstream
e4bdde9fd1 added new waves system, starting to redo start screen 2014-05-22 20:22:20 -04:00
meadowstream
28d612c734 merged 2014-05-22 19:32:58 -04:00
meadowstream
32136d48ce added more extensive shaking + cleaned up some code 2014-05-22 19:30:40 -04:00
garrettdreyfus
d5eedd0f5b fixed scoring 2014-05-22 19:30:01 -04:00
garrettdreyfus
96412e5233 no more disappearing blocks 2014-05-22 19:08:08 -04:00
meadowstream
567852279f added shaking when the hexagon is hit by blocks 2014-05-22 19:01:39 -04:00
meadowstream
f0b279274d added recording system 2014-05-22 17:04:57 -04:00