diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 1ca9ffb..a420bfc 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/app.iml b/app/app.iml
index 307c2e4..80bd210 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -8,40 +8,82 @@
-
-
-
+
+
+
- generateDebugSources
+ generateFlavorTestDebugSources
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index a2824c6..1d73df9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
applicationId 'de.frajul.endlessroll'
minSdkVersion 14
targetSdkVersion 26
- versionCode 8
- versionName '0.7.1'
+ versionCode 9
+ versionName '1.0'
}
buildTypes {
release {
@@ -25,7 +25,14 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
+ flavorDimensions 'releaseTargetGroup'
productFlavors {
+ flavorStoreRelease {
+ dimension 'releaseTargetGroup'
+ }
+ flavorTest {
+ dimension 'releaseTargetGroup'
+ }
}
}
diff --git a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
index 1d039ac..6353b14 100644
--- a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
+++ b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
@@ -772,8 +772,8 @@ public final class R {
public static final int abc_shareactionprovider_share_with = 0x7f0d001c;
public static final int abc_shareactionprovider_share_with_application = 0x7f0d001d;
public static final int abc_toolbar_collapse_description = 0x7f0d001e;
- public static final int search_menu_title = 0x7f0d0065;
- public static final int status_bar_notification_info_overflow = 0x7f0d0072;
+ public static final int search_menu_title = 0x7f0d0067;
+ public static final int status_bar_notification_info_overflow = 0x7f0d0074;
}
public static final class style {
public static final int AlertDialog_AppCompat = 0x7f0e0000;
diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
index c27925b..c6420f8 100644
--- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -1704,7 +1704,7 @@
GrasslandsIcy MountainsTestcave
- #17b3f5#1791f5#ffb637#ffeb37#ff8e37#e2ffb637#57ffb637#ff0000#000000#00000000#daf10d#c7b7b7b7#715f5f#60715f#db41e42b#b3d700#9d000000#5b000000#3d00000050dp170dp170dp70dp60dpEndless RollClick me!I\'m a text!997.5Show FpsSet the bomb on an obstacle0%%d%%Fps: 00Fps: %dLevel UpGAME OVERLEVEL FINISHEDTo menuTry againRestartRestart level %dNext level: %dNext world:\n%sLOADING...ContinueExitPlayUnlock all levelsGain 90 epFinish the first world!Test GL Stuff!!!Level: 24Level: %dReset progressCreditsMusicSoundsRamp unlockedGreat world21/15%s%s unlocked!New slot unlockedNew shape unlockedLevel: %dBuyUpgradeBallClockHypnoPacmanSoccerSmileyWheelSunBlue\?\?\?Keep calm and roll onTick tack!Hypnotizes you for more funLet\'s roll to the goal!PACMAN!Don\'t worry, roll happy!A nice car without the... carShine bright like the sunWhy am I blue?A new shape for more funEmpty taskCollect %d stars (%d/%d)Collect %d energy (%d/%d)Collect %d starsCollect %d energyFinish the %d. world%d/%dYou will unlock this mysterious tool at level %dRoll up the ramp to gain heightShoots you in the airYou are pulled towards it. Just try it out!Blow up all obstacles near the bombThis will give you super-powers for a few secondsFreezes a certain area which leads to longer in-air time\?\?\?RampSpringMagnetBombMushroomStasisLevel: %dYesNoThis is a beautiful ConfirmDialog placeholder!Do you really want to exit the game?Do you really want to reset ALL your progress?Do you really want to finish the first world?\nYour old progress will be DELETED!This is a multiline placeholder\nfor all the tutorials I made!!!\nAwesome! - Isn\'t it?Welcome to Endless Roll!\nHave fun!Click anywhere on the screen to place the rampTry to place your ramp in front of the gapGreat job!\nNow place it in front of the obstacleYou can even set a Tool in mid-air.\nTime carefully!Now try again!Congratulations! You have leveled up!\nNow go to the toolshopWell done! Now you can start the next levelFor this level you will need two tools equippedChoose which tool to use by clicking on itENDLESS ROLLby Julian MutterTESTERSARTJulian Mutter\nJuri SolovievMarkus\nLukas\nMaurice\nLandmann\nRainer\nJohannesSOUNDS„Fruit-collected“, „Glocken-good“, „Carillon-02-a“, „Carillon-02-b“, „Fireball-02“, „Fruit-appearance“, „Voltage-hum“ (noiseforfun.com)MUSIC\"Balloon Game\", \"Bit Shift\", \"Digital Lemonade\"\nKevin MacLeod (incompetech.com)\nLicensed under Creative Commons: By Attribution 3.0\nhttp://creativecommons.org/licenses/by/3.0/