]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/frozen_status_effect Mario/frozen_status_effect 1468/head
authorMario <mario.mario@y7mail.com>
Fri, 14 Mar 2025 19:12:31 +0000 (05:12 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 14 Mar 2025 19:12:31 +0000 (05:12 +1000)
commitb9de0f3a3f706c0f2c78aaf19691bd79b7bd37e1
tree010cab284831bbb30a700c580250cbcfdc4d482c
parent704bec06f18421ca8edc340cba4c84a496667c83
parentd7dd842bdf726424e9d8f5093f2b8c80fdf6aa6b
Merge branch 'master' into Mario/frozen_status_effect
12 files changed:
mutators.cfg
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc
qcsrc/common/gamemodes/gamemode/nexball/sv_weapon.qc
qcsrc/common/gamemodes/gamemode/tka/sv_tka.qc
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/mutators/mutator/nades/sv_nades.qc
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/server/client.qc
qcsrc/server/items/items.qc
qcsrc/server/utils.qh