From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 28 Aug 2015 14:16:59 +0000 (-0400)
Subject: Merge branch 'master' into divVerent/item_ammo
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8262c76e221d276dace1c4943503e6ab69efeab1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into divVerent/item_ammo
---

8262c76e221d276dace1c4943503e6ab69efeab1
diff --cc qcsrc/server/autocvars.qh
index 6a23c47bd,9d2264869..661ac5f9c
--- a/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/progs.src
index 9f018ff57,22afdf411..2b76a81d7
--- a/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