]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into z411/bai-server
authorz411 <z411@omaera.org>
Sun, 1 Jan 2023 00:38:48 +0000 (21:38 -0300)
committerz411 <z411@omaera.org>
Sun, 1 Jan 2023 00:38:48 +0000 (21:38 -0300)
commit3aed2c6ac30962ab267b6e829705c71ad9712cf3
tree2838795c6ba2f915e9587dc12ba7c4748c301469
parentc8cbb4e7680384512cb7a0ed482e5ed072836dab
parent133cba402a7d11565c47dc42412b2ac0b9b8f121
Merge branch 'master' into z411/bai-server
19 files changed:
gamemodes-server.cfg
qcsrc/client/main.qc
qcsrc/client/main.qh
qcsrc/client/view.qc
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qh
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/notifications/all.inc
qcsrc/common/notifications/all.qc
qcsrc/common/util.qc
qcsrc/common/weapons/weapon/electro.qc
qcsrc/common/weapons/weapon/mortar.qc
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/common/weapons/weapon/vortex.qh
qcsrc/server/command/vote.qc
qcsrc/server/items/items.qc
qcsrc/server/weapons/common.qc
qcsrc/server/world.qc
qcsrc/server/world.qh