Merge branch 'master' into terencehill/ft_autorevive_progress

# Conflicts:
#	gamemodes-server.cfg

diff --cc gamemodes-server.cfg
index 51d9d19382398661f88ad447713e7e0bb5fd6d21,6d8ee6f07364532ee1ecb47cc6e051b8a4181823..d5eb85d649c63a5aceb34186c9338f5b1e03333b
--- 1/gamemodes-server.cfg
--- 2/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@@ -365,15 -367,12 +367,16 @@@ 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_revive_auto 1 "automatically revive frozen players after some time (g_freezetag_frozen_maxtime)"
 +set g_freezetag_revive_auto_progress 1 "start the automatic reviving progress as soon as the player gets frozen"
 +set g_freezetag_revive_auto_reducible 1 "reduce auto-revival time when frozen players are hit by enemies; if cvar value is negative reduce time even when they are hit by teammates"
 +set g_freezetag_revive_auto_reducible_forcefactor 0.025 "hit force to time reduction conversion factor"
  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/gamemodes/gamemode/freezetag/sv_freezetag.qc
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh
Simple merge

diff --cc qcsrc/server/g_damage.qc
Simple merge

diff --cc qcsrc/server/player.qc
Simple merge