From: terencehill <piuntn@gmail.com>
Date: Sat, 30 Nov 2024 10:04:31 +0000 (+0000)
Subject: Merge branch 'Mario/electro_combo_over_time' into 'master'
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f6028434e8fe67a1e5d9af8367232e193504129b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/electro_combo_over_time' into 'master'

Add an option for Electro combos to deal damage over time

Minor tweak to the combo particle effect to give it a more pronounced border

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

f6028434e8fe67a1e5d9af8367232e193504129b