salmon-engine-projects/double-hit-balls
9
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

workaround to fix broken boost variant, changed minSdkVersion

Browse Source
This commit is contained in:
Ilshat Safiullin 2018-08-06 21:51:51 +05:00
parent b4b42561eb
commit 69cb2f7cd3
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -74,4 +74,5 @@ iOSInjectionProject/
/windows/DoubleHitBalls-win/DoubleHitBalls-win/progress.txt /windows/DoubleHitBalls-win/DoubleHitBalls-win/progress.txt
/windows/DoubleHitBalls-win/DoubleHitBalls-win/resources /windows/DoubleHitBalls-win/DoubleHitBalls-win/resources
*.db *.db
*.opendb *.opendb
/proj.android-studio/app/release/

4
game/main_code.cpp
View File

@ -626,8 +626,8 @@ void TMyApplication::SetupGalaxyUi(size_t levelStar)
{ {
currentLevelButton->setVisibility(true); currentLevelButton->setVisibility(true);
currentLevelButton->setBackground(levelName + "_prerender"); currentLevelButton->setBackground(ResourceManager->newGuiManager.layoutBackgroundFromConfigValue(levelName + "_prerender"));
currentLevelButton->onMouseUpSignal.connect( currentLevelButton->onMouseUpSignal.connect(
[this, modal_background, levelStar, levelIndex](Vector2f v, int i) { [this, modal_background, levelStar, levelIndex](Vector2f v, int i) {

2
proj.android-studio/app/build.gradle
View File

@ -5,7 +5,7 @@ android {
buildToolsVersion "28.0.0" buildToolsVersion "28.0.0"
defaultConfig { defaultConfig {
applicationId "fishrungames.DoubleHitBalls" applicationId "fishrungames.DoubleHitBalls"
minSdkVersion 15 minSdkVersion 24
targetSdkVersion 28 targetSdkVersion 28
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"