]> 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: 14fbb3e 7135118)
Merge branch 'martin-t/damagetext' into 'master'
authorterencehill <piuntn@gmail.com>
Mon, 27 Feb 2017 14:38:25 +0000 (14:38 +0000)
committerterencehill <piuntn@gmail.com>
Mon, 27 Feb 2017 14:38:25 +0000 (14:38 +0000)
Damagetext: optionally omit redundant info, size according to amount of damage, enable damagetext when updating format to override old default, make format forward compatible

See merge request !391


Trivial merge