wbrawner/hextris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
646 commits 3 branches 1 tag 27 MiB
Commit graph

473 commits

Author SHA1 Message Date
lengstrom
dfb5e5ef46 added custom fonts to Text() object 2014-07-03 19:07:51 -04:00
lengstrom
2b528bb592 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-03 18:25:30 -04:00
lengstrom
cb488e0425 fixed block initialization animation playing during pause 2014-07-03 18:25:15 -04:00
Garrett Finucane
604dc44acb fixed tiny text issue 2014-07-03 17:51:13 -04:00
lengstrom
4609a35332 Replaced raw unicode with String.fromCharCode() 2014-07-03 16:39:29 -04:00
lengstrom
3ae89724cb changed delay length 2014-07-03 16:31:45 -04:00
lengstrom
bf2b33c7a5 added devMode, disabled debugging functions. first version of tutorial is done. added delay to gamePlay after pressing start to let the UI elements fade out. 2014-07-03 16:30:56 -04:00
lengstrom
140f0614e9 added drawKey(key, x, y) to draw any key at any given (x,y) 2014-07-03 01:24:35 -04:00
lengstrom
a614f5aec7 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-02 23:51:43 -04:00
lengstrom
13caa4c48e removed entities.js from index.html 2014-07-02 23:51:34 -04:00
Garrett Finucane
bc864ea20a Fixed flickering after pause 2014-07-02 11:10:36 -04:00
Garrett Finucane
47664aa63c Title screen fades in and out 2014-07-02 10:58:02 -04:00
lengstrom
ae6ef6690a Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-01 22:30:13 -04:00
lengstrom
8c4dd05427 standardized block fall speed on hexagon 2014-07-01 22:30:01 -04:00
Garrett Finucane
a231dd8a77 unhid all the buttons 2014-07-01 11:18:13 -04:00
Garrett Finucane
95c0816557 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-07-01 11:03:06 -04:00
Garrett Finucane
352988ab4a no more -2 gameState 2014-07-01 11:02:52 -04:00
lengstrom
26260747ff Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-06-30 22:45:14 -04:00
lengstrom
508002d16e fixed issue in which waves would restart after resuming the game 2014-06-30 22:45:00 -04:00
Garrett Finucane
d83d0c50be fixed clicking in hextris 2014-06-30 21:56:14 -04:00
Garrett Finucane
14e1f662cc new comboTimer 2014-06-30 21:31:54 -04:00
Garrett Finucane
9a3ac314c6 restart icon shown on resume 2014-06-30 13:34:55 -04:00
Garrett Finucane
ad48ad0a40 added restart button 2014-06-30 12:29:26 -04:00
Garrett Finucane
ea179a7292 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-06-30 12:13:50 -04:00
Garrett Finucane
b2abf7dabd new combotimer 2014-06-30 12:13:21 -04:00
lengstrom
36ec1a9b64 Removed spacebar speedup 2014-06-29 14:35:10 -04:00
lengstrom
4297dffefa fixed bug in which pause btn didn't show up after resuming a game 2014-06-29 14:25:40 -04:00
lengstrom
a5fe95443f removed useless opacity settings 2014-06-28 15:33:31 -04:00
lengstrom
5004a5cf34 fixed demo level faultily calling the game over after start 2014-06-28 14:42:55 -04:00
lengstrom
13be0a5db8 reverted changes around transition from start screen -> gameplay 2014-06-28 14:34:30 -04:00
lengstrom
31c4b4d96a removed white gaps, changed method for starting previously saved game to calling resumeGame (after init is called) 2014-06-28 13:44:43 -04:00
lengstrom
8ad952b379 fixed white gaps, added saveState to .unload handler 2014-06-28 12:01:41 -04:00
lengstrom
6304f410c9 fixed white gaps caused by constant, needless scaling during export 2014-06-28 11:57:22 -04:00
lengstrom
a7293a1d48 fixed start btn not starting saved games, removed useless debugging lines 2014-06-28 11:48:45 -04:00
lengstrom
2f2ad3b7ae fixed clicking on btn, started adding start->play transition anims 2014-06-28 11:24:47 -04:00
lengstrom
0a1925bc89 converted animLoop to a switch case 2014-06-27 22:15:16 -04:00
lengstrom
71dd048738 combo lines now match the faded blocks during menu screen play 2014-06-27 22:09:36 -04:00
lengstrom
57b6f21e89 converted completely to hex, added legacy support 2014-06-27 21:39:32 -04:00
lengstrom
38e417b704 fixed issues surrounding checking and faulty hex -> rgb translations 2014-06-27 21:31:59 -04:00
lengstrom
183af89000 fixed initial setup not rendering correctly in menu 2014-06-27 21:19:57 -04:00
lengstrom
632b68e60a extended reset to enter key press as well in the title screen 2014-06-27 19:10:53 -04:00
lengstrom
916cff498d 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
28515ab67c moved incrementing MainClock.ct from render to update 2014-06-24 13:41:40 -04:00
Garrett Finucane
83152a24ea timer drawn beneath blocks and goes backwards 2014-06-24 13:22:47 -04:00
Garrett Finucane
fc426f46dc fixed the whole weird stuff 2014-06-24 13:16:46 -04:00
Garrett Finucane
4b434de3ef Line Wraps around now 2014-06-24 11:44:40 -04:00
Garrett Finucane
8a78a4e6c5 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-06-24 10:53:53 -04:00
Garrett Finucane
1a8ee2388a boundary lines denote comboTimer 2014-06-24 10:53:26 -04:00
lengstrom
75ff870065 fixed restart method not clearing the screen, started fixing distFromHex changing 
after restart
 2014-06-24 09:47:15 -04:00
