]> 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: 985f885 d7f47c0)
Merge branch 'drjaska/minefix2' into 'master'
authorterencehill <piuntn@gmail.com>
Fri, 20 May 2022 23:36:02 +0000 (23:36 +0000)
committerterencehill <piuntn@gmail.com>
Fri, 20 May 2022 23:36:02 +0000 (23:36 +0000)
fix #2690 by making sure mines aren't proximity exploded by independent players

Closes #2690

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


Trivial merge