]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7cc4a2 6583918)
Merge branch 'drjaska/cadmg2score' into 'master'
authorterencehill <piuntn@gmail.com>
Wed, 2 Jun 2021 21:04:16 +0000 (21:04 +0000)
committerterencehill <piuntn@gmail.com>
Wed, 2 Jun 2021 21:04:16 +0000 (21:04 +0000)
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


Trivial merge