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 'master' of gitlab.com:veloren/veloren into sharp/jungle

Browse Source
This commit is contained in:
Joshua Yanovski 2019-08-21 20:41:54 +02:00
commit cc269afa38
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/sys/movement.rs
View File

@ -97,7 +97,7 @@ impl<'a> System<'a> for Sys {
{
HUMANOID_AIR_ACCEL
}
(true, false, true, false)
(true, false, true, _)
if vel.0.magnitude_squared() < ROLL_SPEED.powf(2.0) =>
{
ROLL_ACCEL

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

@ -257,6 +257,7 @@ impl<'a> System<'a> for Sys {
if attempts == MAX_ATTEMPTS {
pos.0 = old_pos;
vel.0 = Vec3::zero();
break;
}
}