From: Martin Taibr <taibr.martin@gmail.com>
Date: Sat, 28 Sep 2019 16:58:52 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/cvar-descriptions
X-Git-Tag: xonotic-v0.8.5~1257^2
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=97432e0c70ef3105f28b329d089e0eef927b5a60

Merge branch 'master' into martin-t/cvar-descriptions
---

97432e0c70ef3105f28b329d089e0eef927b5a60
diff --cc xonotic-server.cfg
index 4c4149eed3,f1f2898ee3..e66f051cd8
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@@ -335,16 -335,16 +335,16 @@@ set sv_curl_serverpackages_auto 1 "auto
  
  set sv_motd "" "additional information to show on the welcome screen that greets joining players"
  
- set g_waypoints_for_items 0	"make waypoints out of items, values: 0 = never, 1 = unless the mapper prevents it by worldspawn.spawnflags & 1, 2 = always"
+ set g_waypoints_for_items 0 "make waypoints out of items, values: 0 = never, 1 = unless the mapper prevents it by worldspawn.spawnflags & 1, 2 = always"
  
 -set g_maplist_votable 6 "number of maps that are shown in the map voting at the end of a match"
 +set g_maplist_votable 6 "number of maps that are shown in the map voting at the end of a match, 0 to disable"
  set g_maplist_votable_keeptwotime 15 "show only 2 options after this amount of time during map vote screen"
- set g_maplist_votable_timeout 30	"timeout for the map voting; must be below 50 seconds!"
+ set g_maplist_votable_timeout 30 "timeout for the map voting; must be below 50 seconds!"
 -set g_maplist_votable_suggestions 2 "number of maps a player is allowed to suggest for the map voting screen"
 +set g_maplist_votable_suggestions 2 "number of maps a player is allowed to suggest for the map voting screen using 'suggestmap'"
  set g_maplist_votable_suggestions_override_mostrecent 0 "allow players to suggest maps that have been played recently"
- set g_maplist_votable_nodetail 0	"hide per-map vote counts (to avoid influential first votes)"
- set g_maplist_votable_abstain 0	"offer a "\don't care\" option on the voting screen"
 -set g_maplist_votable_nodetail 0 "nodetail only shows total count instead of all vote counts per map, so votes don't influence others that much"
 -set g_maplist_votable_abstain 0 "when 1, you can abstain from your vote"
 -set g_maplist_votable_screenshot_dir "maps levelshots" "where to look for map screenshots"
++set g_maplist_votable_nodetail 0 "hide per-map vote counts (to avoid influential first votes)"
++set g_maplist_votable_abstain 0 "offer a "\don't care\" option on the voting screen"
 +set g_maplist_votable_screenshot_dir "maps levelshots"	"where to look for map screenshots"
  
  set sv_vote_gametype 0 "show a vote screen for gametypes before map vote screen"
  set sv_vote_gametype_keeptwotime 10 "show only 2 options after this amount of time during gametype vote screen"