From 2ba1c90c32877f5423291eb4e1b7f6ce9b4a79dd Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 3 Oct 2022 17:32:18 -0400 Subject: [PATCH] v1.4.0: final commit --- build.gradle | 4 ++-- .../shatteredpixeldungeon/ShatteredPixelDungeon.java | 1 + .../shatteredpixeldungeon/scenes/WelcomeScene.java | 6 +----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 8b743a814..9224ab982 100644 --- a/build.gradle +++ b/build.gradle @@ -14,8 +14,8 @@ allprojects { appName = 'Shattered Pixel Dungeon' appPackageName = 'com.shatteredpixel.shatteredpixeldungeon' - appVersionCode = 659 - appVersionName = '1.4.0-BETA-3' + appVersionCode = 660 + appVersionName = '1.4.0' appJavaCompatibility = JavaVersion.VERSION_1_8 diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java index 422fb94d6..3568af8b4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java @@ -40,6 +40,7 @@ public class ShatteredPixelDungeon extends Game { public static final int v1_1_2 = 588; public static final int v1_2_3 = 628; public static final int v1_3_2 = 648; + public static final int v1_4_0 = 660; public ShatteredPixelDungeon( PlatformSupport platform ) { super( sceneClass == null ? WelcomeScene.class : sceneClass, platform ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java index eb821df87..a0fc31af8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java @@ -57,7 +57,7 @@ import java.util.Collections; public class WelcomeScene extends PixelScene { - private static final int LATEST_UPDATE = 650; + private static final int LATEST_UPDATE = ShatteredPixelDungeon.v1_4_0; //used so that the game does not keep showing the window forever if cleaning fails private static boolean triedCleaningTemp = false; @@ -210,10 +210,6 @@ public class WelcomeScene extends PixelScene { message = Messages.get(this, "what_msg"); } - message = "Greetings Beta Testers!\n\n" + - "The beta for v1.4.0 is now wrapping up! Everything seems to be working well, and I've just added the last few UI tweaks I wanted to for this update.\n\n" + - "Expect v1.4.0 to release very early next week."; - text.text(message, Math.min(w-20, 300)); float textSpace = okay.top() - topRegion - 4; text.setPos((w - text.width()) / 2f, (topRegion + 2) + (textSpace - text.height())/2);