Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'xMAC94x/update-toolchain' into 'master'

Browse Source 
switch toolchain to nightly-2021-01-01

See merge request veloren/veloren!1675
This commit is contained in:
Marcel 2021-01-03 21:53:12 +00:00
commit 1358a5d40c
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/sys/src/phys.rs
View File

@ -471,7 +471,7 @@ impl<'a> System<'a> for Sys {
None
})
};
}
let z_range = z_min..z_max;
// Function for determining whether the player at a specific position collides
@ -486,7 +486,7 @@ impl<'a> System<'a> for Sys {
) -> bool {
collision_iter(pos, terrain, &|block| block.is_solid() && hit(block), &Block::solid_height, near_iter, radius, z_range).count()
> 0
};
}
let was_on_ground = physics_state.on_ground;
physics_state.on_ground = false;

2
rust-toolchain
View File

@ -1 +1 @@
nightly-2020-12-09
nightly-2021-01-01

4
voxygen/src/menu/char_selection/ui/mod.rs
View File

@ -947,7 +947,7 @@ impl Controls {
])
.align_items(Align::Center)
.into()
};
}
fn char_slider_greyable<'a>(
active: bool,
text: &str,
@ -984,7 +984,7 @@ impl Controls {
.align_items(Align::Center)
.into()
}
};
}
let slider_options = Column::with_children(vec![
char_slider(

4
voxygen/src/ui/mod.rs
View File

@ -576,7 +576,7 @@ impl Ui {
enum State {
Image(TexId),
Plain,
};
}
let mut current_state = State::Plain;
let mut start = 0;
@ -590,7 +590,7 @@ impl Ui {
Interface,
// Number of primitives left to render ingame and visibility
InWorld(usize, bool),
};
}
let mut placement = Placement::Interface;