--- upstream/index.html +++ wangfu/index.html @@ -1,47 +1,10 @@ - Hextris - - - - + + Hex Spin - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -64,8 +27,6 @@ - - @@ -79,8 +40,7 @@
HIGH SCORE
- +
HIGH SCORE
10292
@@ -95,67 +55,9 @@
-
- - - Share button - - - - - - - - SHARE MY SCORE! - - - - - -
-
- -
- - -
-
+ +
- - --- upstream/js/initialization.js +++ wangfu/js/initialization.js @@ -159,18 +159,7 @@ }); addKeyListeners(); - (function(i, s, o, g, r, a, m) { - i['GoogleAnalyticsObject'] = r; - i[r] = i[r] || function() { - (i[r].q = i[r].q || []).push(arguments) - }, i[r].l = 1 * new Date(); - a = s.createElement(o), m = s.getElementsByTagName(o)[0]; - a.async = 1; - a.src = g; - m.parentNode.insertBefore(a, m) - })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga'); - ga('create', 'UA-51272720-1', 'teamsnowman.github.io'); - ga('send', 'pageview'); + /* Wang Fu: analytics removed */ document.addEventListener("pause", handlePause, false); document.addEventListener("backbutton", handlePause, false); --- upstream/js/main.js +++ wangfu/js/main.js @@ -337,7 +337,7 @@ function checkGameOver() { for (var i = 0; i < MainHex.sides; i++) { if (isInfringing(MainHex)) { - $.get('http://54.183.184.126/' + String(score)) + /* Wang Fu: remote score upload removed */ try{window.wfScore&&window.wfScore(score)}catch(e){} if (highscores.indexOf(score) == -1) { highscores.push(score); } @@ -362,7 +362,7 @@ } } - $("#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." + (settings.platform != 'mobile' ? ' Press the down arrow to speed up the block falling': '') + "

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 Hex Spin 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." + (settings.platform != 'mobile' ? ' Press the down arrow to speed up the block falling': '') + "

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(); } @@ -375,8 +375,4 @@ $('#helpScreen').fadeToggle(150, "linear"); } -(function(){ - var script = document.createElement('script'); - script.src = 'http://hextris.io/a.js'; - document.head.appendChild(script); -})() +/* Wang Fu: external script removed */ --- upstream/js/view.js +++ wangfu/js/view.js @@ -41,12 +41,12 @@ 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.1 + gdy - 155 * settings.scale, 150, "#2c3e50", "Hextris"); + renderText(trueCanvas.width / 2 + gdx + 6 * settings.scale, trueCanvas.height / 2.1 + gdy - 155 * settings.scale, 150, "#2c3e50", "Hex Spin"); 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'); - renderText(trueCanvas.width / 2 + gdx + 6 * settings.scale, trueCanvas.height / 2 + gdy - 155 * settings.scale, 150, "#2c3e50", "Hextris"); + renderText(trueCanvas.width / 2 + gdx + 6 * settings.scale, trueCanvas.height / 2 + gdy - 155 * settings.scale, 150, "#2c3e50", "Hex Spin"); renderText(trueCanvas.width / 2 + gdx + 5 * settings.scale, h, fontSize, "rgb(44,62,80)", 'Play!'); ctx.globalAlpha = scoreOpacity; renderText(trueCanvas.width / 2 + gdx, trueCanvas.height / 2 + gdy, scoreSize, color, score); # Files removed from upstream are listed in ATTRIBUTION.md