AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 06:16:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

4.6.9-patch1

Browse Source
This commit is contained in:
Yair Morgenstern 2023-05-07 09:43:13 +03:00
parent bd3081f276
commit 32041d5b49
4 changed files with 15 additions and 5 deletions
Show Stats 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.8.0" const val kotlinVersion = "1.8.0"
const val appName = "Unciv" const val appName = "Unciv"
const val appCodeNumber = 859 const val appCodeNumber = 860
const val appVersion = "4.6.9" const val appVersion = "4.6.9-patch1"
const val gdxVersion = "1.11.0" const val gdxVersion = "1.11.0"
const val roboVMVersion = "2.3.1" const val roboVMVersion = "2.3.1"

6
changelog.md
View File

@ -1,5 +1,11 @@
## 4.6.9 ## 4.6.9
Hide buildings requiring multiple cities in one city challenge
Show Strategic resources you have by trade even if you have not researched tech for it yet
Scale down unit overlays on zoom in to allow selecting bombard target above city
Added Policy icons in text Added Policy icons in text
Solved AI 'found religion' crash Solved AI 'found religion' crash

2
core/src/com/unciv/UncivGame.kt
View File

@ -531,7 +531,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci
companion object { companion object {
//region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT
val VERSION = Version("4.6.9", 859) val VERSION = Version("4.6.9-patch1", 860)
//endregion //endregion
lateinit var Current: UncivGame lateinit var Current: UncivGame

8
core/src/com/unciv/ui/components/Fonts.kt
View File

@ -197,6 +197,7 @@ object Fonts {
lateinit var fontImplementation: FontImplementation lateinit var fontImplementation: FontImplementation
lateinit var font: BitmapFont lateinit var font: BitmapFont
var oldFont: BitmapFont? = null
/** This resets all cached font data in object Fonts. /** This resets all cached font data in object Fonts.
* Do not call from normal code - reset the Skin instead: `BaseScreen.setSkin()` * Do not call from normal code - reset the Skin instead: `BaseScreen.setSkin()`
@ -205,8 +206,11 @@ object Fonts {
val settings = GUI.getSettings() val settings = GUI.getSettings()
fontImplementation.setFontFamily(settings.fontFamilyData, settings.getFontSize()) fontImplementation.setFontFamily(settings.fontFamilyData, settings.getFontSize())
if (::font.isInitialized) { if (::font.isInitialized) {
(font.data as? NativeBitmapFontData)?.dispose() // See #9325 // We don't dispose the old font immediately since there may be objects using it.
// Don't font.dispose() even it it seems obvious -> leaves only black rectangles // Instead, we wait for the *next* time the font is reset - since by then all usages of the old font should not exist either - #9338
// Don't font.dispose() even it it seems obvious -> leaves only black rectangles - See #9325
(oldFont?.data as? NativeBitmapFontData)?.dispose()
oldFont = font
} }
font = fontImplementation.getBitmapFont() font = fontImplementation.getBitmapFont()
font.data.markupEnabled = true font.data.markupEnabled = true