]> 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: f555d10 d45aa5b)
Merge branch 'bones_was_here/autopause_dedicated' into 'master'
authorbones_was_here <bones_was_here@xonotic.au>
Tue, 9 May 2023 09:09:10 +0000 (09:09 +0000)
committerbones_was_here <bones_was_here@xonotic.au>
Tue, 9 May 2023 09:09:10 +0000 (09:09 +0000)
Autopause for dedicated servers, better autopause for singleplayer/listen

Closes #2670

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

1  2 
qcsrc/server/world.qc patch | diff1 | diff2 | blob | history
xonotic-client.cfg patch | diff1 | diff2 | blob | history
xonotic-server.cfg patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/world.qc
Simple merge
diff --cc xonotic-client.cfg
Simple merge
diff --cc xonotic-server.cfg
Simple merge