From: terencehill <piuntn@gmail.com>
Date: Wed, 2 Jun 2021 21:04:16 +0000 (+0000)
Subject: Merge branch 'drjaska/cadmg2score' into 'master'
X-Git-Tag: xonotic-v0.8.5~405^2~21
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ed93b758d53ebc676ca58c660cb1f1dee4816504;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'drjaska/cadmg2score' into 'master'

included suicides and friendly fire in CA's dmg2score handling

players are now punished in score for suiciding or pushing allies into
their death

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

ed93b758d53ebc676ca58c660cb1f1dee4816504