]> 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, 17 Sep 2024 04:51:50 +0000 (14:51 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 17 Sep 2024 04:51:50 +0000 (14:51 +1000)
commit50312d6e2e1e6e04aa017c6d12df4f10408cc975
tree17d84d088e30208397b1e8bff1f4a0be2784a2bb
parent107267c5681a3af03c9e6e8150891e9656a05b91
parentec1178b2c00d775c5467b76d463afbe69b165f03
Merge branch 'master' into Mario/electro_combo_over_time
.gitlab-ci.yml
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/hook.qc