From: Mario <zacjardine@y7mail.com>
Date: Sun, 3 May 2015 14:43:37 +0000 (+1000)
Subject: Merge branch 'master' into Mario/ctf_updates
X-Git-Tag: xonotic-v0.8.1~29^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=34195feabdbcec29f6b7f6fcf8df8e25c4f41d8a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/ctf_updates

Conflicts:
	qcsrc/client/hud.qc
	qcsrc/server/autocvars.qh
---

34195feabdbcec29f6b7f6fcf8df8e25c4f41d8a
diff --cc qcsrc/client/hud.qc
index 20eef9123,0da1b69d2..15cc11760
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -2859,9 -2864,9 +2865,9 @@@ void HUD_Mod_CA(vector myPos, vector my
  }
  
  // CTF HUD modicon section
 -float redflag_prevframe, blueflag_prevframe; // status during previous frame
 -int redflag_prevstatus, blueflag_prevstatus; // last remembered status
 -float redflag_statuschange_time, blueflag_statuschange_time; // time when the status changed
 +int redflag_prevframe, blueflag_prevframe, yellowflag_prevframe, pinkflag_prevframe, neutralflag_prevframe; // status during previous frame
 +int redflag_prevstatus, blueflag_prevstatus, yellowflag_prevstatus, pinkflag_prevstatus, neutralflag_prevstatus; // last remembered status
- int redflag_statuschange_time, blueflag_statuschange_time, yellowflag_statuschange_time, pinkflag_statuschange_time, neutralflag_statuschange_time; // time when the status changed
++float redflag_statuschange_time, blueflag_statuschange_time, yellowflag_statuschange_time, pinkflag_statuschange_time, neutralflag_statuschange_time; // time when the status changed
  
  void HUD_Mod_CTF_Reset(void)
  {
diff --cc qcsrc/server/autocvars.qh
index 8fd5acfdc,f84eb008b..65595a0f1
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -238,8 -238,7 +238,8 @@@ float autocvar_g_ctf_throw_velocity_for
  float autocvar_g_ctf_throw_velocity_up;
  float autocvar_g_ctf_drop_velocity_up;
  float autocvar_g_ctf_drop_velocity_side;
 +bool autocvar_g_ctf_oneflag_reverse;
- float autocvar_g_ctf_portalteleport;
+ bool autocvar_g_ctf_portalteleport;
  bool autocvar_g_ctf_pass;
  float autocvar_g_ctf_pass_arc;
  float autocvar_g_ctf_pass_arc_max;
@@@ -252,18 -251,19 +252,18 @@@ float autocvar_g_ctf_pass_turnrate
  float autocvar_g_ctf_pass_timelimit;
  float autocvar_g_ctf_pass_velocity;
  bool autocvar_g_ctf_dynamiclights;
 -string autocvar_g_ctf_flag_blue_model;
 -int autocvar_g_ctf_flag_blue_skin;
  float autocvar_g_ctf_flag_collect_delay;
  float autocvar_g_ctf_flag_damageforcescale;
 -int autocvar_g_ctf_flag_dropped_waypoint;
 -float autocvar_g_ctf_flag_dropped_floatinwater;
 +bool autocvar_g_ctf_flag_dropped_waypoint;
 +bool autocvar_g_ctf_flag_dropped_floatinwater;
  bool autocvar_g_ctf_flag_glowtrails;
 -float autocvar_g_ctf_flag_health;
 -string autocvar_g_ctf_flag_red_model;
 -int autocvar_g_ctf_flag_red_skin;
 +int autocvar_g_ctf_flag_health;
 +bool autocvar_g_ctf_flag_return;
 +float autocvar_g_ctf_flag_return_carried_radius;
  float autocvar_g_ctf_flag_return_time;
- float autocvar_g_ctf_flag_return_when_unreachable;
+ bool autocvar_g_ctf_flag_return_when_unreachable;
  float autocvar_g_ctf_flag_return_damage;
 +float autocvar_g_ctf_flag_return_damage_delay;
  float autocvar_g_ctf_flag_return_dropped;
  float autocvar_g_ctf_flagcarrier_auto_helpme_damage;
  float autocvar_g_ctf_flagcarrier_auto_helpme_time;
@@@ -278,7 -278,7 +278,6 @@@ int autocvar_g_ctf_score_capture
  int autocvar_g_ctf_score_capture_assist;
  int autocvar_g_ctf_score_kill;
  int autocvar_g_ctf_score_penalty_drop;
- //float autocvar_g_ctf_score_penalty_suicidedrop;
 -//int autocvar_g_ctf_score_penalty_suicidedrop;
  int autocvar_g_ctf_score_penalty_returned;
  int autocvar_g_ctf_score_pickup_base;
  int autocvar_g_ctf_score_pickup_dropped_early;