]> de.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: 90b2134 cf34c82)
Merge branch 'terencehill/lms_spec' into 'master'
authorterencehill <piuntn@gmail.com>
Thu, 25 May 2023 16:35:55 +0000 (16:35 +0000)
committerterencehill <piuntn@gmail.com>
Thu, 25 May 2023 16:35:55 +0000 (16:35 +0000)
LMS: allow players to get back into the game if they spectated

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

1  2 
notifications.cfg patch | diff1 | diff2 | blob | history
qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc patch | diff1 | diff2 | blob | history
qcsrc/common/notifications/all.inc patch | diff1 | diff2 | blob | history

diff --cc notifications.cfg
Simple merge
diff --cc qcsrc/common/notifications/all.inc
Simple merge