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

510 commits

Author SHA1 Message Date
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
lengstrom
cf574f8599 added ability to turn hexagon during startup 2014-05-24 16:35:32 -04:00
lengstrom
014b110321 fixed conflicts around input.js and pausing 2014-05-24 16:04:57 -04:00
lengstrom
0ce1d424b3 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
f002726b23 hacky fix to drop blocks on gameover 2014-05-24 16:01:24 -04:00
Michael Yang
c981196677 ended spawning blocks on gameover 2014-05-24 15:59:13 -04:00
lengstrom
b2bb34bbfb set paused to always call requestAnimFrame 2014-05-24 15:56:29 -04:00
Michael Yang
81f04c93b5 Merge branch 'master' of https://github.com/teamsnowman/hextris 2014-05-24 15:52:38 -04:00
Michael Yang
071b072c7e center hex snaps on gameover 2014-05-24 15:52:25 -04:00
garrettdreyfus
8fe0c0f09b Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-05-24 15:51:32 -04:00
lengstrom
567f212f37 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-24 15:51:13 -04:00
garrettdreyfus
6ade58139f Merge branch 'master' of http://github.com/teamsnowman/hextris 
Conflicts:
	js/main.js
 2014-05-24 15:51:03 -04:00
garrettdreyfus
a5539ae7be deleting is back 2014-05-24 15:50:01 -04:00
lengstrom
635993dccb fixed block detection 2014-05-24 15:48:48 -04:00
lengstrom
41d37b24d7 removed debugger statements 2014-05-24 15:46:35 -04:00
Michael Yang
c11cd336fe fixed restart bug 2014-05-24 15:42:40 -04:00
lengstrom
dcf4a38dd8 made anim slower 2014-05-24 15:41:44 -04:00
lengstrom
36a1c2b924 boundary renders below hex 2014-05-24 15:39:27 -04:00
lengstrom
b02759df23 merged boundary systems 2014-05-24 15:37:21 -04:00
lengstrom
bd65f6da30 added new block initialization animation 2014-05-24 15:35:38 -04:00
garrettdreyfus
320ba2c046 outline 2014-05-24 15:31:57 -04:00
Michael Yang
b1a39795fa whoops, now properly merged 2014-05-24 15:10:28 -04:00
Michael Yang
82d4ab6f67 merge conflict resolved 2014-05-24 15:07:58 -04:00
Michael Yang
9c2abda142 improved drawPolygon, changed inner hex 2014-05-24 15:06:57 -04:00
garrettdreyfus
dc63b76cb3 Merge branch 'master' of http://github.com/teamsnowman/hextris 
Conflicts:
	js/main.js
 2014-05-24 14:53:22 -04:00
