mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-18 11:49:19 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'temp'

Browse Source
This commit is contained in:
Yair Morgenstern
2021-03-29 14:26:19 +03:00
parent 4647928f29 3ed701508e
commit 12147e0a67
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/kotlin/BuildConfig.kt
View File

@ -3,8 +3,8 @@ package com.unciv.build
object BuildConfig { object BuildConfig {
const val kotlinVersion = "1.4.30" const val kotlinVersion = "1.4.30"
const val appName = "Unciv" const val appName = "Unciv"
const val appCodeNumber = 550 const val appCodeNumber = 551
const val appVersion = "3.13.11-patch1" const val appVersion = "3.13.11-patch2"
const val gdxVersion = "1.9.14" const val gdxVersion = "1.9.14"
const val roboVMVersion = "2.3.1" const val roboVMVersion = "2.3.1"

7
core/src/com/unciv/ui/worldscreen/WorldScreen.kt
View File

@ -70,7 +70,6 @@ class WorldScreen(val gameInfo: GameInfo, val viewingCiv:CivilizationInfo) : Cam
init { init {
ImageGetter.setNewRuleset(gameInfo.ruleSet) // so that even if the multiplayerpoller pulls us back into a game after we changed rulesets, the images will be utd
topBar.setPosition(0f, stage.height - topBar.height) topBar.setPosition(0f, stage.height - topBar.height)
topBar.width = stage.width topBar.width = stage.width
@ -125,8 +124,6 @@ class WorldScreen(val gameInfo: GameInfo, val viewingCiv:CivilizationInfo) : Cam
stage.addActor(unitActionsTable) stage.addActor(unitActionsTable)
// still a zombie: createNextTurnButton() // needs civ table to be positioned
val tileToCenterOn: Vector2 = val tileToCenterOn: Vector2 =
when { when {
viewingCiv.cities.isNotEmpty() -> viewingCiv.getCapital().location viewingCiv.cities.isNotEmpty() -> viewingCiv.getCapital().location
@ -151,7 +148,8 @@ class WorldScreen(val gameInfo: GameInfo, val viewingCiv:CivilizationInfo) : Cam
// isDaemon = true, in order to not block the app closing // isDaemon = true, in order to not block the app closing
// DO NOT use Timer() since this seems to (maybe?) translate to com.badlogic.gdx.utils.Timer? Not sure about this. // DO NOT use Timer() since this seems to (maybe?) translate to com.badlogic.gdx.utils.Timer? Not sure about this.
multiPlayerRefresher = timer("multiPlayerRefresh", true, period = 10000) { multiPlayerRefresher = timer("multiPlayerRefresh", true, period = 10000) {
loadLatestMultiplayerState() if (game.screen != this@WorldScreen) multiPlayerRefresher?.cancel()
else loadLatestMultiplayerState()
} }
} }
@ -231,7 +229,6 @@ class WorldScreen(val gameInfo: GameInfo, val viewingCiv:CivilizationInfo) : Cam
} }
private fun loadLatestMultiplayerState() { private fun loadLatestMultiplayerState() {
// Since we're on a background thread, all the UI calls in this func need to run from the // Since we're on a background thread, all the UI calls in this func need to run from the
// main thread which has a GL context // main thread which has a GL context
val loadingGamePopup = Popup(this) val loadingGamePopup = Popup(this)