Merge branch 'master' into divVerent/item_ammo

diff --cc qcsrc/server/autocvars.qh
index 6a23c47bd6be0a860a652fae5c9b46f6dc125bb7,9d226486921a994eb0100fb682aa350d75670a28..661ac5f9c50caffa40ff85d9d4ddacd8e4bd906e
--- 1/qcsrc/server/autocvars.qh
--- 2/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -839,13 -777,12 +777,13 @@@ float autocvar_g_nades_pokenade_monster
  float autocvar_g_campcheck_damage;
  float autocvar_g_campcheck_distance;
  float autocvar_g_campcheck_interval;
- float autocvar_g_jump_grunt;
- float autocvar_g_balance_ammodistribution_force;
- float autocvar_g_overkill_powerups_replace;
+ bool autocvar_g_jump_grunt;
++bool autocvar_g_balance_ammodistribution_force;
+ bool autocvar_g_overkill_powerups_replace;
  float autocvar_g_overkill_superguns_respawn_time;
- float autocvar_g_overkill_100h_anyway;
- float autocvar_g_overkill_100a_anyway;
- float autocvar_g_overkill_ammo_charge;
+ 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;
  float autocvar_g_spawn_near_teammate_distance;

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

diff --cc qcsrc/server/miscfunctions.qh
Simple merge

diff --cc qcsrc/server/progs.src
index 9f018ff575d8424085866cce8ceec51e652139b1,22afdf4115d0f2b980107de653309720e4a68da5..2b76a81d7dfbeb59511f85c55db781d8ffcfa0e5
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -13,24 -15,19 +15,20 @@@ campaign.q
  cheats.qc
  cl_client.qc
  cl_impulse.qc
- cl_physics.qc
  cl_player.qc
+ controlpoint.qc
  csqceffects.qc
- // ctf.qc
- // domination.qc
  ent_cs.qc
- func_breakable.qc
- g_casings.qc
  g_damage.qc
  g_hook.qc
+ // g_lights.qc // TODO: was never used
  g_models.qc
  g_subs.qc
- g_tetris.qc
- g_triggers.qc
  g_violence.qc
  g_world.qc
+ generator.qc
  ipban.qc
 +item_ammo.qc
  item_key.qc
  mapvoting.qc
  miscfunctions.qc

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

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