]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into z411/bai-server
authorz411 <z411@omaera.org>
Fri, 8 Apr 2022 23:09:06 +0000 (19:09 -0400)
committerz411 <z411@omaera.org>
Fri, 8 Apr 2022 23:09:06 +0000 (19:09 -0400)
commit1b2dc4c07cc0af3e6eed3c441d37c3929637a022
treea4dfb566381b9446ab147e78b159a048461eb0c1
parentd0bed6db9e531c846f12b0d9ae8f772b42d02a35
parent658f02759864ffee0d43fc79d5da92ca138619e3
Merge branch 'master' into z411/bai-server
35 files changed:
balance-xdf.cfg
commands.cfg
gamemodes-server.cfg
notifications.cfg
qcsrc/client/announcer.qc
qcsrc/client/hud/panel/centerprint.qc
qcsrc/client/hud/panel/centerprint.qh
qcsrc/client/hud/panel/timer.qc
qcsrc/client/main.qc
qcsrc/client/main.qh
qcsrc/client/view.qc
qcsrc/common/ent_cs.qc
qcsrc/common/gamemodes/gamemode/_mod.inc
qcsrc/common/gamemodes/gamemode/_mod.qh
qcsrc/common/mapinfo.qh
qcsrc/common/net_linked.qh
qcsrc/common/notifications/all.inc
qcsrc/common/notifications/all.qh
qcsrc/common/stats.qh
qcsrc/menu/xonotic/util.qc
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/command/cmd.qc
qcsrc/server/command/common.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/command/vote.qc
qcsrc/server/command/vote.qh
qcsrc/server/damage.qc
qcsrc/server/damage.qh
qcsrc/server/items/items.qc
qcsrc/server/mutators/events.qh
qcsrc/server/round_handler.qc
qcsrc/server/scores.qc
qcsrc/server/world.qc
qcsrc/server/world.qh