From 69cb2f7cd39d0389401f26b67cb09bc58715087c Mon Sep 17 00:00:00 2001 From: Ilshat Safiullin Date: Mon, 6 Aug 2018 21:51:51 +0500 Subject: [PATCH] workaround to fix broken boost variant, changed minSdkVersion --- .gitignore | 3 ++- game/main_code.cpp | 4 ++-- proj.android-studio/app/build.gradle | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9535ee2..a6bf3b3 100644 --- a/.gitignore +++ b/.gitignore @@ -74,4 +74,5 @@ iOSInjectionProject/ /windows/DoubleHitBalls-win/DoubleHitBalls-win/progress.txt /windows/DoubleHitBalls-win/DoubleHitBalls-win/resources *.db -*.opendb \ No newline at end of file +*.opendb +/proj.android-studio/app/release/ \ No newline at end of file diff --git a/game/main_code.cpp b/game/main_code.cpp index 788af89..93a9d7f 100755 --- a/game/main_code.cpp +++ b/game/main_code.cpp @@ -626,8 +626,8 @@ void TMyApplication::SetupGalaxyUi(size_t levelStar) { currentLevelButton->setVisibility(true); - - currentLevelButton->setBackground(levelName + "_prerender"); + + currentLevelButton->setBackground(ResourceManager->newGuiManager.layoutBackgroundFromConfigValue(levelName + "_prerender")); currentLevelButton->onMouseUpSignal.connect( [this, modal_background, levelStar, levelIndex](Vector2f v, int i) { diff --git a/proj.android-studio/app/build.gradle b/proj.android-studio/app/build.gradle index 75d1549..c1a8d40 100755 --- a/proj.android-studio/app/build.gradle +++ b/proj.android-studio/app/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion "28.0.0" defaultConfig { applicationId "fishrungames.DoubleHitBalls" - minSdkVersion 15 + minSdkVersion 24 targetSdkVersion 28 versionCode 1 versionName "1.0"