Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
#	qcsrc/common/mutators/mutator/overkill/sv_overkill.qc

diff --cc mutators.cfg
index 18ed08cec71ab2dd9018df48d944eaf63c8b95cb,8fd4d2baf66b3a9e74db9b6f28374bcb2c18a5e8..4b8f1a2376ce25874e880eebba7340762a64f93c
--- 1/mutators.cfg
--- 2/mutators.cfg
+++ b/mutators.cfg
@@@ -45,11 -49,28 +49,12 @@@ set g_instagib_friendlypush 1 "allow pu
  // ==========
  set g_overkill 0 "enable overkill"
  
- set g_overkill_100a_anyway 1
- set g_overkill_100h_anyway 1
  set g_overkill_powerups_replace 1
- set g_overkill_superguns_respawn_time 120
+ set g_overkill_filter_healthmega 0
+ set g_overkill_filter_armormedium 0
+ set g_overkill_filter_armorbig 0
+ set g_overkill_filter_armorlarge 0
  
 -set g_overkill_ammo_charge 0
 -set g_overkill_ammo_charge_notice 1
 -set g_overkill_ammo_charge_limit 1
 -set g_overkill_ammo_charge_rate 0.5
 -set g_overkill_ammo_charge_rate_vortex 0.5
 -set g_overkill_ammo_charge_rate_machinegun 0.5
 -set g_overkill_ammo_charge_rate_shotgun 0.5
 -set g_overkill_ammo_charge_rate_hmg 0.25
 -set g_overkill_ammo_charge_rate_rpc 1.5
 -set g_overkill_ammo_decharge 0.1
 -set g_overkill_ammo_decharge_machinegun 0.025
 -set g_overkill_ammo_decharge_shotgun 0.15
 -set g_overkill_ammo_decharge_vortex 0.2
 -set g_overkill_ammo_decharge_rpc 1
 -set g_overkill_ammo_decharge_hmg 0.01
 -
  
  // =========
  //  vampire

diff --cc qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index cbc49be16513fa5d1cebbb2d3ed1724368f05910,d47da6c3c38ed43c3949eed8042f94941d8beef9..67512a0a82a4c221a0b5bba2ea2e9750c5011c95
--- 1/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
--- 2/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@@ -4,15 -4,25 +4,19 @@@
  #include "rpc.qh"
  
  bool autocvar_g_overkill_powerups_replace;
- float autocvar_g_overkill_superguns_respawn_time;
- bool autocvar_g_overkill_100h_anyway;
- bool autocvar_g_overkill_100a_anyway;
+ bool autocvar_g_overkill_ammo_charge;
+ float autocvar_g_overkill_ammo_charge_notice;
+ float autocvar_g_overkill_ammo_charge_limit;
+ 
+ bool autocvar_g_overkill_filter_healthmega;
+ bool autocvar_g_overkill_filter_armormedium;
+ bool autocvar_g_overkill_filter_armorbig;
+ bool autocvar_g_overkill_filter_armorlarge;
  
- .vector ok_deathloc;
- .float ok_spawnsys_timer;
- .Weapon ok_lastwep[MAX_WEAPONSLOTS];
 -.float ok_lastwep;
  .float ok_item;
  
 -.float ok_notice_time;
 -.float ammo_charge[Weapons_MAX];
 -.float ok_use_ammocharge = _STAT(OK_AMMO_CHARGE);
 -.float ok_ammo_charge = _STAT(OK_AMMO_CHARGEPOOL);
 -
 -void(entity ent, float wep) ok_DecreaseCharge;
++.Weapon ok_lastwep[MAX_WEAPONSLOTS];
+ 
  void ok_Initialize();
  
  REGISTER_MUTATOR(ok, cvar("g_overkill") && !cvar("g_instagib") && !g_nexball && cvar_string("g_mod_balance") == "Overkill")

diff --cc qcsrc/common/physics/player.qc
Simple merge

diff --cc qcsrc/common/stats.qh
Simple merge

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

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

diff --cc qcsrc/server/mutators/events.qh
Simple merge