]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'TimePath/damagetext' into 'master'
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 23 Aug 2015 06:43:02 +0000 (06:43 +0000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 23 Aug 2015 06:43:02 +0000 (06:43 +0000)
commit9b9817113127902ebe668e9ba6f7f45f8460c44b
tree7b614433efb60b1c5330b2dd5f27f19c055059a4
parent92f040813efcf4bacb3f653cfc2b7ab05c933663
parentcdbec363e95a189eaa2b13dbdf79386e690ea676
Merge branch 'TimePath/damagetext' into 'master'

Damage text

Nice little feature to display a running total of damage. ~~Should this be on by default? Should servers be able to disable it? Are the default settings good enough?~~ done done and done.
![](https://dl.dropboxusercontent.com/u/42745598/screenshots/2015-08-23_13-24-33.png)

See merge request !192