mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
switch toolchain to nightly-2021-01-01
This commit is contained in:
parent
da8fdafd6a
commit
c37384979c
@ -471,7 +471,7 @@ impl<'a> System<'a> for Sys {
|
|||||||
|
|
||||||
None
|
None
|
||||||
})
|
})
|
||||||
};
|
}
|
||||||
|
|
||||||
let z_range = z_min..z_max;
|
let z_range = z_min..z_max;
|
||||||
// Function for determining whether the player at a specific position collides
|
// Function for determining whether the player at a specific position collides
|
||||||
@ -486,7 +486,7 @@ impl<'a> System<'a> for Sys {
|
|||||||
) -> bool {
|
) -> bool {
|
||||||
collision_iter(pos, terrain, &|block| block.is_solid() && hit(block), &Block::solid_height, near_iter, radius, z_range).count()
|
collision_iter(pos, terrain, &|block| block.is_solid() && hit(block), &Block::solid_height, near_iter, radius, z_range).count()
|
||||||
> 0
|
> 0
|
||||||
};
|
}
|
||||||
|
|
||||||
let was_on_ground = physics_state.on_ground;
|
let was_on_ground = physics_state.on_ground;
|
||||||
physics_state.on_ground = false;
|
physics_state.on_ground = false;
|
||||||
|
@ -1 +1 @@
|
|||||||
nightly-2020-12-09
|
nightly-2021-01-01
|
||||||
|
@ -947,7 +947,7 @@ impl Controls {
|
|||||||
])
|
])
|
||||||
.align_items(Align::Center)
|
.align_items(Align::Center)
|
||||||
.into()
|
.into()
|
||||||
};
|
}
|
||||||
fn char_slider_greyable<'a>(
|
fn char_slider_greyable<'a>(
|
||||||
active: bool,
|
active: bool,
|
||||||
text: &str,
|
text: &str,
|
||||||
@ -984,7 +984,7 @@ impl Controls {
|
|||||||
.align_items(Align::Center)
|
.align_items(Align::Center)
|
||||||
.into()
|
.into()
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
let slider_options = Column::with_children(vec![
|
let slider_options = Column::with_children(vec![
|
||||||
char_slider(
|
char_slider(
|
||||||
|
@ -576,7 +576,7 @@ impl Ui {
|
|||||||
enum State {
|
enum State {
|
||||||
Image(TexId),
|
Image(TexId),
|
||||||
Plain,
|
Plain,
|
||||||
};
|
}
|
||||||
|
|
||||||
let mut current_state = State::Plain;
|
let mut current_state = State::Plain;
|
||||||
let mut start = 0;
|
let mut start = 0;
|
||||||
@ -590,7 +590,7 @@ impl Ui {
|
|||||||
Interface,
|
Interface,
|
||||||
// Number of primitives left to render ingame and visibility
|
// Number of primitives left to render ingame and visibility
|
||||||
InWorld(usize, bool),
|
InWorld(usize, bool),
|
||||||
};
|
}
|
||||||
|
|
||||||
let mut placement = Placement::Interface;
|
let mut placement = Placement::Interface;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user