]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/status_effects_extended
authorMario <mario.mario@y7mail.com>
Tue, 15 Jun 2021 23:28:43 +0000 (09:28 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 15 Jun 2021 23:28:43 +0000 (09:28 +1000)
commit79012b90e96396059bcc310a8a95ae38918993a4
tree892967ea2b8d01fd8ecc7758310c7539a7c937aa
parent81323b9fcb2819407b31451453e3651b9675f520
parentaecd4e7b9523204a1dec88eaee0fd618976baf85
Merge branch 'master' into Mario/status_effects_extended
qcsrc/client/view.qc
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/mutators/mutator/vampire/sv_vampire.qc
qcsrc/server/client.qc
qcsrc/server/damage.qc
qcsrc/server/items/items.qc
qcsrc/server/mutators/events.qh
qcsrc/server/player.qc
qcsrc/server/world.qc