From 2dac49fedf25cf4fae7769d93eaa0a07ceb3f684 Mon Sep 17 00:00:00 2001 From: Logan Engstrom Date: Mon, 25 Aug 2014 23:26:14 -0400 Subject: [PATCH 01/15] added v8 --- index.html | 28 ++++++++++++++-------------- {js => js_v8}/Block.js | 0 {js => js_v8}/Hex.js | 0 {js => js_v8}/Text.js | 0 {js => js_v8}/checking.js | 0 {js => js_v8}/comboTimer.js | 0 {js => js_v8}/initialization.js | 0 {js => js_v8}/input.js | 0 {js => js_v8}/main.js | 0 {js => js_v8}/math.js | 0 {js => js_v8}/render.js | 0 {js => js_v8}/save-state.js | 0 {js => js_v8}/update.js | 0 {js => js_v8}/view.js | 0 {js => js_v8}/wavegen.js | 0 15 files changed, 14 insertions(+), 14 deletions(-) rename {js => js_v8}/Block.js (100%) rename {js => js_v8}/Hex.js (100%) rename {js => js_v8}/Text.js (100%) rename {js => js_v8}/checking.js (100%) rename {js => js_v8}/comboTimer.js (100%) rename {js => js_v8}/initialization.js (100%) rename {js => js_v8}/input.js (100%) rename {js => js_v8}/main.js (100%) rename {js => js_v8}/math.js (100%) rename {js => js_v8}/render.js (100%) rename {js => js_v8}/save-state.js (100%) rename {js => js_v8}/update.js (100%) rename {js => js_v8}/view.js (100%) rename {js => js_v8}/wavegen.js (100%) diff --git a/index.html b/index.html index 4acbeba..6492d3d 100644 --- a/index.html +++ b/index.html @@ -37,20 +37,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/js/Block.js b/js_v8/Block.js similarity index 100% rename from js/Block.js rename to js_v8/Block.js diff --git a/js/Hex.js b/js_v8/Hex.js similarity index 100% rename from js/Hex.js rename to js_v8/Hex.js diff --git a/js/Text.js b/js_v8/Text.js similarity index 100% rename from js/Text.js rename to js_v8/Text.js diff --git a/js/checking.js b/js_v8/checking.js similarity index 100% rename from js/checking.js rename to js_v8/checking.js diff --git a/js/comboTimer.js b/js_v8/comboTimer.js similarity index 100% rename from js/comboTimer.js rename to js_v8/comboTimer.js diff --git a/js/initialization.js b/js_v8/initialization.js similarity index 100% rename from js/initialization.js rename to js_v8/initialization.js diff --git a/js/input.js b/js_v8/input.js similarity index 100% rename from js/input.js rename to js_v8/input.js diff --git a/js/main.js b/js_v8/main.js similarity index 100% rename from js/main.js rename to js_v8/main.js diff --git a/js/math.js b/js_v8/math.js similarity index 100% rename from js/math.js rename to js_v8/math.js diff --git a/js/render.js b/js_v8/render.js similarity index 100% rename from js/render.js rename to js_v8/render.js diff --git a/js/save-state.js b/js_v8/save-state.js similarity index 100% rename from js/save-state.js rename to js_v8/save-state.js diff --git a/js/update.js b/js_v8/update.js similarity index 100% rename from js/update.js rename to js_v8/update.js diff --git a/js/view.js b/js_v8/view.js similarity index 100% rename from js/view.js rename to js_v8/view.js diff --git a/js/wavegen.js b/js_v8/wavegen.js similarity index 100% rename from js/wavegen.js rename to js_v8/wavegen.js From 59425e2e6dd0686bc0f36e50b98610fd674581de Mon Sep 17 00:00:00 2001 From: Logan Engstrom Date: Tue, 26 Aug 2014 01:16:44 -0400 Subject: [PATCH 02/15] made game slower --- js_v8/wavegen.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js_v8/wavegen.js b/js_v8/wavegen.js index 2c917ef..1623000 100644 --- a/js_v8/wavegen.js +++ b/js_v8/wavegen.js @@ -1,14 +1,14 @@ function blockDestroyed() { if (waveone.nextGen > 1350) { - waveone.nextGen -= 26 * settings.creationSpeedModifier; + waveone.nextGen -= 19 * settings.creationSpeedModifier; } else if (waveone.nextGen > 600) { - waveone.nextGen -= 13 * settings.creationSpeedModifier; + waveone.nextGen -= 9 * settings.creationSpeedModifier; } else { waveone.nextGen = 600; } if (waveone.difficulty < 35) { - waveone.difficulty += 0.145 * settings.speedModifier; + waveone.difficulty += 0.09 * settings.speedModifier; } else { waveone.difficulty = 35; } @@ -30,7 +30,7 @@ function waveGen(hex) { this.computeDifficulty(); if ((this.dt - this.lastGen) * settings.creationSpeedModifier > this.nextGen) { if (this.nextGen > 600) { - this.nextGen -= 14 * ((this.nextGen / 1300)) * settings.creationSpeedModifier; + this.nextGen -= 11 * ((this.nextGen / 1300)) * settings.creationSpeedModifier; } } }; @@ -67,7 +67,7 @@ function waveGen(hex) { this.computeDifficulty = function() { if (this.difficulty < 35) { if (this.difficulty < 8) { - this.difficulty += (this.dt - this.last) / (2066667) * settings.speedModifier; + this.difficulty += (this.dt - this.last) / (30066667) * settings.speedModifier; } else if (this.difficulty < 15) { this.difficulty += (this.dt - this.last) / (43333333) * settings.speedModifier; } else { From 1483e4f8d543484626a46a71a9fd072febae77ac Mon Sep 17 00:00:00 2001 From: Logan Engstrom Date: Tue, 26 Aug 2014 01:26:48 -0400 Subject: [PATCH 03/15] reduced beginning speed --- js_v8/wavegen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js_v8/wavegen.js b/js_v8/wavegen.js index 1623000..215170d 100644 --- a/js_v8/wavegen.js +++ b/js_v8/wavegen.js @@ -17,7 +17,7 @@ function blockDestroyed() { function waveGen(hex) { this.lastGen = 0; this.last = 0; - this.nextGen = 2200; + this.nextGen = 2400; this.start = 0; this.colors = colors; this.ct = 0; From 0d1bd68329e6042c5becf3b125022389b8adc365 Mon Sep 17 00:00:00 2001 From: Logan Engstrom Date: Tue, 26 Aug 2014 01:35:44 -0400 Subject: [PATCH 04/15] balanced game for mobile --- js_v8/initialization.js | 2 +- js_v8/wavegen.js | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/js_v8/initialization.js b/js_v8/initialization.js index ee4f438..132cf63 100644 --- a/js_v8/initialization.js +++ b/js_v8/initialization.js @@ -79,7 +79,7 @@ function initialize(a) { settings = { platform: "mobile", startDist: 227, - creationDt: 40, + creationDt: 60, baseScale: 1.4, scale: 1, prevScale: 1, diff --git a/js_v8/wavegen.js b/js_v8/wavegen.js index 215170d..5e452e0 100644 --- a/js_v8/wavegen.js +++ b/js_v8/wavegen.js @@ -1,14 +1,14 @@ function blockDestroyed() { if (waveone.nextGen > 1350) { - waveone.nextGen -= 19 * settings.creationSpeedModifier; - } else if (waveone.nextGen > 600) { + waveone.nextGen -= 20 * settings.creationSpeedModifier; + } else if (waveone.nextGen > 700) { waveone.nextGen -= 9 * settings.creationSpeedModifier; } else { waveone.nextGen = 600; } if (waveone.difficulty < 35) { - waveone.difficulty += 0.09 * settings.speedModifier; + waveone.difficulty += 0.11 * settings.speedModifier; } else { waveone.difficulty = 35; } @@ -30,7 +30,7 @@ function waveGen(hex) { this.computeDifficulty(); if ((this.dt - this.lastGen) * settings.creationSpeedModifier > this.nextGen) { if (this.nextGen > 600) { - this.nextGen -= 11 * ((this.nextGen / 1300)) * settings.creationSpeedModifier; + this.nextGen -= 10 * ((this.nextGen / 1300)) * settings.creationSpeedModifier; } } }; @@ -67,11 +67,11 @@ function waveGen(hex) { this.computeDifficulty = function() { if (this.difficulty < 35) { if (this.difficulty < 8) { - this.difficulty += (this.dt - this.last) / (30066667) * settings.speedModifier; + this.difficulty += (this.dt - this.last) / (3666667) * settings.speedModifier; } else if (this.difficulty < 15) { this.difficulty += (this.dt - this.last) / (43333333) * settings.speedModifier; } else { - this.difficulty += (this.dt - this.last) / (90000000) * settings.speedModifier; + this.difficulty += (this.dt - this.last) / (130000000) * settings.speedModifier; } } }; From 0344287996304c5a10ad0f67aed201a924b838be Mon Sep 17 00:00:00 2001 From: Logan Engstrom Date: Tue, 26 Aug 2014 01:36:36 -0400 Subject: [PATCH 05/15] mor ebalance changes --- js_v8/wavegen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js_v8/wavegen.js b/js_v8/wavegen.js index 5e452e0..dd09b7c 100644 --- a/js_v8/wavegen.js +++ b/js_v8/wavegen.js @@ -71,7 +71,7 @@ function waveGen(hex) { } else if (this.difficulty < 15) { this.difficulty += (this.dt - this.last) / (43333333) * settings.speedModifier; } else { - this.difficulty += (this.dt - this.last) / (130000000) * settings.speedModifier; + this.difficulty += (this.dt - this.last) / (90000000) * settings.speedModifier; } } }; From 554c23590087f0091667f71ab07858130a649293 Mon Sep 17 00:00:00 2001 From: Logan Engstrom Date: Tue, 26 Aug 2014 01:40:23 -0400 Subject: [PATCH 06/15] tried to balance more --- js_v8/wavegen.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/js_v8/wavegen.js b/js_v8/wavegen.js index dd09b7c..7c55c35 100644 --- a/js_v8/wavegen.js +++ b/js_v8/wavegen.js @@ -2,13 +2,13 @@ function blockDestroyed() { if (waveone.nextGen > 1350) { waveone.nextGen -= 20 * settings.creationSpeedModifier; } else if (waveone.nextGen > 700) { - waveone.nextGen -= 9 * settings.creationSpeedModifier; + waveone.nextGen -= 13 * settings.creationSpeedModifier; } else { waveone.nextGen = 600; } if (waveone.difficulty < 35) { - waveone.difficulty += 0.11 * settings.speedModifier; + waveone.difficulty += 0.10 * settings.speedModifier; } else { waveone.difficulty = 35; } @@ -26,11 +26,11 @@ function waveGen(hex) { this.dt = 0; this.update = function() { this.currentFunction(); - this.dt = (16.6667) * MainHex.ct; + this.dt = (settings.platform == 'mobile' ? 14.5 : 16.6667) * MainHex.ct; this.computeDifficulty(); if ((this.dt - this.lastGen) * settings.creationSpeedModifier > this.nextGen) { if (this.nextGen > 600) { - this.nextGen -= 10 * ((this.nextGen / 1300)) * settings.creationSpeedModifier; + this.nextGen -= 11.5 * ((this.nextGen / 1300)) * settings.creationSpeedModifier; } } }; @@ -67,9 +67,9 @@ function waveGen(hex) { this.computeDifficulty = function() { if (this.difficulty < 35) { if (this.difficulty < 8) { - this.difficulty += (this.dt - this.last) / (3666667) * settings.speedModifier; + this.difficulty += (this.dt - this.last) / (3166667) * settings.speedModifier; } else if (this.difficulty < 15) { - this.difficulty += (this.dt - this.last) / (43333333) * settings.speedModifier; + this.difficulty += (this.dt - this.last) / (42333333) * settings.speedModifier; } else { this.difficulty += (this.dt - this.last) / (90000000) * settings.speedModifier; } From b7feb15499fa969bbac1bf4b3ea1a7d9a53ad9f6 Mon Sep 17 00:00:00 2001 From: Logan Engstrom Date: Tue, 26 Aug 2014 01:42:51 -0400 Subject: [PATCH 07/15] made game a bit slower at the start --- js_v8/wavegen.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js_v8/wavegen.js b/js_v8/wavegen.js index 7c55c35..2b8dfc6 100644 --- a/js_v8/wavegen.js +++ b/js_v8/wavegen.js @@ -1,6 +1,6 @@ function blockDestroyed() { if (waveone.nextGen > 1350) { - waveone.nextGen -= 20 * settings.creationSpeedModifier; + waveone.nextGen -= 19 * settings.creationSpeedModifier; } else if (waveone.nextGen > 700) { waveone.nextGen -= 13 * settings.creationSpeedModifier; } else { @@ -8,7 +8,7 @@ function blockDestroyed() { } if (waveone.difficulty < 35) { - waveone.difficulty += 0.10 * settings.speedModifier; + waveone.difficulty += 0.09 * settings.speedModifier; } else { waveone.difficulty = 35; } @@ -17,7 +17,7 @@ function blockDestroyed() { function waveGen(hex) { this.lastGen = 0; this.last = 0; - this.nextGen = 2400; + this.nextGen = 2700; this.start = 0; this.colors = colors; this.ct = 0; @@ -67,9 +67,9 @@ function waveGen(hex) { this.computeDifficulty = function() { if (this.difficulty < 35) { if (this.difficulty < 8) { - this.difficulty += (this.dt - this.last) / (3166667) * settings.speedModifier; + this.difficulty += (this.dt - this.last) / (4166667) * settings.speedModifier; } else if (this.difficulty < 15) { - this.difficulty += (this.dt - this.last) / (42333333) * settings.speedModifier; + this.difficulty += (this.dt - this.last) / (52333333) * settings.speedModifier; } else { this.difficulty += (this.dt - this.last) / (90000000) * settings.speedModifier; } From 2f9540e73fd73cc42efa0b913bb6b3cfcd291df3 Mon Sep 17 00:00:00 2001 From: Logan Engstrom Date: Tue, 26 Aug 2014 13:30:19 -0400 Subject: [PATCH 08/15] made speed rampup faster --- js_v8/wavegen.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/js_v8/wavegen.js b/js_v8/wavegen.js index 2b8dfc6..14006bc 100644 --- a/js_v8/wavegen.js +++ b/js_v8/wavegen.js @@ -1,14 +1,14 @@ function blockDestroyed() { if (waveone.nextGen > 1350) { - waveone.nextGen -= 19 * settings.creationSpeedModifier; - } else if (waveone.nextGen > 700) { - waveone.nextGen -= 13 * settings.creationSpeedModifier; + waveone.nextGen -= 32 * settings.creationSpeedModifier; + } else if (waveone.nextGen > 600) { + waveone.nextGen -= 10 * settings.creationSpeedModifier; } else { waveone.nextGen = 600; } if (waveone.difficulty < 35) { - waveone.difficulty += 0.09 * settings.speedModifier; + waveone.difficulty += 0.085 * settings.speedModifier; } else { waveone.difficulty = 35; } @@ -26,11 +26,11 @@ function waveGen(hex) { this.dt = 0; this.update = function() { this.currentFunction(); - this.dt = (settings.platform == 'mobile' ? 14.5 : 16.6667) * MainHex.ct; + this.dt = (settings.platform == 'mobile' ? 13 : 16.6667) * MainHex.ct; this.computeDifficulty(); if ((this.dt - this.lastGen) * settings.creationSpeedModifier > this.nextGen) { if (this.nextGen > 600) { - this.nextGen -= 11.5 * ((this.nextGen / 1300)) * settings.creationSpeedModifier; + this.nextGen -= 11 * ((this.nextGen / 1300)) * settings.creationSpeedModifier; } } }; @@ -69,7 +69,7 @@ function waveGen(hex) { if (this.difficulty < 8) { this.difficulty += (this.dt - this.last) / (4166667) * settings.speedModifier; } else if (this.difficulty < 15) { - this.difficulty += (this.dt - this.last) / (52333333) * settings.speedModifier; + this.difficulty += (this.dt - this.last) / (62333333) * settings.speedModifier; } else { this.difficulty += (this.dt - this.last) / (90000000) * settings.speedModifier; } From 905fbe2acda7ae3500e1db98ff38ec93e63a7970 Mon Sep 17 00:00:00 2001 From: Logan Engstrom Date: Tue, 26 Aug 2014 13:42:29 -0400 Subject: [PATCH 09/15] reduced speed, increased rate of block fall --- js_v8/wavegen.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/js_v8/wavegen.js b/js_v8/wavegen.js index 14006bc..6cf99f9 100644 --- a/js_v8/wavegen.js +++ b/js_v8/wavegen.js @@ -1,8 +1,8 @@ function blockDestroyed() { if (waveone.nextGen > 1350) { - waveone.nextGen -= 32 * settings.creationSpeedModifier; + waveone.nextGen -= 30 * settings.creationSpeedModifier; } else if (waveone.nextGen > 600) { - waveone.nextGen -= 10 * settings.creationSpeedModifier; + waveone.nextGen -= 8 * settings.creationSpeedModifier; } else { waveone.nextGen = 600; } @@ -26,7 +26,7 @@ function waveGen(hex) { this.dt = 0; this.update = function() { this.currentFunction(); - this.dt = (settings.platform == 'mobile' ? 13 : 16.6667) * MainHex.ct; + this.dt = (settings.platform == 'mobile' ? 14 : 16.6667) * MainHex.ct; this.computeDifficulty(); if ((this.dt - this.lastGen) * settings.creationSpeedModifier > this.nextGen) { if (this.nextGen > 600) { @@ -66,13 +66,16 @@ function waveGen(hex) { this.computeDifficulty = function() { if (this.difficulty < 35) { + var increment; if (this.difficulty < 8) { - this.difficulty += (this.dt - this.last) / (4166667) * settings.speedModifier; + increment = (this.dt - this.last) / (5166667) * settings.speedModifier; } else if (this.difficulty < 15) { - this.difficulty += (this.dt - this.last) / (62333333) * settings.speedModifier; + increment = (this.dt - this.last) / (72333333) * settings.speedModifier; } else { - this.difficulty += (this.dt - this.last) / (90000000) * settings.speedModifier; + increment = (this.dt - this.last) / (90000000) * settings.speedModifier; } + + this.difficulty += increment * (1/2); } }; From 8b78b00f3b9ea403323df92950a595c424da692e Mon Sep 17 00:00:00 2001 From: Logan Engstrom Date: Tue, 26 Aug 2014 14:01:11 -0400 Subject: [PATCH 10/15] made slower on mobile --- js_v8/wavegen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js_v8/wavegen.js b/js_v8/wavegen.js index 6cf99f9..3bc35da 100644 --- a/js_v8/wavegen.js +++ b/js_v8/wavegen.js @@ -26,7 +26,7 @@ function waveGen(hex) { this.dt = 0; this.update = function() { this.currentFunction(); - this.dt = (settings.platform == 'mobile' ? 14 : 16.6667) * MainHex.ct; + this.dt = (settings.platform == 'mobile' ? 12.5 : 16.6667) * MainHex.ct; this.computeDifficulty(); if ((this.dt - this.lastGen) * settings.creationSpeedModifier > this.nextGen) { if (this.nextGen > 600) { From 56e9893c2082b534d4cd67bf4111e5d9b4d3a479 Mon Sep 17 00:00:00 2001 From: Logan Engstrom Date: Tue, 26 Aug 2014 14:05:28 -0400 Subject: [PATCH 11/15] increased speed on mobile slightly --- js_v8/wavegen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js_v8/wavegen.js b/js_v8/wavegen.js index 3bc35da..6cf99f9 100644 --- a/js_v8/wavegen.js +++ b/js_v8/wavegen.js @@ -26,7 +26,7 @@ function waveGen(hex) { this.dt = 0; this.update = function() { this.currentFunction(); - this.dt = (settings.platform == 'mobile' ? 12.5 : 16.6667) * MainHex.ct; + this.dt = (settings.platform == 'mobile' ? 14 : 16.6667) * MainHex.ct; this.computeDifficulty(); if ((this.dt - this.lastGen) * settings.creationSpeedModifier > this.nextGen) { if (this.nextGen > 600) { From f591dafcc04ddf04fe91e98422fd54014b3fcf89 Mon Sep 17 00:00:00 2001 From: Logan Engstrom Date: Tue, 26 Aug 2014 14:33:16 -0400 Subject: [PATCH 12/15] added get-ad-free mesage for ios/android --- js_v8/view.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/js_v8/view.js b/js_v8/view.js index 8de8170..6e22026 100644 --- a/js_v8/view.js +++ b/js_v8/view.js @@ -98,10 +98,9 @@ function toggleClass(element, active) { function showText(text) { var messages = { 'paused': "
Paused

Press p to resume
", - 'pausedMobile': "
Paused

Press to resume
", + 'pausedMobile': "
Paused

Press to resume
Don't like ads? Want to support the developer? Tap for the ad-free version.
", 'start': "
Press enter to start
", 'gameover': "
Game Over: " + score + " pts

High Scores:
" - }; if (text == 'paused') { @@ -199,7 +198,6 @@ function pause(o) { setTimeout(function() { gameState = prevGameState; }, 200) - } else if (gameState != -2 && gameState !== 0 && gameState !== 2) { $('#restartBtn').fadeIn(150, "linear"); $('.helpText').fadeIn(200, 'linear'); From 400d9f566d041c5820dab412d518b93a559a1565 Mon Sep 17 00:00:00 2001 From: Noah Moroze Date: Tue, 26 Aug 2014 22:29:50 -0400 Subject: [PATCH 13/15] Added user agent detection to distinguish Android vs non-Android devices --- js_v8/initialization.js | 5 +++++ js_v8/view.js | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/js_v8/initialization.js b/js_v8/initialization.js index 132cf63..3b2352d 100644 --- a/js_v8/initialization.js +++ b/js_v8/initialization.js @@ -77,6 +77,7 @@ function initialize(a) { if (/Mobile|Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) { settings = { + os: "other", platform: "mobile", startDist: 227, creationDt: 60, @@ -94,6 +95,7 @@ function initialize(a) { }; } else { settings = { + os: "other", platform: "nonmobile", baseScale: 1, startDist: 340, @@ -112,6 +114,9 @@ function initialize(a) { $("#inst_main_body").html("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 shown by the colored lines in the outer hexagon

" + (settings.platform == 'mobile' ? 'Toggle speeding up the game by tapping the inner hexagon' : "Speed up the game 2x by holding the down arrow")); } + if(/Android/i.test(navigator.userAgent)) { + settings.os = "android"; + } window.canvas = document.getElementById('canvas'); window.ctx = canvas.getContext('2d'); diff --git a/js_v8/view.js b/js_v8/view.js index 6e22026..ce644dd 100644 --- a/js_v8/view.js +++ b/js_v8/view.js @@ -98,14 +98,14 @@ function toggleClass(element, active) { function showText(text) { var messages = { 'paused': "
Paused

Press p to resume
", - 'pausedMobile': "
Paused

Press to resume
Don't like ads? Want to support the developer? Tap for the ad-free version.
", + 'pausedAndroid': "
Paused

Press to resume
Don't like ads? Want to support the developer? Tap for the ad-free version.
", 'start': "
Press enter to start
", 'gameover': "
Game Over: " + score + " pts

High Scores:
" }; if (text == 'paused') { - if (settings.platform == 'mobile') { - text = 'pausedMobile'; + if (settings.os == 'android') { + text = 'pausedAndroid'; } } From 7a04634e47c8b353bdc6b7a0653c01b644c8d48a Mon Sep 17 00:00:00 2001 From: Noah Moroze Date: Tue, 26 Aug 2014 23:52:26 -0400 Subject: [PATCH 14/15] Changed ad free link to use market URL code --- js_v8/view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js_v8/view.js b/js_v8/view.js index ce644dd..003f20d 100644 --- a/js_v8/view.js +++ b/js_v8/view.js @@ -98,7 +98,7 @@ function toggleClass(element, active) { function showText(text) { var messages = { 'paused': "
Paused

Press p to resume
", - 'pausedAndroid': "
Paused

Press to resume
Don't like ads? Want to support the developer? Tap for the ad-free version.
", + 'pausedAndroid': "
Paused

Press to resume
Don't like ads? Want to support the developer? Tap for the ad-free version.
", 'start': "
Press enter to start
", 'gameover': "
Game Over: " + score + " pts

High Scores:
" }; From 652facccab9399b6244ffc62b5c2030a654060c8 Mon Sep 17 00:00:00 2001 From: Logan Engstrom Date: Tue, 2 Sep 2014 15:34:36 -0400 Subject: [PATCH 15/15] made icons bold --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 6492d3d..cf4cfb3 100644 --- a/index.html +++ b/index.html @@ -71,7 +71,7 @@