Merge branch 'master' into Mario/mutators2

Conflicts:
	qcsrc/server/miscfunctions.qc
	qcsrc/server/progs.src

diff --cc .gitignore
index 111ff910955c548eff9626df6d03e7f9892890e7,a305108b3a2a7b85823098b7c60d5cf480f50003..6b5cef68e6ae6881cd0fc23abc2340230d73614e
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -6,4 -6,5 +6,6 @@@ qcsrc/menu/fteqcc.lo
  qcsrc/server/fteqcc.log
  weapons.qc.tmp
  *.lno
- qcsrc/qccversion.*
+ qcsrc/qccversion*
+ qcsrc/server/precache-for-csqc.inc
++.DS_Store

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

diff --cc qcsrc/server/mutators/mutators.qc
index e2331deb9d6451d2a89f1991d94af34e65268530,0000000000000000000000000000000000000000..71569b7f9833f41c9a1323d4dc49b77e4c59875d
mode 100644,000000..100644
--- 1/qcsrc/server/mutators/mutators.qc
--- /dev/null
+++ b/qcsrc/server/mutators/mutators.qc
@@@ -1,28 -1,0 +1,29 @@@
 +void mutators_add()
 +{
 +      #define CHECK_MUTATOR_ADD(mut_cvar,mut_name,dependence) \
 +              { if(cvar(mut_cvar) && dependence) { MUTATOR_ADD(mut_name); } }
 +
 +      CHECK_MUTATOR_ADD("g_dodging", mutator_dodging, 1);
 +      CHECK_MUTATOR_ADD("g_spawn_near_teammate", mutator_spawn_near_teammate, teamplay);
 +      CHECK_MUTATOR_ADD("g_physical_items", mutator_physical_items, 1);
 +      CHECK_MUTATOR_ADD("g_touchexplode", mutator_touchexplode, 1);
 +      CHECK_MUTATOR_ADD("g_minstagib", mutator_minstagib, !g_nexball);
 +      CHECK_MUTATOR_ADD("g_invincible_projectiles", mutator_invincibleprojectiles, !cvar("g_minstagib"));
 +      CHECK_MUTATOR_ADD("g_new_toys", mutator_new_toys, !cvar("g_minstagib"));
 +      CHECK_MUTATOR_ADD("g_nix", mutator_nix, !cvar("g_minstagib"));
 +      CHECK_MUTATOR_ADD("g_rocket_flying", mutator_rocketflying, !cvar("g_minstagib"));
 +      CHECK_MUTATOR_ADD("g_vampire", mutator_vampire, !cvar("g_minstagib"));
 +      CHECK_MUTATOR_ADD("g_superspectate", mutator_superspec, 1);
 +      CHECK_MUTATOR_ADD("g_pinata", mutator_pinata, !cvar("g_minstagib"));
 +      CHECK_MUTATOR_ADD("g_midair", mutator_midair, 1);
 +      CHECK_MUTATOR_ADD("g_bloodloss", mutator_bloodloss, !cvar("g_minstagib"));
 +      CHECK_MUTATOR_ADD("g_random_gravity", mutator_random_gravity, 1);
 +      CHECK_MUTATOR_ADD("g_multijump", mutator_multijump, 1);
 +      CHECK_MUTATOR_ADD("g_melee_only", mutator_melee_only, !cvar("g_minstagib") && !g_nexball);
 +      CHECK_MUTATOR_ADD("g_nades", mutator_nades, 1);
 +      CHECK_MUTATOR_ADD("g_sandbox", sandbox, 1);
 +      CHECK_MUTATOR_ADD("g_campcheck", mutator_campcheck, 1);
++      CHECK_MUTATOR_ADD("g_buffs", mutator_buffs, 1);
 +
 +      #undef CHECK_MUTATOR_ADD
 +}

diff --cc qcsrc/server/mutators/mutators_include.qc
index 39faeb411db6aaed3e3ee4379a26204bf97dcd77,0000000000000000000000000000000000000000..887f9929f3f0e2c0a0ce8c739b2ee5911570809c
mode 100644,000000..100644
--- 1/qcsrc/server/mutators/mutators_include.qc
--- /dev/null
+++ b/qcsrc/server/mutators/mutators_include.qc
@@@ -1,33 -1,0 +1,34 @@@
 +#include "base.qc"
 +#include "gamemode_assault.qc"
 +#include "gamemode_ca.qc"
 +#include "gamemode_ctf.qc"
 +#include "gamemode_domination.qc"
 +#include "gamemode_freezetag.qc"
 +#include "gamemode_keyhunt.qc"
 +#include "gamemode_keepaway.qc"
 +#include "gamemode_nexball.qc"
 +#include "gamemode_onslaught.qc"
 +#include "gamemode_lms.qc"
 +#include "gamemode_invasion.qc"
 +
 +#include "mutator_invincibleproj.qc"
 +#include "mutator_new_toys.qc"
 +#include "mutator_nix.qc"
 +#include "mutator_dodging.qc"
 +#include "mutator_rocketflying.qc"
 +#include "mutator_vampire.qc"
 +#include "mutator_spawn_near_teammate.qc"
 +#include "mutator_physical_items.qc"
 +#include "sandbox.qc"
 +#include "mutator_superspec.qc"
 +#include "mutator_minstagib.qc"
 +#include "mutator_touchexplode.qc"
 +#include "mutator_pinata.qc"
 +#include "mutator_midair.qc"
 +#include "mutator_bloodloss.qc"
 +#include "mutator_random_gravity.qc"
 +#include "mutator_multijump.qc"
 +#include "mutator_melee_only.qc"
 +#include "mutator_nades.qc"
 +#include "mutator_campcheck.qc"
++#include "mutator_buffs.qc"

diff --cc qcsrc/server/mutators/mutators_include.qh
index 60c522cdd673888ea639b4a38ae6e97031b04a3d,0000000000000000000000000000000000000000..c0fbbe4ecdca36d33bbd94deacfd3b82d981bdd0
mode 100644,000000..100644
--- 1/qcsrc/server/mutators/mutators_include.qh
--- /dev/null
+++ b/qcsrc/server/mutators/mutators_include.qh
@@@ -1,14 -1,0 +1,15 @@@
 +#include "base.qh"
 +#include "mutators.qh"
 +#include "gamemode_assault.qh"
 +#include "gamemode_ca.qh"
 +#include "gamemode_ctf.qh"
 +#include "gamemode_domination.qh"
 +#include "gamemode_keyhunt.qh"
 +#include "gamemode_keepaway.qh"
 +#include "gamemode_nexball.qh"
 +#include "gamemode_lms.qh"
 +#include "gamemode_invasion.qh"
 +
 +#include "mutator_dodging.qh"
 +#include "mutator_nades.qh"
++#include "mutator_buffs.qh"

diff --cc qcsrc/server/progs.src
Simple merge