]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit8b5603db40e6a8df2cbdae9ce644493b49817f1d
tree2e64ae215d3232d77f5686d3ba301f4733982e81
parent24cd62823ffd4389f0e50f2cd2aa0b0735c15710
parent718d445a78ebb9f4014c9b220f5476a3e6fbd01c
Merge branch 'terencehill/itemstime_fixes' into 'master'

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