Merge branch 'test_brimhaven' of https://github.com/NutAndor/andors-trail into nut_test_brimhaven

This commit is contained in:
Gonk
2020-02-10 22:24:40 +01:00
2 changed files with 4 additions and 4 deletions

View File

@@ -3,8 +3,8 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gpl.rpg.AndorsTrail"
android:versionCode="49"
android:versionName="0.7.8"
android:versionCode="51"
android:versionName="0.7.9dev"
android:installLocation="auto"
>
<uses-sdk

View File

@@ -30,8 +30,8 @@ public final class AndorsTrailApplication extends Application {
public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || DEVELOPMENT_FASTSPEED;
public static final int DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION = 999;
public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 49;
public static final String CURRENT_VERSION_DISPLAY = "0.7.8";
public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 51;
public static final String CURRENT_VERSION_DISPLAY = "0.7.9dev";
public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();