]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/team_keepaway
authordrjaska <drjaska83@gmail.com>
Thu, 30 Mar 2023 17:57:42 +0000 (20:57 +0300)
committerdrjaska <drjaska83@gmail.com>
Thu, 30 Mar 2023 18:25:26 +0000 (21:25 +0300)
commit42146fd06547b87c3f556d3e6301a41596bd5972
treefaffe841b938c30fcea062e9dda6bb8cd1a7eabd
parentf22ee2f870135644fb7092d1113266e31a378e05
parent8411e8405dcb67853bc15a238932becc1aee66a9
Merge branch 'master' into Mario/team_keepaway
.gitlab-ci.yml
gamemodes-client.cfg
gamemodes-server.cfg
qcsrc/common/gamemodes/gamemode/_mod.inc
qcsrc/common/gamemodes/gamemode/_mod.qh
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
qcsrc/common/stats.qh
qcsrc/menu/xonotic/util.qc
qcsrc/server/world.qc