]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a81e91f dd7dff5)
Merge branch 'terencehill/match_end_restore_status' into 'master'
authorterencehill <piuntn@gmail.com>
Fri, 24 May 2024 20:05:02 +0000 (20:05 +0000)
committerterencehill <piuntn@gmail.com>
Fri, 24 May 2024 20:05:02 +0000 (20:05 +0000)
Survival and CA: when the game ends restore previous player status

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

1  2 
qcsrc/server/world.qc patch | diff1 | diff2 | blob | history
qcsrc/server/world.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/world.qc
Simple merge
diff --cc qcsrc/server/world.qh
Simple merge