]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/electro_combo_over_time
authorMario <mario.mario@y7mail.com>
Wed, 14 Sep 2022 04:25:38 +0000 (14:25 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 14 Sep 2022 04:25:38 +0000 (14:25 +1000)
commitf28ed0cd80db4e43a6b47ad4d942e298d45f9467
tree8d84e6bd9c6c94404d8fbbe46111e50e4636edda
parent82539fff2679c83e0f210649eccd4ecdcf3988fb
parent7813b4aefcef935a31a09287fc4618234b154dc6
Merge branch 'master' into Mario/electro_combo_over_time
bal-wep-mario.cfg
bal-wep-nexuiz25.cfg
bal-wep-samual.cfg
bal-wep-xdf.cfg
bal-wep-xonotic.cfg
qcsrc/common/weapons/weapon/electro.qc
qcsrc/common/weapons/weapon/electro.qh
qcsrc/server/damage.qc