]> 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: a553d48 b2e9882)
Merge "Properly disallow selection of nades, fix monster nade bugs"
authorbones_was_here <bones_was_here@xonotic.au>
Fri, 21 Feb 2025 16:20:44 +0000 (16:20 +0000)
committerbones_was_here <bones_was_here@xonotic.au>
Fri, 21 Feb 2025 16:20:44 +0000 (16:20 +0000)
Source branch: 'k9er/nade-fixes'
Target branch: 'master'

Closes #2965 and #2773

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


Trivial merge