]> 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: e357f4f 6ad5171)
Merge branch 'terencehill/custom_gametype_stuff' into 'master'
authorterencehill <piuntn@gmail.com>
Mon, 1 Apr 2024 10:21:10 +0000 (10:21 +0000)
committerterencehill <piuntn@gmail.com>
Mon, 1 Apr 2024 10:21:10 +0000 (10:21 +0000)
Fix / improve custom gametype handling

See merge request xonotic/xonotic-data.pk3dir!1269

1  2 
qcsrc/server/command/sv_cmd.qc patch | diff1 | diff2 | blob | history
qcsrc/server/scores.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/command/sv_cmd.qc
Simple merge
diff --cc qcsrc/server/scores.qc
Simple merge