garrettdreyfus
2a3b9c08ac pauses when you leave the tab 2014-05-24 14:52:21 -04:00
lengstrom
d61f35e64d added fade in for hexagonal boundary 2014-05-24 14:41:14 -04:00
garrettdreyfus
a4ee273e8b Merge branch 'master' of http://github.com/teamsnowman/hextris 2014-05-24 14:38:36 -04:00
garrettdreyfus
626d0ca3ad not sure 2014-05-24 14:38:35 -04:00
Michael Yang
7a84ee597a Merge branch 'master' of https://github.com/teamsnowman/hextris 2014-05-24 14:37:55 -04:00
Michael Yang
f304010964 fixed height vs originalHeight drawing 2014-05-24 14:37:29 -04:00
garrettdreyfus
0641df1492 wavegen back to normal 2014-05-24 14:15:07 -04:00
garrettdreyfus
ece80f89b8 Merge branch 'master' of http://github.com/teamsnowman/hextris 2014-05-24 14:12:44 -04:00
garrettdreyfus
c464192afe blocks fade in on shoot 2014-05-24 14:12:33 -04:00
lengstrom
54c0d53a35 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-24 14:12:19 -04:00
lengstrom
af3bc9ce1b Merge branch 'gh-pages' 2014-05-24 14:12:13 -04:00
lengstrom
adac2c4425 fixed importing and exporting game data 2014-05-24 14:12:01 -04:00
garrettdreyfus
99fca37ea4 better boundry line 2014-05-24 14:08:40 -04:00
garrettdreyfus
0474c270cf pausing fixed 2014-05-24 13:59:01 -04:00
garrettdreyfus
5ff998146d no undefined colors 2014-05-24 13:56:41 -04:00
garrettdreyfus
7f969d2302 checking working again 2014-05-24 13:25:33 -04:00
garrettdreyfus
39cfa47837 blocks being generated no checking happening 2014-05-24 13:24:03 -04:00
garrettdreyfus
0b7e749d67 better modular arithmetic 2014-05-24 13:11:17 -04:00
lengstrom
d4314cca00 Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages 2014-05-24 12:57:38 -04:00
lengstrom
ca8936e385 fixed pausing 2014-05-24 12:57:27 -04:00
garrettdreyfus
71eda56c77 thread safe(lol :)) light ui 2014-05-24 12:48:46 -04:00
lengstrom
01ac3a9553 fixed issues around blocks not revolving + updated generation mehcanics 2014-05-24 12:21:29 -04:00
lengstrom
f1ee299a16 made timing for wavegeneration iteration rather than time based 2014-05-24 12:09:46 -04:00
lengstrom
3c3dd63124 Merge branch 'master' into gh-pages 2014-05-23 23:28:44 -04:00
lengstrom
0e010bf3d5 generations of waves start at a faster speed but reach mins slower 2014-05-23 23:27:58 -04:00
lengstrom
869e37e100 made # of sides more dynamic 2014-05-23 22:46:01 -04:00
lengstrom
eac2ec4271 added more variety in block generation 2014-05-23 22:41:55 -04:00
garrettdreyfus
4774b021d1 less consolidateBlocks 2014-05-23 21:36:59 -04:00
lengstrom
2782e1b401 changed randomGEneration function to have faster rampup, longer amount of time in the more fun zone 2014-05-23 20:49:57 -04:00
lengstrom
63dbd47ee7 added beginnings of new wave system 2014-05-23 20:23:31 -04:00
lengstrom
2a56b01c0b added bouncing anim v2 2014-05-23 16:50:18 -04:00
lengstrom
163f0570a4 added new startanim 2014-05-23 16:13:28 -04:00
Noah Moroze
f943487d1f Properly set default highscores 2014-05-23 13:01:51 -04:00
Michael Yang
2c5dd782a8 added localStorage highscores 2014-05-23 01:51:16 -04:00
Michael Yang
b0868afc1b added high score displaying 2014-05-23 01:10:12 -04:00
Michael Yang
cbcd95b85b added navbar, added pausing, changed score rendering 2014-05-23 00:51:03 -04:00
lengstrom
13b51a61a6 added analytics v2 2014-05-22 21:06:52 -04:00
garrettdreyfus
b0cb91272c Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris 2014-05-22 20:44:25 -04:00
garrettdreyfus
af167cf28f faster fade 2014-05-22 20:44:14 -04:00
Noah Moroze
4dcd2a3508 Removed space-to-speed-up until we figure out an alternative 2014-05-22 20:36:48 -04:00
lengstrom
9481fb277c added new waves system, starting to redo start screen 2014-05-22 20:22:20 -04:00
lengstrom
49f149ae5b merged 2014-05-22 19:32:58 -04:00
lengstrom
07c19ca2bb added more extensive shaking + cleaned up some code 2014-05-22 19:30:40 -04:00
garrettdreyfus
82c03cbb99 fixed scoring 2014-05-22 19:30:01 -04:00
garrettdreyfus
542f3bed67 no more disappearing blocks 2014-05-22 19:08:08 -04:00
lengstrom
fd5af81e17 added shaking when the hexagon is hit by blocks 2014-05-22 19:01:39 -04:00
lengstrom
a740f1b60d added recording system 2014-05-22 17:04:57 -04:00
lengstrom
62326305f1 merged 2014-05-22 16:38:32 -04:00
lengstrom
6a6eceec06 added import/export system 2014-05-22 16:36:32 -04:00
Garrett Finucane
ade0eaca68 fixed combos and added wavegen 2014-05-22 15:42:05 -04:00
Garrett Finucane
283cbbe281 minor fixes wavegen a thing now 2014-05-22 15:29:35 -04:00
Garrett Finucane
1079b91329 added combo detecting 2014-05-22 14:19:58 -04:00
Garrett Finucane
8c85aa684a got rid of cruft 2014-05-22 13:53:24 -04:00
lengstrom
ed81b5fca9 fixed falling mechanics, tint and opacity no longer conflict 2014-05-22 13:26:44 -04:00
lengstrom
71ebf63215 now, only blocks that need to fall go into a state of falling after 
blocks below them are destroyed
 2014-05-22 13:10:26 -04:00
