diff --git a/android/build.gradle b/android/build.gradle index bf4cea18a5..9d6faedd0b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 29 - versionCode 340 - versionName "3.3.7-patch1" + versionCode 341 + versionName "3.3.8" archivesBaseName = "Unciv" } diff --git a/app.json b/app.json deleted file mode 100644 index e22b8916e2..0000000000 --- a/app.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "addons": [ - - ], - "buildpacks": [ - - ], - "description": "", - "env": { - }, - "formation": { - }, - "name": "UnCiv", - "scripts": { - }, - "stack": "heroku-18" -} diff --git a/core/src/CivCity.gwt.xml b/core/src/CivCity.gwt.xml deleted file mode 100644 index 6445037674..0000000000 --- a/core/src/CivCity.gwt.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/core/src/com/unciv/ui/saves/SaveGameScreen.kt b/core/src/com/unciv/ui/saves/SaveGameScreen.kt index 84bca42e8b..edc8846df1 100644 --- a/core/src/com/unciv/ui/saves/SaveGameScreen.kt +++ b/core/src/com/unciv/ui/saves/SaveGameScreen.kt @@ -12,6 +12,7 @@ import com.unciv.ui.pickerscreens.PickerScreen import com.unciv.ui.utils.enable import com.unciv.ui.utils.onClick import com.unciv.ui.utils.toLabel +import kotlin.concurrent.thread class SaveGameScreen : PickerScreen() { @@ -55,8 +56,11 @@ class SaveGameScreen : PickerScreen() { rightSideButton.setText("Save game".tr()) rightSideButton.onClick { - GameSaver().saveGame(UncivGame.Current.gameInfo, textField.text) - UncivGame.Current.setWorldScreen() + rightSideButton.setText("Saving...".tr()) + thread{ + GameSaver().saveGame(UncivGame.Current.gameInfo, textField.text) + UncivGame.Current.setWorldScreen() + } } rightSideButton.enable() } diff --git a/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt b/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt index 42f4fc97ab..406d8cc870 100644 --- a/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt +++ b/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt @@ -13,6 +13,7 @@ import com.badlogic.gdx.scenes.scene2d.utils.ClickListener import com.badlogic.gdx.utils.viewport.ExtendViewport import com.unciv.UncivGame import com.unciv.models.gamebasics.tr +import kotlin.concurrent.thread open class CameraStageBaseScreen : Screen { @@ -128,7 +129,7 @@ fun Actor.center(parent:Stage){ centerX(parent); centerY(parent)} fun Actor.onClickEvent(sound: String = "click", function: (event: InputEvent?, x: Float, y: Float) -> Unit) { this.addListener(object : ClickListener() { override fun clicked(event: InputEvent?, x: Float, y: Float) { - if (sound != "") Sounds.play(sound) + if (sound != "") thread{Sounds.play(sound)} function(event, x, y) } })