From: terencehill <piuntn@gmail.com>
Date: Thu, 18 Nov 2021 11:18:47 +0000 (+0000)
Subject: Merge branch 'drjaska/electrostickylifetime' into 'master'
X-Git-Tag: xonotic-v0.8.5~290
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1cea8bc29d5cf40163b06332d03ea4d56cf5f276;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'drjaska/electrostickylifetime' into 'master'

New cvar for electro balls to get their lifetime from after sticking

See merge request xonotic/xonotic-data.pk3dir!931
---

1cea8bc29d5cf40163b06332d03ea4d56cf5f276