From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 10 Feb 2011 16:49:35 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/universal_reload_system
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~61
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=194e2e23ed2569fd71f1f7cb5c33e833a46fcb2d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into mirceakitsune/universal_reload_system
---

194e2e23ed2569fd71f1f7cb5c33e833a46fcb2d
diff --cc qcsrc/server/autocvars.qh
index 57bed42e1,0820ef713..7c9a53357
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -443,15 -431,11 +444,16 @@@ float autocvar_g_balance_minelayer_remo
  float autocvar_g_balance_minelayer_remote_radius;
  float autocvar_g_balance_minelayer_speed;
  float autocvar_g_balance_minelayer_time;
 +float autocvar_g_balance_minelayer_reload_ammo;
 +float autocvar_g_balance_minelayer_reload_time;
  float autocvar_g_balance_minstanex_ammo;
 +float autocvar_g_balance_minstanex_laser_ammo;
  float autocvar_g_balance_minstanex_animtime;
  float autocvar_g_balance_minstanex_refire;
 +float autocvar_g_balance_minstanex_reload_ammo;
 +float autocvar_g_balance_minstanex_reload_time;
  float autocvar_g_balance_nex_charge;
+ float autocvar_g_balance_nex_charge_animlimit;
  float autocvar_g_balance_nex_charge_limit;
  float autocvar_g_balance_nex_charge_maxspeed;
  float autocvar_g_balance_nex_charge_mindmg;