From: Samual Lenks <samual@xonotic.org>
Date: Sun, 5 Jan 2014 22:07:09 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/terencehill/ca_ft_fixes'
X-Git-Tag: xonotic-v0.8.0~243^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d7de42707d53838c734b3185373b5d586a9f4773;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/terencehill/ca_ft_fixes'

# By terencehill
# Via terencehill
* origin/terencehill/ca_ft_fixes:
  Fix compilation. It seems that Samual renamed inWarmupStage to warmup_stage in the commit 6c4446c0a7 with the very explicative description "I'm a goddamn genius, IT WORKS!".
  Add cvars g_freezetag_team_spawns and g_ca_team_spawns: when 1, players spawn from the team spawnpoints of the map, if any
  CheckAllowedTeams isn't needed in these cases
  Add description to g_*_round_timelimit cvars
  Since CA and LMS have special values for starting ammo, health and armor, let's use them in warmup too
  Allow weapon change impulses when not in round time
  Fix bug where just connected players are forced to join the game the next round
  Fix this Freezetag bug: If you try to revive a player after a round ends the "Revive progress" centerprint will be stuck until a new one appears
  Freezetag: use warmup_start_health in warmup stage
  Reset kill count when a new round starts
  Make work the "3/2/1 frags left" announcer messages in Freezetag
  ScoreRules_freezetag should know the number of available teams this way (like CA and KH)
  Fix implementation of CA score rules
---

d7de42707d53838c734b3185373b5d586a9f4773