Continuous rendering is not experimental anymore (#1996)

* Continuous rendering is not experimental anymore

* Better select boxes alignment
This commit is contained in:
JackRainy
2020-02-23 20:22:31 +02:00
committed by GitHub
parent 3c2cb01169
commit 6009c1b5d3
5 changed files with 8 additions and 6 deletions

View File

@ -707,6 +707,7 @@ Show pixel units = Показать текстуру юнитов
Show pixel improvements = Показать текстуру улучшений
Enable nuclear weapons = Разрешить использование ядерного оружия
Fontset = Шрифт
Continuous rendering = Непрерывная отрисовка
# Notifications

View File

@ -711,6 +711,7 @@ Show pixel units = Візуалізовувати підрозділи
Show pixel improvements = Візуалізовувати вдосконалення
Enable nuclear weapons = Увімкнути ядерну зброю
Fontset = Шрифт
Continuous rendering = Безперервна візуалізація
# Notifications

View File

@ -707,6 +707,7 @@ Show pixel units =
Show pixel improvements =
Enable nuclear weapons =
Fontset =
Continuous rendering =
# Notifications

View File

@ -26,7 +26,7 @@ class GameSettings {
var showPixelImprovements: Boolean = true
var showPixelResources: Boolean = true
var nuclearWeaponEnabled = false
var continuousRendering = true
var continuousRendering = false
var userId = ""
var multiplayerTurnCheckerEnabled = true
var multiplayerTurnCheckerPersistentNotificationEnabled = true

View File

@ -82,8 +82,7 @@ class WorldScreenOptionsPopup(val worldScreen:WorldScreen) : Popup(worldScreen){
addTileSetSelectBox(innerTable)
// Do not add to template.properties yet please.
innerTable.add("Continuous rendering\n(HIGHLY EXPERIMENTAL)".toLabel())
innerTable.add("Continuous rendering".toLabel())
addButton(innerTable, if (settings.continuousRendering) "Yes" else "No") {
settings.continuousRendering = !settings.continuousRendering
Gdx.graphics.isContinuousRendering = settings.continuousRendering
@ -241,7 +240,7 @@ class WorldScreenOptionsPopup(val worldScreen:WorldScreen) : Popup(worldScreen){
resolutionArray.addAll("750x500","900x600", "1050x700", "1200x800", "1500x1000")
resolutionSelectBox.items = resolutionArray
resolutionSelectBox.selected = UncivGame.Current.settings.resolution
innerTable.add(resolutionSelectBox).pad(10f).row()
innerTable.add(resolutionSelectBox).minWidth(240f).pad(10f).row()
resolutionSelectBox.addListener(object : ChangeListener() {
override fun changed(event: ChangeEvent?, actor: Actor?) {
@ -264,7 +263,7 @@ class WorldScreenOptionsPopup(val worldScreen:WorldScreen) : Popup(worldScreen){
for(tileset in tileSets) tileSetArray.add(tileset)
tileSetSelectBox.items = tileSetArray
tileSetSelectBox.selected = UncivGame.Current.settings.tileSet
innerTable.add(tileSetSelectBox).pad(10f).row()
innerTable.add(tileSetSelectBox).minWidth(240f).pad(10f).row()
tileSetSelectBox.addListener(object : ChangeListener() {
override fun changed(event: ChangeEvent?, actor: Actor?) {
@ -329,7 +328,7 @@ class WorldScreenOptionsPopup(val worldScreen:WorldScreen) : Popup(worldScreen){
languageSelectBox.items = languageArray
val matchingLanguage = languageArray.firstOrNull { it.language == UncivGame.Current.settings.language }
languageSelectBox.selected = if (matchingLanguage != null) matchingLanguage else languageArray.first()
innerTable.add(languageSelectBox).pad(10f).row()
innerTable.add(languageSelectBox).minWidth(240f).pad(10f).row()
languageSelectBox.addListener(object : ChangeListener() {
override fun changed(event: ChangeEvent?, actor: Actor?) {