]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into z411/bai-server
authorz411 <z411@omaera.org>
Thu, 20 Oct 2022 03:18:00 +0000 (00:18 -0300)
committerz411 <z411@omaera.org>
Thu, 20 Oct 2022 03:18:00 +0000 (00:18 -0300)
commite9cb368a9160fe8373754ac6571abe34faa87bbb
treea64f4f46085c19b415c208c6d99817d7a9553693
parent12c6b4c2b14708d30277f9f4383b3031fc88b124
parent91e9075831c3ae94bcae3161c68bf24de92d8797
Merge branch 'master' into z411/bai-server
25 files changed:
gamemodes-server.cfg
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/client/main.qc
qcsrc/common/constants.qh
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/ctf/sv_ctf.qc
qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qh
qcsrc/common/mapinfo.qh
qcsrc/common/mutators/mutator/overkill/oknex.qc
qcsrc/common/scores.qh
qcsrc/common/stats.qh
qcsrc/common/weapons/weapon/devastator.qc
qcsrc/common/weapons/weapon/electro.qc
qcsrc/common/weapons/weapon/mortar.qc
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/common/weapons/weapon/vaporizer.qc
qcsrc/common/weapons/weapon/vortex.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/damage.qc
qcsrc/server/scores.qc
qcsrc/server/world.qc
qcsrc/server/world.qh
xonotic-server.cfg