From: Mario <zacjardine@y7mail.com>
Date: Sat, 25 Apr 2015 15:25:39 +0000 (+1000)
Subject: Merge branch 'master' into Melanosuchus/minigames
X-Git-Tag: xonotic-v0.8.2~2038^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=eff92d4aee25ebe31fe768af2b86c8bea80d1a51;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Melanosuchus/minigames

Conflicts:
	qcsrc/server/autocvars.qh
---

eff92d4aee25ebe31fe768af2b86c8bea80d1a51
diff --cc qcsrc/server/autocvars.qh
index dc6a5f581,f84eb008b..583fe10a4
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -190,26 -190,27 +190,26 @@@ float autocvar_g_ban_default_masksize
  float autocvar_g_ban_sync_interval;
  float autocvar_g_ban_sync_timeout;
  string autocvar_g_ban_sync_trusted_servers;
- float autocvar_g_ban_sync_trusted_servers_verify;
+ bool autocvar_g_ban_sync_trusted_servers_verify;
  string autocvar_g_ban_sync_uri;
  string autocvar_g_banned_list;
- float autocvar_g_banned_list_idmode;
- float autocvar_g_botclip_collisions;
- float autocvar_g_bugrigs;
+ bool autocvar_g_banned_list_idmode;
 -bool autocvar_g_bastet;
+ bool autocvar_g_botclip_collisions;
+ bool autocvar_g_bugrigs;
  float autocvar_g_ca_damage2score_multiplier;
- float autocvar_g_ca_point_leadlimit;
- float autocvar_g_ca_point_limit;
+ int autocvar_g_ca_point_leadlimit;
+ int autocvar_g_ca_point_limit;
  float autocvar_g_ca_round_timelimit;
- float autocvar_g_ca_spectate_enemies;
- float autocvar_g_ca_teams;
- float autocvar_g_ca_teams_override;
- float autocvar_g_ca_team_spawns;
+ bool autocvar_g_ca_spectate_enemies;
+ int autocvar_g_ca_teams;
+ int autocvar_g_ca_teams_override;
+ bool autocvar_g_ca_team_spawns;
  float autocvar_g_ca_warmup;
- float autocvar_g_campaign;
+ bool autocvar_g_campaign;
  #define autocvar_g_campaign_forceteam cvar("g_campaign_forceteam")
- float autocvar_g_campaign_skill;
- float autocvar_g_casings;
- float autocvar_g_changeteam_banned;
+ int autocvar_g_campaign_skill;
+ int autocvar_g_casings;
+ bool autocvar_g_changeteam_banned;
  float autocvar_g_chat_flood_burst;
  float autocvar_g_chat_flood_burst_team;
  float autocvar_g_chat_flood_burst_tell;