]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11413f6 02b4e8b)
Merge branch 'drjaska/electrostickylifetime' into 'master'
authorterencehill <piuntn@gmail.com>
Thu, 18 Nov 2021 11:18:47 +0000 (11:18 +0000)
committerterencehill <piuntn@gmail.com>
Thu, 18 Nov 2021 11:18:47 +0000 (11:18 +0000)
New cvar for electro balls to get their lifetime from after sticking

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


Trivial merge