]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into z411/bai-server
authorz411 <z411@omaera.org>
Fri, 2 Dec 2022 03:14:06 +0000 (00:14 -0300)
committerz411 <z411@omaera.org>
Fri, 2 Dec 2022 03:14:06 +0000 (00:14 -0300)
commit80998959a66f519759ef42bf27da2060afa4c491
tree700c6a3ee6737b9a0fda4e067230e3ef01d30bc5
parentc1b31d302a7d08160615f9b2ebef2b4faa0a1f05
parentea82b594630801e406f74f1637133bbdee7b96f3
Merge branch 'master' into z411/bai-server
17 files changed:
.gitlab-ci.yml
gamemodes-server.cfg
qcsrc/client/hud/panel/chat.qc
qcsrc/client/hud/panel/infomessages.qc
qcsrc/client/main.qc
qcsrc/client/view.qc
qcsrc/common/ent_cs.qc
qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qh
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qh
qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qh
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/mutators/mutator/overkill/oknex.qc
qcsrc/common/weapons/weapon/vortex.qc
qcsrc/server/weapons/weaponsystem.qc
qcsrc/server/world.qc
xonotic-server.cfg