Merge branch 'hot-fix' into 'master'

Hot-fix for sword

See merge request veloren/veloren!3660
This commit is contained in:
Isse 2022-10-19 22:03:42 +00:00
commit 712db9adea

View File

@ -10,7 +10,7 @@ ComboMelee(
range: 4.0, range: 4.0,
angle: 30.0, angle: 30.0,
base_buildup_duration: 0.1, base_buildup_duration: 0.1,
base_swing_duration: 0.01, base_swing_duration: 0.1,
hit_timing: 0.5, hit_timing: 0.5,
base_recover_duration: 0.25, base_recover_duration: 0.25,
forward_movement: 0.5, forward_movement: 0.5,