]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/electro_combo_over_time
authorMario <mario.mario@y7mail.com>
Mon, 27 Jul 2020 07:28:42 +0000 (17:28 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 27 Jul 2020 07:28:42 +0000 (17:28 +1000)
commitbf4161ef3639ba716090dd4b31c104a8e1617126
tree32dd65548409e3473c45f9ebf37387f27ddc08f8
parent5f296c1a2fe2d2bc000b2fdd7c46a453c280d1fb
parent18dcd0070ab608b7788a7def821088060847fa76
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/effects/effectinfo.inc
qcsrc/common/weapons/weapon/electro.qc
qcsrc/common/weapons/weapon/electro.qh
qcsrc/server/g_damage.qc