From: Mario <mario.mario@y7mail.com>
Date: Fri, 13 Sep 2019 12:51:28 +0000 (+0000)
Subject: Merge branch 'martin-t/seta' into 'master'
X-Git-Tag: xonotic-v0.8.5~1286
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a0a09daade95eb6c4a0ad85680440392ae4f6e6a;p=xonotic%2Fxonotic-data.pk3dir.git

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

Seta -> set in server configs

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

a0a09daade95eb6c4a0ad85680440392ae4f6e6a
diff --cc gamemodes-server.cfg
index c6e1e30a3,fc441af95..548a51223
--- a/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@@ -223,10 -223,9 +223,10 @@@ set g_ca_spectate_enemies 0 "Allow spec
  set g_ca_warmup 10 "how long the players will have time to run around the map before the round starts"
  set g_ca_damage2score_multiplier 0.01
  set g_ca_round_timelimit 180 "round time limit in seconds"
- seta g_ca_teams_override 0
+ set g_ca_teams_override 0
  set g_ca_team_spawns 0 "when 1, players spawn from the team spawnpoints of the map, if any"
  set g_ca_teams 0
 +set g_ca_weaponarena "most" "starting weapons - takes the same options as g_weaponarena"
  
  
  // ==================
@@@ -368,10 -367,9 +368,10 @@@ set g_freezetag_revive_nade 1 "Enable r
  set g_freezetag_revive_nade_health 40 "Amount of health player has if they revived from their own nade explosion"
  set g_freezetag_round_timelimit 180 "round time limit in seconds"
  set g_freezetag_frozen_maxtime 60 "frozen players will be automatically unfrozen after this time in seconds"
- seta g_freezetag_teams_override 0
+ set g_freezetag_teams_override 0
  set g_freezetag_team_spawns 0 "when 1, players spawn from the team spawnpoints of the map, if any"
  set g_freezetag_teams 0
 +set g_freezetag_weaponarena "most_available" "starting weapons - takes the same options as g_weaponarena"
  
  
  // ==========