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

Defaults for gamemodes

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

diff --cc gamemodes-server.cfg
index 548a512234f7afce4c83377131fc383592a7375c,223e912629bd868fb768246108de24b29e4602b9..7db5b3f0a248dc1c848c3536c97f701c8ee1176c
--- 1/gamemodes-server.cfg
--- 2/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@@ -366,12 -365,11 +366,12 @@@ set g_freezetag_revive_clearspeed 1.6 "
  set g_freezetag_revive_extra_size 100 "Distance in qu that you can stand from a frozen teammate to keep reviving him"
  set g_freezetag_revive_nade 1 "Enable reviving from own nade explosion"
  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_round_timelimit 360 "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"
  
  
  // ==========

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