Commit graph

389 commits

Author SHA1 Message Date
meadowstream
b1676d912e fixed clicking on btn, started adding start->play transition anims 2014-06-28 11:24:47 -04:00
meadowstream
5e60841fb6 converted animLoop to a switch case 2014-06-27 22:15:16 -04:00
meadowstream
54a4759b9c combo lines now match the faded blocks during menu screen play 2014-06-27 22:09:36 -04:00
meadowstream
6f731d8598 converted completely to hex, added legacy support 2014-06-27 21:39:32 -04:00
meadowstream
60a3947264 fixed issues surrounding checking and faulty hex -> rgb translations 2014-06-27 21:31:59 -04:00
meadowstream
0e29354d02 fixed initial setup not rendering correctly in menu 2014-06-27 21:19:57 -04:00
meadowstream
1c20d0faf3 extended reset to enter key press as well in the title screen 2014-06-27 19:10:53 -04:00
meadowstream
d73953d027 fixed issue in which imported data would continue to play after startup and the hexagon would not be cleared 2014-06-26 22:19:41 -04:00
Garrett Finucane
353709c079 moved incrementing MainClock.ct from render to update 2014-06-24 13:41:40 -04:00
Garrett Finucane
fdf92b5b2f timer drawn beneath blocks and goes backwards 2014-06-24 13:22:47 -04:00
Garrett Finucane
f6b56382cf fixed the whole weird stuff 2014-06-24 13:16:46 -04:00
Garrett Finucane
38164ebe1f Line Wraps around now 2014-06-24 11:44:40 -04:00
Garrett Finucane
002fc1132a Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-06-24 10:53:53 -04:00
Garrett Finucane
e574fbb4c7 boundary lines denote comboTimer 2014-06-24 10:53:26 -04:00
meadowstream
102a9f5a6f fixed restart method not clearing the screen, started fixing distFromHex changing
after restart
2014-06-24 09:47:15 -04:00
meadowstream
79ee722e9c fixed issue in which blocks were added twice (init was called twice) 2014-06-24 09:23:43 -04:00
Garrett Finucane
413158ca16 minor fixes 2014-06-24 00:15:03 -04:00
Garrett Finucane
c2498cdf11 falling blocks dont continue falling on refresh 2014-06-23 23:12:38 -04:00
Garrett Finucane
2c3b9cbba0 refreshing no longer clears at start 2014-06-23 22:31:25 -04:00
meadowstream
eef29f1c3e Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-06-23 22:26:05 -04:00
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
96c2e56956 re-whitened text 2014-06-23 20:18:32 -04:00
Garrett Finucane
967ce66b38 text inverts 2014-06-23 19:21:09 -04:00
Garrett Finucane
233538c745 faded to immediate background 2014-06-23 18:47:29 -04:00
Garrett Finucane
d9d8b2c8be different timeout tone 2014-06-23 18:40:41 -04:00
Garrett Finucane
81f2d20f02 tints to show combo timeout 2014-06-23 18:35:28 -04:00
Garrett Finucane
8a51edfd81 added fading to denote combo timeout 2014-06-23 17:59:51 -04:00
Garrett Finucane
ecd59b2c2c fixed importing 2014-06-23 15:46:14 -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
meadowstream
acbfebfbfd fixed merge conflicts 2014-06-22 15:17:00 -04:00
meadowstream
4a95f2b7f0 removed for-in loops, fixed issue in which the text would fade/blur too fast 2014-06-22 15:16:28 -04:00
Garrett Finucane
8e8a4ddb0c Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-06-22 13:25:33 -04:00
Garrett Finucane
9c48113086 no pausing at game over 2014-06-22 13:25:20 -04:00
meadowstream
75c5374fc3 removed for-in loops; cleaned up syntax 2014-06-22 12:49:27 -04:00
meadowstream
7ff7dec0d8 fixed hexagon not being centered in the y axis during pauses 2014-06-22 12:32:23 -04:00
meadowstream
4a3386e87a added scaling text, fits to y dimension; formatted js 2014-06-22 00:26:46 -04:00
Garrett Finucane
5179a5f434 reworked endgame 2014-06-21 16:58:18 -04:00
Garrett Finucane
7174f05b05 now fancy blurs 2014-06-21 16:06:23 -04:00
meadowstream
3ff76d7cd6 reformatting 2014-06-04 14:33:40 -04:00
meadowstream
c57d15e6d3 scaled difficulty, fixed issuei n which blocks don't fall after blocks below them are destroyed 2014-06-01 18:48:28 -04:00
meadowstream
318502372a raised difficulty 2014-05-31 22:32:02 -04:00
meadowstream
109a14db32 increased spawn time delta 2014-05-31 22:21:27 -04:00
meadowstream
31b91cb399 lowered difficulty 2014-05-31 22:00:25 -04:00
meadowstream
f9febe7dce raised difficulty 2014-05-31 21:56:52 -04:00
meadowstream
90c68d21ef lowered difficulty 2014-05-31 21:54:23 -04:00
meadowstream
940515c494 fixed merge conflicts 2014-05-31 21:45:25 -04:00
meadowstream
43d3fa4516 cleaned up main, made new difficulty scaling system, removed .swp files,
added greater support for mobile (responsiveness of btns)
2014-05-31 21:44:03 -04:00
Garrett Finucane
3a03104c53 fixed start screen 2014-05-31 20:17:00 -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
meadowstream
7d6fdd647f made spacebar pressing make blocks spawn twice as fast as well as go twice as fast 2014-05-31 15:32:01 -04:00
meadowstream
311ca69d8e changed magnitude to scale with the actual scale of the canvas, fixed fontawesome issues 2014-05-31 15:22:23 -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
808ee41538 fixed issues with savestate around rendering old text 2014-05-31 11:04:57 -04:00
meadowstream
48623ae777 trying to fix issue around savestate 2014-05-31 10:55:36 -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
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
b51a73481d save state fixed. simultaneous checking works 2014-05-30 20:05:50 -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
meadowstream
a3d98180ea Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-27 18:43:19 -04:00
meadowstream
e1dfa444b0 view.js changes 2014-05-27 18:43:15 -04:00
garrettdreyfus
f08b6d8dc4 help screen implemented 2014-05-26 21:05:58 -04:00
garrettdreyfus
0aaafbf760 text fades in 2014-05-26 14:43:05 -04:00
garrettdreyfus
93696511e2 score fades in 2014-05-26 14:24:38 -04:00
garrettdreyfus
bc548d3240 multipliers fade out faster 2014-05-26 14:14:30 -04:00
garrettdreyfus
2e15e31fe7 combo timing based on frames 2014-05-26 14:07:07 -04:00
meadowstream
911c0faacc changed this.ct to increment every time 2014-05-26 13:46:11 -04:00
garrettdreyfus
22c4891ca5 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-26 13:38:59 -04:00
garrettdreyfus
0eb631afdc better fonts 2014-05-26 13:38:47 -04:00
meadowstream
cccdb45f55 Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-26 13:30:43 -04:00
meadowstream
5fa3102024 made center text white 2014-05-26 13:30:39 -04:00
garrettdreyfus
f1c7c93b20 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-26 13:18:44 -04:00
garrettdreyfus
8a2fd29cad multipliers white 2014-05-26 13:18:27 -04:00
meadowstream
07938ea873 removed number render offset 2014-05-26 13:18:20 -04:00
meadowstream
807051212b centered text 2014-05-26 13:11:23 -04:00
meadowstream
d5ebbc071c fixed modifying rather than accessing in findCenterOfBlocks 2014-05-26 13:09:59 -04:00
meadowstream
d2d55bcb71 Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-26 13:04:30 -04:00
meadowstream
1f34cc64f7 block function returns a center slightly otuwards 2014-05-26 13:04:26 -04:00
garrettdreyfus
f77d8d5655 score multiplier 2014-05-26 13:04:23 -04:00
meadowstream
33930833de centered text 2014-05-26 12:57:18 -04:00
garrettdreyfus
844a856f8e start is Lovello too 2014-05-26 12:54:33 -04:00
garrettdreyfus
4d1aadd8d7 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-26 12:53:08 -04:00
garrettdreyfus
6ba95b9f46 Lovello is the bomb 2014-05-26 12:52:57 -04:00
meadowstream
2a1fbbc057 Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-26 12:49:24 -04:00
meadowstream
573f2c5afb added findCenterOfBlocks 2014-05-26 12:49:20 -04:00
garrettdreyfus
71f2563db8 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-26 12:46:12 -04:00
garrettdreyfus
144fd8e9f7 floating adder color of scored 2014-05-26 12:45:52 -04:00
meadowstream
cb42564bb3 removed clock hand 2014-05-26 12:41:04 -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
garrettdreyfus
2c707b62a9 adding floats up 2014-05-26 12:27:30 -04:00
garrettdreyfus
8c0692fa90 added obnoxious purple chain multiplier 2014-05-26 11:22:52 -04:00
Michael Yang
0b9cd14100 whoops 2014-05-26 01:28:37 -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
bfde350f92 Fixed mistakes during merge 2014-05-26 00:07:03 -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
12ded6b0da Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-25 23:42:17 -04:00
Michael Yang
2313940108 display score in center 2014-05-25 23:42:06 -04:00
garrettdreyfus
7b6a910865 added combo multiplier 2014-05-25 23:12:47 -04:00
Michael Yang
ff2978b9ad refactor for days 2014-05-25 22:50:13 -04:00
Michael Yang
83607bf806 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-25 22:30:04 -04:00
Michael Yang
91b3c3f925 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-25 22:29:36 -04:00
garrettdreyfus
6ef7f09da7 you dont spell parent parrent 2014-05-25 22:29:34 -04:00
Michael Yang
035ae2da91 fixed onblur pausing bug 2014-05-25 22:28:04 -04:00
garrettdreyfus
58d8016a28 more comments in entities 2014-05-25 22:17:26 -04:00
garrettdreyfus
b7fb4ab89d Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-25 22:06:28 -04:00
garrettdreyfus
c7061997f6 no circular references halfway comments 2014-05-25 22:06:15 -04:00
Noah Moroze
e64577f3b1 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-25 21:59:47 -04:00
Noah Moroze
85fe438cf0 Wrote exportSaveState 2014-05-25 21:59:33 -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
meadowstream
b0cfe52534 Merge branch 'master' into gh-pages 2014-05-25 21:25:45 -04:00
Michael Yang
94a6610977 remove test.js 2014-05-25 21:07:46 -04:00
garrettdreyfus
0ddf85c921 better gamestates 2014-05-25 21:04:14 -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
37dff530b8 changed way that settings.creationSpeedModifier is used 2014-05-25 18:45:20 -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
1db9d66474 no shadow 2014-05-25 11:05:05 -04:00
garrettdreyfus
b8526741c3 scoreScalar deleted 2014-05-25 10:55:49 -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
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