]> de.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: a4594d9 86c9dc7)
Merge branch 'Mario/vaporizer_damage' into 'master'
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 24 Sep 2015 22:31:33 +0000 (22:31 +0000)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 24 Sep 2015 22:31:33 +0000 (22:31 +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