From: Mario <zacjardine@y7mail.com>
Date: Mon, 11 Jun 2018 08:55:19 +0000 (+0000)
Subject: Merge branch 'martin-t/defaults' into 'master'
X-Git-Tag: xonotic-v0.8.5~2073
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=b2e3660c5c919d8be9594934e8f6eec9b82346a3;hp=1d42e9d9e3e364e10c3c41b507ab6abd77dd6c9a

Merge branch 'martin-t/defaults' into 'master'

Changes to defaults

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

diff --git a/commands.cfg b/commands.cfg
index 79366e4b70..0e765b8a13 100644
--- a/commands.cfg
+++ b/commands.cfg
@@ -322,7 +322,7 @@ set sv_vote_master_password "" "when set, users can use \"vlogin PASSWORD\" to l
 set sv_vote_master_playerlimit 2 "Minimum number of players needed for a player to be allowed to vote for master"
 set sv_vote_no_stops_vote 1 "Allow the vote caller to stop his own vote simply by voting no"
 set sv_vote_singlecount 0	"set to 1 to count votes once after timeout or to 0 to count with every vote"
-set sv_vote_timeout 30	"a vote will timeout after this many seconds"
+set sv_vote_timeout 24	"a vote will timeout after this many seconds"
 set sv_vote_wait 120	"a player can not call a vote again for this many seconds when his vote was not accepted"
 set sv_vote_stop 15	"a player can not call a vote again for this many seconds when he stopped this vote (e.g. to correct it)"
 set sv_vote_majority_factor 0.5	"What percentage of the PLAYERS constitute a majority? (Must be at least 0.5, recommended: 0.5)"
diff --git a/hud_luma.cfg b/hud_luma.cfg
index 9572657167..9dcfe0629a 100644
--- a/hud_luma.cfg
+++ b/hud_luma.cfg
@@ -44,7 +44,7 @@ seta hud_panel_weapons_bg_alpha ""
 seta hud_panel_weapons_bg_border ""
 seta hud_panel_weapons_bg_padding "0"
 seta hud_panel_weapons_accuracy "0"
-seta hud_panel_weapons_label "1"
+seta hud_panel_weapons_label "2"
 seta hud_panel_weapons_label_scale "0.3"
 seta hud_panel_weapons_complainbubble "1"
 seta hud_panel_weapons_complainbubble_padding "0"
diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh
index 2dd84596e4..4addd24001 100644
--- a/qcsrc/common/mapinfo.qh
+++ b/qcsrc/common/mapinfo.qh
@@ -96,7 +96,7 @@ REGISTRY_CHECK(Gametypes)
 CLASS(Deathmatch, Gametype)
     INIT(Deathmatch)
     {
-        this.gametype_init(this, _("Deathmatch"),"dm","g_dm",false,"","timelimit=20 pointlimit=30 leadlimit=0",_("Score as many frags as you can"));
+        this.gametype_init(this, _("Deathmatch"),"dm","g_dm",false,"","timelimit=15 pointlimit=30 leadlimit=0",_("Score as many frags as you can"));
     }
     METHOD(Deathmatch, m_isAlwaysSupported, bool(Gametype this, int spawnpoints, float diameter))
     {
@@ -181,7 +181,7 @@ REGISTER_GAMETYPE(CTS, NEW(RaceCTS));
 CLASS(TeamDeathmatch, Gametype)
     INIT(TeamDeathmatch)
     {
-        this.gametype_init(this, _("Team Deathmatch"),"tdm","g_tdm",true,"","timelimit=20 pointlimit=50 teams=2 leadlimit=0",_("Help your team score the most frags against the enemy team"));
+        this.gametype_init(this, _("Team Deathmatch"),"tdm","g_tdm",true,"","timelimit=15 pointlimit=50 teams=2 leadlimit=0",_("Help your team score the most frags against the enemy team"));
     }
     METHOD(TeamDeathmatch, m_parse_mapinfo, bool(string k, string v))
     {
diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index 97e061b1c5..240a2254c6 100644
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -345,7 +345,7 @@ set g_maplist_votable_screenshot_dir "maps levelshots"	"where to look for map sc
 
 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"
-set sv_vote_gametype_options "dm ctf ca lms tdm ft"
+set sv_vote_gametype_options "dm tdm ctf"
 set sv_vote_gametype_timeout 20
 set sv_vote_gametype_default_current 1 "Keep the current gametype if no one votes"