Merge branch 'master' into 'master'

Fixed animation copypasta bug

See merge request veloren/veloren!38

Former-commit-id: 1ace57b79466228258c49f6943ec016a03f29231
This commit is contained in:
Joshua Barretto 2019-04-17 09:08:00 +00:00
commit 49a2d6be64

View File

@ -27,7 +27,7 @@ impl<'a> System<'a> for Sys {
dir.0 = vel.0.normalized() * Vec3::new(1.0, 1.0, 0.0);
anims.insert(entity, Animation::Run);
} else {
anims.insert(entity, Animation::Run);
anims.insert(entity, Animation::Idle);
}
}
}