]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into z411/bai-server
authorz411 <z411@omaera.org>
Fri, 14 Jul 2023 03:24:17 +0000 (23:24 -0400)
committerz411 <z411@omaera.org>
Fri, 14 Jul 2023 03:24:17 +0000 (23:24 -0400)
commit6491b766d925a1088212e86cf4767d4be7bf6a4f
tree5a60227fddcb26da96e25a678948fc84c6387c6a
parent9138fcd172d7369fa7f0d88c66b2969f578b54b3
parent623d1fa05b286a0f6ef97e9b61908b3cccb2b9c1
Merge branch 'master' into z411/bai-server
23 files changed:
commands.cfg
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/client/main.qc
qcsrc/common/ent_cs.qc
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
qcsrc/common/mutators/mutator/overkill/oknex.qc
qcsrc/common/notifications/all.inc
qcsrc/common/stats.qh
qcsrc/common/util.qc
qcsrc/server/client.qc
qcsrc/server/command/banning.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/command/vote.qc
qcsrc/server/damage.qc
qcsrc/server/items/items.qc
qcsrc/server/mutators/events.qh
qcsrc/server/weapons/weaponsystem.qc
qcsrc/server/world.qc
xonotic-server.cfg