diff --git a/CNAME b/CNAME deleted file mode 100644 index f4dc716..0000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -hextris.io diff --git a/README.md b/README.md index 8f09306..7842797 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,25 @@ Hextris ========== -Contributors: - - Logan Engstrom (@meadowstream) - - Garrett Finucane (@garrettdreyfus) - - Noah Moroze (@nmoroze) - - Michael Yang (@themichaelyang) +
-#Conribtions -Please submit pull requests to clay-improvemnets +An addictive puzzle game inspired by Tetris. Play it at [hextris.io](http://hextris.io). -# Releases -#### iOS: https://itunes.apple.com/us/app/hextris/id903769553?mt=8 -![](http://i.imgur.com/KBYZcf5.png) +By: + - Logan Engstrom ([@lengstrom](http://loganengstrom.com/)) + - Garrett Finucane ([@garrettdreyfus](http://github.com/garrettdreyfus)) + - Noah Moroze ([@nmoroze](http://github.com/nmoroze)) + - Michael Yang ([@themichaelyang](http://github.com/themichaelyang)) -#### Android: https://play.google.com/store/apps/details?id=com.hextris.hextris -![](http://i.imgur.com/mxj8yKs.png) +# Contributions +Please submit pull requests to the branch `clay-improvements`. -#### Firefox OS: https://marketplace.firefox.com/app/hextris-app -![](http://i.imgur.com/RhECXPg.png) +# About +Hextris was created by a couple high school friends (who are now in college!) who unfortunately don't have as much time to update the game. If you'd like to support the open-source development of Hextris, please consider donating at: + +**ETH:** `0xbf5414129552D37B4Fb12D058Cf1596B960d25b2` + +Disclosure: Please note that the version on hextris.io uses [Monero](http://coinhive.com) to support the developers. If you'd rather not play that version, an unmonetized version is available to play at: https://hextris.github.io/hextris. ## Press kit @@ -26,4 +27,4 @@ http://hextris.github.io/presskit/info.html ## License -This work is under a GPL v3 license. \ No newline at end of file +This work is under a GPL v3 license. diff --git a/index.html b/index.html index a8287cc..355f2a8 100644 --- a/index.html +++ b/index.html @@ -55,6 +55,14 @@ + + + + + + + + diff --git a/js/main.js b/js/main.js index 04e36d2..455e5fa 100644 --- a/js/main.js +++ b/js/main.js @@ -362,7 +362,7 @@ function showHelp() { } } - $("#inst_main_body").html("
HOW TO PLAY

The goal of Hextris is to stop blocks from leaving the inside of the outer gray hexagon.

" + (settings.platform != 'mobile' ? 'Press the right and left arrow keys' : 'Tap the left and right sides of the screen') + " to rotate the Hexagon

Clear blocks and get points by making 3 or more blocks of the same color touch.

Time left before your combo streak disappears is indicated by the colored lines on the outer hexagon

By Logan Engstrom & Garrett Finucane
Find Hextris on iOS & Android
More @ the Hextris Website"); + $("#inst_main_body").html("
HOW TO PLAY

The goal of Hextris is to stop blocks from leaving the inside of the outer gray hexagon.

" + (settings.platform != 'mobile' ? 'Press the right and left arrow keys' : 'Tap the left and right sides of the screen') + " to rotate the Hexagon

Clear blocks and get points by making 3 or more blocks of the same color touch.

Time left before your combo streak disappears is indicated by the colored lines on the outer hexagon.

By Logan Engstrom & Garrett Finucane
Find Hextris on iOS & Android
More @ the Hextris Website"); if (gameState == 1) { pause(); } diff --git a/js/render.js b/js/render.js index 4c3a550..7aafb33 100644 --- a/js/render.js +++ b/js/render.js @@ -72,7 +72,7 @@ function renderBeginningText() { var mob, fontSize; if(/mobile|Mobile|iOS|Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) { mob = true; - input_text = 'Tap the screen\'s left and ride' + input_text = 'Tap the screen\'s left and right' action_text = 'sides to rotate the hexagon' score_text = 'Match 3+ blocks to score' fontSize = 35 diff --git a/js/view.js b/js/view.js index aeecc81..18cc703 100644 --- a/js/view.js +++ b/js/view.js @@ -41,8 +41,8 @@ function drawScoreboard() { var h = trueCanvas.height / 2 + gdy + 100 * settings.scale; if (gameState === 0) { renderText(trueCanvas.width / 2 + gdx + 6 * settings.scale, trueCanvas.height / 2 + gdy, 60, "rgb(236, 240, 241)", String.fromCharCode("0xf04b"), 'px FontAwesome'); - renderText(trueCanvas.width / 2 + gdx + 6 * settings.scale, trueCanvas.height / 2 + gdy - 155 * settings.scale, 150, "#2c3e50", "Hextris"); - renderText(trueCanvas.width / 2 + gdx + 5 * settings.scale, h, fontSize, "rgb(44,62,80)", 'Play!'); + renderText(trueCanvas.width / 2 + gdx + 6 * settings.scale, trueCanvas.height / 2.1 + gdy - 155 * settings.scale, 150, "#2c3e50", "Hextris"); + renderText(trueCanvas.width / 2 + gdx + 5 * settings.scale, h + 10, fontSize, "rgb(44,62,80)", 'Play!'); } else if (gameState != 0 && textOpacity > 0) { textOpacity -= 0.05; renderText(trueCanvas.width / 2 + gdx + 6 * settings.scale, trueCanvas.height / 2 + gdy, 60, "rgb(236, 240, 241)", String.fromCharCode("0xf04b"), 'px FontAwesome'); diff --git a/logo_android.psd b/logo_android.psd deleted file mode 100644 index 66f02d8..0000000 Binary files a/logo_android.psd and /dev/null differ diff --git a/style/style.css b/style/style.css index 841b996..b57f23e 100644 --- a/style/style.css +++ b/style/style.css @@ -446,18 +446,18 @@ body { @font-face { font-family:Exo; font-weight:light; - src:url("./style/fonts/Exo2-ExtraLight.otf") format("opentype"); + src:url("./fonts/Exo2-ExtraLight.otf") format("opentype"); } @font-face { font-family:Exo; - src:url("/style/fonts/Exo2-Regular.otf") format("opentype"); + src:url("./fonts/Exo2-Regular.otf") format("opentype"); } @font-face { font-family:Exo; font-weight:bold; - src:url("/style/fonts/Exo2-SemiBold.otf") format("opentype"); + src:url("./fonts/Exo2-SemiBold.otf") format("opentype"); } .GOTitle { diff --git a/test_endgame.html b/test_endgame.html deleted file mode 100644 index 4bc83a0..0000000 --- a/test_endgame.html +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - - - -
-
- - - -
-
- - - -
-
-
-
GAME OVER
-
1843
-
HIGH SCORES
-
1. 1870
-
2. 1540
-
3. 1130
-
4. 960
-
-
- -
- - - - Share button - - - - - - - - SHARE MY SCORE! - - - - - -
-
- -
-
- - - - - - -