From: Mario <zacjardine@y7mail.com>
Date: Thu, 28 Jan 2016 20:08:30 +0000 (+0000)
Subject: Merge branch 'terencehill/itemstime_fixes' into 'master'
X-Git-Tag: xonotic-v0.8.2~1214
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8b5603db40e6a8df2cbdae9ce644493b49817f1d;p=xonotic%2Fxonotic-data.pk3dir.git

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
---

8b5603db40e6a8df2cbdae9ce644493b49817f1d