lengstrom
0715056fe0 fixed issue in which blocks were added twice (init was called twice) 2014-06-24 09:23:43 -04:00
Garrett Finucane
04c553d46d minor fixes 2014-06-24 00:15:03 -04:00
Garrett Finucane
48217a7940 falling blocks dont continue falling on refresh 2014-06-23 23:12:38 -04:00
Garrett Finucane
5b41abcb02 refreshing no longer clears at start 2014-06-23 22:31:25 -04:00
lengstrom
b7f475724f Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-06-23 22:26:05 -04:00
lengstrom
706c9f1130 added previous game display on the title 2014-06-23 22:26:00 -04:00
Garrett Finucane
31b4f91c32 high scores better 2014-06-23 22:21:36 -04:00
lengstrom
4936b76940 merged 2014-06-23 20:58:07 -04:00
lengstrom
b153107bdc added start screen 2014-06-23 20:55:04 -04:00
Garrett Finucane
5f25d1de37 re-whitened text 2014-06-23 20:18:32 -04:00
Garrett Finucane
b84e8c48f0 text inverts 2014-06-23 19:21:09 -04:00
Garrett Finucane
7b16ffc85a faded to immediate background 2014-06-23 18:47:29 -04:00
Garrett Finucane
6eb3d17f1c different timeout tone 2014-06-23 18:40:41 -04:00
Garrett Finucane
a5788fcc0c tints to show combo timeout 2014-06-23 18:35:28 -04:00
Garrett Finucane
55684e9abd added fading to denote combo timeout 2014-06-23 17:59:51 -04:00
Garrett Finucane
8637950d12 fixed importing 2014-06-23 15:46:14 -04:00
lengstrom
30260e25ef added intro.json 2014-06-23 15:31:48 -04:00
lengstrom
3fdde47bc9 updated settings for mobile version 2014-06-22 22:58:15 -04:00
lengstrom
a0f49f6040 reduced rate at which fading text is scaled relative to the size of hte canvas 2014-06-22 22:53:36 -04:00
lengstrom
03436dfe9f cleaned up some variable declarations 2014-06-22 16:52:51 -04:00
lengstrom
3ac66a1c55 fixed white gaps/misaligned blocks that occur at certain screen dimensions at startup 2014-06-22 16:49:26 -04:00
lengstrom
6c105fd460 fixed merge conflicts 2014-06-22 15:17:00 -04:00
lengstrom
e690de3251 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
ee27fb8a73 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-06-22 13:25:33 -04:00
Garrett Finucane
921bb49023 no pausing at game over 2014-06-22 13:25:20 -04:00
lengstrom
91e89502aa removed for-in loops; cleaned up syntax 2014-06-22 12:49:27 -04:00
lengstrom
8cab632d4a fixed hexagon not being centered in the y axis during pauses 2014-06-22 12:32:23 -04:00
lengstrom
01c1e8c00e added scaling text, fits to y dimension; formatted js 2014-06-22 00:26:46 -04:00
Garrett Finucane
a9ac49e734 reworked endgame 2014-06-21 16:58:18 -04:00
Garrett Finucane
e07609fd48 now fancy blurs 2014-06-21 16:06:23 -04:00
lengstrom
936694355f reformatting 2014-06-04 14:33:40 -04:00
lengstrom
03b67f3f4b scaled difficulty, fixed issuei n which blocks don't fall after blocks below them are destroyed 2014-06-01 18:48:28 -04:00
lengstrom
2249b03cf1 raised difficulty 2014-05-31 22:32:02 -04:00
lengstrom
eefb0b6288 increased spawn time delta 2014-05-31 22:21:27 -04:00
lengstrom
ef4c496b44 lowered difficulty 2014-05-31 22:00:25 -04:00
lengstrom
1432a9ea8d raised difficulty 2014-05-31 21:56:52 -04:00
lengstrom
d18ce36bed lowered difficulty 2014-05-31 21:54:23 -04:00
lengstrom
7431312f9b fixed merge conflicts 2014-05-31 21:45:25 -04:00
lengstrom
9e7e82c729 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
cb89190a86 fixed start screen 2014-05-31 20:17:00 -04:00
Garrett Finucane
8f0d1a4f93 continues to draw score and background hex after pause 2014-05-31 20:10:32 -04:00
Garrett Finucane
4d848a5ac4 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
03d1627037 changed first screen 2014-05-31 19:37:23 -04:00
lengstrom
3dff49b0ef 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
lengstrom
269f79232f made spacebar pressing make blocks spawn twice as fast as well as go twice as fast 2014-05-31 15:32:01 -04:00
lengstrom
089a5029c6 changed magnitude to scale with the actual scale of the canvas, fixed fontawesome issues 2014-05-31 15:22:23 -04:00
lengstrom
aabc3447af 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
82fe0c9a6b 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
eb84ceea27 html pause 2014-05-31 11:13:40 -04:00
lengstrom
f5c27aad26 fixed issues with savestate around rendering old text 2014-05-31 11:04:57 -04:00
lengstrom
8d1bc380d2 trying to fix issue around savestate 2014-05-31 10:55:36 -04:00
lengstrom
1e664bc9f6 added spacebar to speed 2014-05-31 10:22:42 -04:00
lengstrom
f577d46b0e added spacebar to make game go twice as fast 2014-05-31 09:56:38 -04:00
Garrett Finucane
244f6f9c49 window on blur no longer unpauses 2014-05-30 21:23:32 -04:00
Garrett Finucane
a63415c1d8 fade in on restart 2014-05-30 21:05:01 -04:00
Garrett Finucane
1cb8663496 save state fixed. simultaneous checking works 2014-05-30 20:05:50 -04:00
Garrett Finucane
90ac4ac8e7 saveState working now, the falling blocks don't fall into clock now 2014-05-30 19:06:16 -04:00
lengstrom
5069746abd Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-27 18:43:19 -04:00
lengstrom
29cca41508 view.js changes 2014-05-27 18:43:15 -04:00
garrettdreyfus
540bc36ec0 help screen implemented 2014-05-26 21:05:58 -04:00
garrettdreyfus
23e6cd36f6 text fades in 2014-05-26 14:43:05 -04:00
garrettdreyfus
f3c7752499 score fades in 2014-05-26 14:24:38 -04:00
garrettdreyfus
76ddb4792e multipliers fade out faster 2014-05-26 14:14:30 -04:00
garrettdreyfus
bd2e1d2f56 combo timing based on frames 2014-05-26 14:07:07 -04:00
lengstrom
704e8478b4 changed this.ct to increment every time 2014-05-26 13:46:11 -04:00
garrettdreyfus
6712507065 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-26 13:38:59 -04:00
garrettdreyfus
5440a2a21a better fonts 2014-05-26 13:38:47 -04:00
lengstrom
472c86297d Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-26 13:30:43 -04:00
lengstrom
c97a77bbdf made center text white 2014-05-26 13:30:39 -04:00
garrettdreyfus
3cdc6228f5 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-26 13:18:44 -04:00
garrettdreyfus
a9c7d1668c multipliers white 2014-05-26 13:18:27 -04:00
lengstrom
ad15dc2fb7 removed number render offset 2014-05-26 13:18:20 -04:00
lengstrom
5502c3a39f centered text 2014-05-26 13:11:23 -04:00
lengstrom
00e250b80e fixed modifying rather than accessing in findCenterOfBlocks 2014-05-26 13:09:59 -04:00
lengstrom
4c219e2ddf Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-26 13:04:30 -04:00
lengstrom
b1be42241b block function returns a center slightly otuwards 2014-05-26 13:04:26 -04:00
garrettdreyfus
7fa3481bb3 score multiplier 2014-05-26 13:04:23 -04:00
lengstrom
37fcd47e37 centered text 2014-05-26 12:57:18 -04:00
garrettdreyfus
bca95619b3 start is Lovello too 2014-05-26 12:54:33 -04:00
garrettdreyfus
e97a437e34 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-26 12:53:08 -04:00
garrettdreyfus
2f2ed11c9c Lovello is the bomb 2014-05-26 12:52:57 -04:00
lengstrom
667787235f Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-26 12:49:24 -04:00
lengstrom
420ed9d43e added findCenterOfBlocks 2014-05-26 12:49:20 -04:00
garrettdreyfus
94650522b5 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-26 12:46:12 -04:00
garrettdreyfus
5abb300163 floating adder color of scored 2014-05-26 12:45:52 -04:00
lengstrom
c6fcfb4a04 removed clock hand 2014-05-26 12:41:04 -04:00
Noah Moroze
f24055bc6a Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-26 12:30:45 -04:00
Noah Moroze
d6d738e298 Fixed blocks starting behind hexagon on load save state 2014-05-26 12:30:30 -04:00
garrettdreyfus
d53768bf48 adding floats up 2014-05-26 12:27:30 -04:00
garrettdreyfus
3c895b6e56 added obnoxious purple chain multiplier 2014-05-26 11:22:52 -04:00
Michael Yang
febf41fd5b whoops 2014-05-26 01:28:37 -04:00
Michael Yang
ff50557d25 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-26 01:12:01 -04:00
Michael Yang
95ac06bc13 added clock hand 2014-05-26 01:11:47 -04:00
Noah Moroze
09f6a0f83c Fixed problems with not resetting save 2014-05-26 01:11:13 -04:00
Noah Moroze
06bacb800f Fixed mistakes during merge 2014-05-26 00:07:03 -04:00
Noah Moroze
25c0d69b0d Merge 2014-05-25 23:55:20 -04:00
Noah Moroze
3421f54db0 Save state during game 2014-05-25 23:52:35 -04:00
Michael Yang
a239c13bee Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-25 23:42:17 -04:00
Michael Yang
ed736e18f7 display score in center 2014-05-25 23:42:06 -04:00
garrettdreyfus
0de8d54e79 added combo multiplier 2014-05-25 23:12:47 -04:00
Michael Yang
a89f66723c refactor for days 2014-05-25 22:50:13 -04:00
Michael Yang
0546c8abdf Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-25 22:30:04 -04:00
Michael Yang
2421d08ade Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-25 22:29:36 -04:00
garrettdreyfus
466b7f4c73 you dont spell parent parrent 2014-05-25 22:29:34 -04:00
Michael Yang
4c1ea98f8e fixed onblur pausing bug 2014-05-25 22:28:04 -04:00
garrettdreyfus
155ece8b0b more comments in entities 2014-05-25 22:17:26 -04:00
garrettdreyfus
79f5e856d7 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-25 22:06:28 -04:00
garrettdreyfus
a79ec65bed no circular references halfway comments 2014-05-25 22:06:15 -04:00
Noah Moroze
9b297dbfa0 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-05-25 21:59:47 -04:00
Noah Moroze
12caecdbeb Wrote exportSaveState 2014-05-25 21:59:33 -04:00
Michael Yang
6344039e69 Merge branch 'master' of https://github.com/teamsnowman/hextris 2014-05-25 21:49:18 -04:00
Michael Yang
5dc31d2e54 create update.js, render.js 2014-05-25 21:49:03 -04:00
garrettdreyfus
1abc55242f added comments for checking 2014-05-25 21:47:21 -04:00
lengstrom
9eb41988f3 Merge branch 'master' into gh-pages 2014-05-25 21:25:45 -04:00
Michael Yang
79e79c5a32 remove test.js 2014-05-25 21:07:46 -04:00
garrettdreyfus
4cbd909845 better gamestates 2014-05-25 21:04:14 -04:00
garrettdreyfus
990b5cf83e better infringement detection 2014-05-25 20:34:56 -04:00
lengstrom
b7a6bdf5c1 added new block destruction effects. broke pausing 2014-05-25 19:53:02 -04:00
lengstrom
2287f45e78 changed way that settings.creationSpeedModifier is used 2014-05-25 18:45:20 -04:00
lengstrom
09898509da changed difficulty level 2014-05-25 18:32:49 -04:00
lengstrom
97a08da984 added mobile version 2014-05-25 18:27:25 -04:00
lengstrom
ad336749e8 added 1/4 retina display 2014-05-25 12:02:22 -04:00
lengstrom
4c1e71ce22 fixed falling hexagon 2014-05-25 11:31:05 -04:00
lengstrom
b16fa95c7e Merge branch 'master' into gh-pages 2014-05-25 11:17:10 -04:00
lengstrom
114d420a49 Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-25 11:16:37 -04:00
lengstrom
f69e8e31f6 added scaling 2014-05-25 11:16:33 -04:00
garrettdreyfus
9dc6c0ee49 pausing fixed 2014-05-25 11:15:22 -04:00
garrettdreyfus
00116cc43c no shadow 2014-05-25 11:05:05 -04:00
garrettdreyfus
5ce2fb994c scoreScalar deleted 2014-05-25 10:55:49 -04:00
garrettdreyfus
17c4f72e8c 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
797f5da920 clean script created 2014-05-25 10:51:25 -04:00
lengstrom
f1744cf1c3 Merge branch 'gh-pages' 2014-05-25 10:42:31 -04:00
lengstrom
f5c0d7a047 merged 2014-05-25 10:42:09 -04:00
lengstrom
117a3f882f added real scaling 2014-05-25 10:41:06 -04:00
garrettdreyfus
2976744f33 deleted blocks can not partake in combos 2014-05-25 10:20:32 -04:00
garrettdreyfus
18c5e8b4d0 got rid of useless lane calculation 2014-05-25 10:08:09 -04:00
garrettdreyfus
0113c3668f Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris 2014-05-25 10:03:42 -04:00
garrettdreyfus
c58a48f88d added Attached lane, fixes checking 2014-05-25 10:03:28 -04:00
lengstrom
23bf29e7ab merged 2014-05-25 01:12:06 -04:00
lengstrom
a56f47c9b7 centered, resized canvas. made system to augment different aspects of the game for different devices. 2014-05-25 01:11:24 -04:00
garrettdreyfus
3c84813469 better scoring 2014-05-25 00:59:56 -04:00
garrettdreyfus
671ff6c0f2 added back the enter key 2014-05-25 00:44:25 -04:00
garrettdreyfus
31727a9f9e 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
268d55db14 fixed checking 2014-05-25 00:39:23 -04:00
garrettdreyfus
ab2ca381b3 better input 2014-05-24 22:44:23 -04:00
lengstrom
7cb65b2d20 readded pausing onblur, removed debugger statements 2014-05-24 22:10:12 -04:00
lengstrom
047ca6833d removed false gameovers, added css for local fonts 2014-05-24 21:12:12 -04:00
lengstrom
9c5ed782eb changed ramping in difficulty 2014-05-24 19:50:57 -04:00
lengstrom
050cb49d21 fixed issues surrounding white blocks 2014-05-24 18:28:32 -04:00
lengstrom
c1ffee24c2 added ability to restart game at any time using enter, removed logging 2014-05-24 16:39:25 -04:00
lengstrom
78f020dd1b started to add ability to restart game at any time by pressing enter 2014-05-24 16:39:04 -04:00