]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/electro_combo_over_time
authorMario <mario.mario@y7mail.com>
Tue, 7 Jul 2020 11:48:40 +0000 (21:48 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 7 Jul 2020 11:48:40 +0000 (21:48 +1000)
commitc8c3aeb230015a462ea4eeabf304dd202379e8fc
tree0146044b63bead53ef86a50de716240289baeb4d
parent5abbd88954d1eb569822e13e597f537ea2fc1b57
parent09af183261cd902191150d197c3411292b45ab77
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/g_damage.qc