lengstrom
e805ea7230 blocks now fade out based on their opacity before being destroyed 2014-05-22 13:01:39 -04:00
lengstrom
5ffff58acc added opacity / tint properties 2014-05-21 18:39:02 -04:00
lengstrom
6164ef001d removed innerhtml scoring statement 2014-05-21 17:44:34 -04:00
lengstrom
04be3e6433 removed useless translation + did some jslinting 2014-05-21 17:41:18 -04:00
lengstrom
03368ec4b5 Merge branch 'master' into gh-pages 2014-05-21 17:39:49 -04:00
Michael Yang
4e88f3e5ce fixed merge conflicts 2014-05-21 17:31:19 -04:00
Michael Yang
846a850c2d changed shadow to gradient 2014-05-21 17:18:18 -04:00
garrettdreyfus
e6b6b6664a Merge branch 'master' of http://github.com/teamsnowman/hextris into gh-pages 
Conflicts:
	js/checking.js
 2014-05-20 22:39:03 -04:00
garrettdreyfus
1d6045c19d NO LAG ctx.shadowBlur=25 2014-05-20 22:33:50 -04:00
Noah Moroze
f04b75a312 Got rid of extraneous debugger call 2014-05-20 20:39:19 -04:00
Noah Moroze
8a7ff8d9ad Merge branch 'master' of https://github.com/teamsnowman/hextris 2014-05-20 20:33:51 -04:00
Noah Moroze
5e3af346bd Render score on canvas for better performance 2014-05-20 20:33:44 -04:00
Garrett Finucane
03a3df032d Delete hey.js 2014-05-20 19:56:58 -04:00
garrettdreyfus
dade745ef6 no debugger 2014-05-20 17:52:57 -04:00
garrettdreyfus
491a0cc1dc no diagonals for real 2014-05-20 17:09:39 -04:00
garrettdreyfus
a113cf15bf no diagonals 2014-05-20 16:59:58 -04:00
garrettdreyfus
06d328372c Merge branch 'master' of http://github.com/teamsnowman/hextris into newFlow 
Conflicts:
	js/checking.js
	js/entities.js
 2014-05-20 16:50:21 -04:00
garrettdreyfus
3d415cae05 Mark and sweep ftw 2014-05-20 16:48:11 -04:00
lhs local
efbfbe18b0 kinda working 2014-05-20 14:34:02 -04:00
Noah Moroze
13e417bf5b Split loop into game update and render, separated graphics-related code 2014-05-20 08:30:14 -04:00
Noah Moroze
716234ece2 Fixed boundary hexagon 2014-05-20 08:05:21 -04:00
garrettdreyfus
be3b296334 spiral shooting 2014-05-20 07:13:32 -04:00
Garrett Finucane
e711fce7e7 better sounds two at a time 2014-05-19 22:28:27 -04:00
Michael Yang
d078dbd72d Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-19 22:17:06 -04:00
Michael Yang
d04972140a added shadows 2014-05-19 22:16:43 -04:00
lengstrom
6d260ae38a made blocks smaller. still have to update the boundary to reflect this. 2014-05-19 21:52:31 -04:00
lengstrom
07c5a18ddb (hopefully) made canvas lines crisper 2014-05-19 21:21:16 -04:00
Garrett Finucane
9663294e1e why you no work 2014-05-19 20:47:19 -04:00
lengstrom
4ca5d26df8 made keys fire on keydown rather than keyup 2014-05-19 17:07:18 -04:00
lengstrom
f3fd1afc07 fixed white gaps + added gravity back in 2014-05-19 16:36:28 -04:00
lengstrom
c9dbd9c403 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-19 16:31:24 -04:00
Garrett Finucane
2b41ef77be always use var kids 2014-05-19 16:27:50 -04:00
lengstrom
c5dfd749c1 added index 2014-05-19 16:22:30 -04:00
lengstrom
3eea6af2a4 added angular velocity 2014-05-19 15:49:05 -04:00
Garrett Finucane
676dfe1e57 Merge branch 'master' of http://github.com/teamsnowman/hextris 2014-05-19 13:25:31 -04:00
Garrett Finucane
310e907b83 some nice sounds 2014-05-19 13:25:20 -04:00
Noah Moroze
0558ba2193 Added rotation animation for hexagon 2014-05-19 13:18:49 -04:00
Garrett Finucane
6e9d12b94f Fixed checking as far as I can tell 2014-05-19 10:36:13 -04:00
Garrett Finucane
d4edd7399a more sensible timing 2014-05-18 23:35:11 -04:00
Garrett Finucane
20765f1032 more sensoble timing 2014-05-18 23:34:05 -04:00
Noah Moroze
bc322f2dfb Fixed the WHITTEEEE GAPS 2014-05-18 23:14:55 -04:00
Mathew Huusko V
addfc956db Support retina displays (multiple X rendering) 2014-05-18 14:48:50 -04:00
Mathew Huusko V
66eba573d1 Some simple reformatting, fix a couple linting errors 2014-05-18 14:15:13 -04:00
Mathew Huusko V
8f3d2e3797 Organize project slightly, clean html 2014-05-18 14:12:33 -04:00