mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'master' into 'uniior/armor-pricing'
# Conflicts: # CHANGELOG.md
This commit is contained in:
commit
c399a549f8
@ -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)),
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user