]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33a6228 86c9dc7)
Merge branch 'Mario/vaporizer_damage' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 31 Aug 2015 14:19:12 +0000 (14:19 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 31 Aug 2015 14:19:12 +0000 (14:19 +0000)
Merge branch Mario/vaporizer_damage (S merge request)

Adds a damage option to the vaporizer, fixes support for bonus nades

See merge request !215


Trivial merge