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 'telastrus/underwater-jump' into 'master'

Browse Source 
Jump while underwater

See merge request veloren/veloren!661
This commit is contained in:
Justin Shipsey 2019-11-22 14:23:47 +00:00
commit 8ef5709c1b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -362,7 +362,9 @@ impl<'a> System<'a> for Sys {
}
// Jump
if inputs.jump && physics.on_ground && vel.0.z <= 0.0 && !character.movement.is_roll() {
if (inputs.jump && physics.on_ground && vel.0.z <= 0.0 && !character.movement.is_roll())
|| (inputs.jump && character.movement == Swim)
{
local_emitter.emit(LocalEvent::Jump(entity));
}