Merge remote-tracking branch 'origin/master' into TimePath/gametypes/infection

diff --cc gamemodes.cfg
index 6bf264fd42321b6bc6d7eb1c3a33fe6eae6eb026,4cf77d52e39bd0373c320cf4231372f5864f633f..5112fa4c32986c99342f27fca3dc5e1d5c6d60a0
--- 1/gamemodes.cfg
--- 2/gamemodes.cfg
+++ b/gamemodes.cfg
@@@ -540,20 -532,9 +542,20 @@@ set g_onslaught_spawn_at_generator_rand
  // ======
  set g_race 0 "Race: be faster than your opponents"
  set g_race_qualifying_timelimit 0
- set g_race_qualifying_timelimit_override -1
+ set g_race_qualifying_timelimit_override -1 "qualifying session time limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
  set g_race_teams 0    "when 2, 3, or 4, the race is played as a team game (the team members can add up their laps)"
  
 +
 +// ===========
 +//  infection
 +// ===========
 +set g_infection 0 "Infection: Infect everyone with your color"
 +set g_infection_round_timelimit 180 "round time limit in seconds"
 +set g_infection_warmup 5 "Time players get to run around before the round starts"
 +set g_infection_teams 4 "Maximum number of teams (from 2 to 15 inclusive)"
 +set g_infection_conversions 1 "Enable stealing when killing an alpha"
 +
 +
  // ==========
  //  invasion
  // ==========

diff --cc qcsrc/client/hud/panel/modicons.qc
Simple merge

diff --cc qcsrc/common/mapinfo.qc
Simple merge

diff --cc qcsrc/common/mapinfo.qh
Simple merge

diff --cc qcsrc/menu/xonotic/util.qc
Simple merge