projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 24cd628 718d445)
Merge branch 'terencehill/itemstime_fixes' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 28 Jan 2016 20:08:30 +0000 (20:08 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 28 Jan 2016 20:08:30 +0000 (20:08 +0000)
Itemstime fixes

* Avoid networking times of unsupported items
* Fix Jetpack Regenerator time, it wasn't networked
* Fix broken superweapons time (it wasn't displayed in the panel, strength time was altered by it)

See merge request !277


Trivial merge