]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dae3363 7a23b37)
Merge remote-tracking branch 'origin/Juhu/scoreboard-strafe' into morosophos/server...
authorNick S <nick@teichisma.info>
Thu, 27 Jan 2022 15:39:56 +0000 (17:39 +0200)
committerNick S <nick@teichisma.info>
Thu, 27 Jan 2022 15:39:56 +0000 (17:39 +0200)
1  2 
qcsrc/client/hud/panel/scoreboard.qc patch | diff1 | diff2 | blob | history
qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc patch | diff1 | diff2 | blob | history
qcsrc/common/scores.qh patch | diff1 | diff2 | blob | history
qcsrc/server/_mod.inc patch | diff1 | diff2 | blob | history
qcsrc/server/_mod.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/hud/panel/scoreboard.qc
Simple merge
diff --cc qcsrc/common/scores.qh
Simple merge
diff --cc qcsrc/server/_mod.inc
Simple merge
diff --cc qcsrc/server/_mod.qh
Simple merge