From: terencehill Date: Sat, 3 Aug 2013 09:53:35 +0000 (+0200) Subject: Merge branch 'master' into terencehill/music_player X-Git-Tag: xonotic-v0.8.1~157^2~21 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8bd579d6ca74881bd77ae83fd00ac81c9e0108cf;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/music_player --- 8bd579d6ca74881bd77ae83fd00ac81c9e0108cf diff --cc defaultXonotic.cfg index 7cac58a67,c392e9a15..4f42f4a96 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@@ -1420,15 -1111,10 +1111,10 @@@ cd remap $g_cdtracks_remaplis set sv_intermission_cdtrack "" set g_cdtracks_dontusebydefault "rising-of-the-phoenix" -set menu_cdtrack "rising-of-the-phoenix" +seta menu_cdtrack "rising-of-the-phoenix" - // maxidle (in seconds): kick players idle for more than that amount of time - set sv_maxidle 0 - // when sv_maxidle is not 0, assume spectators are idle too - set sv_maxidle_spectatorsareidle 0 - - // CTF capture limit placeholder cvar - set capturelimit 0 + set sv_maxidle 0 "kick players idle for more than this amount of time in seconds" + set sv_maxidle_spectatorsareidle 0 "when sv_maxidle is not 0, assume spectators are idle too" // these entities are not referenced by anything directly, they just represent // teams and are found by find() when needed