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

bugfix - Music volume slider no longer auto-sets to sound effect volume

Browse Source
This commit is contained in:
Yair Morgenstern 2019-11-03 20:15:49 +02:00
parent b82a52ce38
commit 9610f9f918
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/assets/jsons/Units.json
View File

@ -917,7 +917,7 @@
requiredTech:"Dynamite", requiredTech:"Dynamite",
upgradesTo:"Rocket Artillery", upgradesTo:"Rocket Artillery",
uniques:["Bonus vs City 200%","No defensive terrain bonus", uniques:["Bonus vs City 200%","No defensive terrain bonus",
"Must set up to ranged attack","Limited Visibility","Indirect Fire"], "Must set up to ranged attack","Limited Visibility","Ranged attacks may be performed over obstacles"],
hurryCostModifier:20 hurryCostModifier:20
}, },
{ {
@ -1038,7 +1038,7 @@
cost: 375, cost: 375,
requiredResource:"Oil", requiredResource:"Oil",
requiredTech:"Electronics", requiredTech:"Electronics",
uniques:["Indirect Fire", "Bonus vs City 30%"], uniques:["Ranged attacks may be performed over obstacles", "Bonus vs City 30%"],
hurryCostModifier:20 hurryCostModifier:20
}, },
{ {
@ -1163,7 +1163,7 @@
requiredTech:"Rocketry", requiredTech:"Rocketry",
requiredResource:"Aluminum", requiredResource:"Aluminum",
uniques:["Bonus vs City 200%","No defensive terrain bonus", uniques:["Bonus vs City 200%","No defensive terrain bonus",
"Limited Visibility","Indirect Fire"], "Limited Visibility","Ranged attacks may be performed over obstacles"],
hurryCostModifier:20 hurryCostModifier:20
}, },
{ {

4
android/build.gradle
View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.app" applicationId "com.unciv.app"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 29 targetSdkVersion 29
versionCode 317 versionCode 319
versionName "3.1.12" versionName "3.1.13"
} }
// Had to add this crap for Travis to build, it wanted to sign the app // Had to add this crap for Travis to build, it wanted to sign the app

2
core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt
View File

@ -154,7 +154,7 @@ class WorldScreenOptionsTable(val worldScreen:WorldScreen) : PopupTable(worldScr
innerTable.add("Music volume".tr()) innerTable.add("Music volume".tr())
val musicVolumeSlider = Slider(0f, 1.0f, 0.1f, false, skin) val musicVolumeSlider = Slider(0f, 1.0f, 0.1f, false, skin)
musicVolumeSlider.value = UnCivGame.Current.settings.soundEffectsVolume musicVolumeSlider.value = UnCivGame.Current.settings.musicVolume
musicVolumeSlider.addListener(object : ChangeListener() { musicVolumeSlider.addListener(object : ChangeListener() {
override fun changed(event: ChangeEvent?, actor: Actor?) { override fun changed(event: ChangeEvent?, actor: Actor?) {
UnCivGame.Current.settings.musicVolume = musicVolumeSlider.value UnCivGame.Current.settings.musicVolume = musicVolumeSlider.value