]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 6fbc1f6 415dec4)
Merge branch 'Mario/electro_combo_over_time' into 'master'
authorterencehill <piuntn@gmail.com>
Sat, 30 Nov 2024 10:04:31 +0000 (10:04 +0000)
committerterencehill <piuntn@gmail.com>
Sat, 30 Nov 2024 10:04:31 +0000 (10:04 +0000)
commitf6028434e8fe67a1e5d9af8367232e193504129b
treeeca265cba04d2a4af139ca5467ee7a3e26ab2e58tree | snapshot
parent6fbc1f63cb2e298b8e4aa425a891259abbdbda14commit | diff
parent415dec4e1a97cc9d0bfcf1859ebf638068c81d53commit | diff
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
bal-wep-mario.cfg diff1 | diff2 | blob | history
bal-wep-nexuiz25.cfg diff1 | diff2 | blob | history
bal-wep-samual.cfg diff1 | diff2 | blob | history
bal-wep-xdf.cfg diff1 | diff2 | blob | history
bal-wep-xonotic.cfg diff1 | diff2 | blob | history