]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 80172b8 e485bca)
Merge branch 'master' into z411/bai-server
authorz411 <z411@omaera.org>
Wed, 5 Jan 2022 18:49:38 +0000 (15:49 -0300)
committerz411 <z411@omaera.org>
Wed, 5 Jan 2022 18:49:38 +0000 (15:49 -0300)
commitd33e9e7e33962631c0c13aa679682327a8f72e9b
treeaef8ad22ae1558cc8ff63a0d33d4b784ed89b499tree | snapshot
parent80172b81c57e09e6380e852a0ada2e18c765739ccommit | diff
parente485bcaeede5f929c1ceefa26a51da840c2f1a1ecommit | diff
Merge branch 'master' into z411/bai-server
20 files changed:
commands.cfg diff1 | diff2 | blob | history
gamemodes-server.cfg diff1 | diff2 | blob | history
qcsrc/client/hud/panel/timer.qc diff1 | diff2 | blob | history
qcsrc/common/ent_cs.qc diff1 | diff2 | blob | history
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc diff1 | diff2 | blob | history
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qh diff1 | diff2 | blob | history
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc diff1 | diff2 | blob | history
qcsrc/common/replicate.qh diff1 | diff2 | blob | history
qcsrc/server/chat.qc diff1 | diff2 | blob | history
qcsrc/server/client.qc diff1 | diff2 | blob | history
qcsrc/server/command/cmd.qc diff1 | diff2 | blob | history
qcsrc/server/command/sv_cmd.qc diff1 | diff2 | blob | history
qcsrc/server/command/vote.qc diff1 | diff2 | blob | history
qcsrc/server/command/vote.qh diff1 | diff2 | blob | history
qcsrc/server/round_handler.qc diff1 | diff2 | blob | history
qcsrc/server/scores.qc diff1 | diff2 | blob | history
qcsrc/server/teamplay.qc diff1 | diff2 | blob | history
qcsrc/server/teamplay.qh diff1 | diff2 | blob | history
qcsrc/server/world.qc diff1 | diff2 | blob | history
qcsrc/server/world.qh diff1 | diff2 | blob | history