]> 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>
Mon, 29 Jul 2024 09:41:13 +0000 (19:41 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 29 Jul 2024 09:41:13 +0000 (19:41 +1000)
commitd048fdc183a85450186911640a9f5a2d41933089
tree438fc12e23a6ac4caff32ccbb371282c72d511d9
parente19be1e6321de909c7d920871cb9bf73e948bebf
parentb8c14aab5a171ca19cf1c1d616c232872916644e
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
effectinfo.txt
qcsrc/common/effects/all.inc
qcsrc/common/effects/effectinfo.inc
qcsrc/common/weapons/weapon/electro.qc
qcsrc/server/damage.qc