]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/q3compat_sanity
authorMario <mario.mario@y7mail.com>
Fri, 30 Sep 2022 09:54:07 +0000 (19:54 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 30 Sep 2022 09:54:07 +0000 (19:54 +1000)
commitbbf5a4323eaf9de74aa9b5259dee6a922a0f2cfc
tree58dc30c9c77cf727cd40a211546caac9f39dc6f8
parentc235e77a8236141d13bf5587636b4dae9b6e68cc
parente94c6d31c461f91547569c54924f146f30ca7bbb
Merge branch 'master' into Mario/q3compat_sanity
12 files changed:
qcsrc/client/mapvoting.qc
qcsrc/common/gamemodes/gamemode/duel/duel.qh
qcsrc/common/mapinfo.qh
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc
qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc
qcsrc/menu/xonotic/maplist.qc
qcsrc/server/campaign.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/world.qc
qcsrc/server/world.qh
xonotic-common.cfg
xonotic-server.cfg