From: terencehill <piuntn@gmail.com>
Date: Sun, 20 Mar 2022 17:07:52 +0000 (+0000)
Subject: Merge branch 'terencehill/full_damage_fix' into 'master'
X-Git-Tag: xonotic-v0.8.5~145
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0ad30ff78cfdb80637705910b1a9477544e53583;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/full_damage_fix' into 'master'

Fix 3 minor issues with damage calculation

Closes #2406 and #2672

See merge request xonotic/xonotic-data.pk3dir!986
---

0ad30ff78cfdb80637705910b1a9477544e53583