Merge branch 'master' into 'uniior/armor-pricing'

# Conflicts:
#   CHANGELOG.md
This commit is contained in:
Uniior 2024-06-22 17:57:23 +00:00
commit c399a549f8

View File

@ -400,7 +400,7 @@ impl Screen {
gen_content.push(
Slider::new(
&mut self.map_vertical_scale,
0.0..=160.0,
0.1..=160.0,
gen_opts.scale * 10.0,
move |s| message(WorldChange::Scale(s / 10.0)),
)