From: Mario <zacjardine@y7mail.com>
Date: Thu, 13 Nov 2014 13:55:46 +0000 (+1100)
Subject: Merge branch 'master' into Mario/mutators2
X-Git-Tag: xonotic-v0.8.0~166^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7c46d29ba4098441f430f20d2bb6f76a49b0ec68;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/mutators2

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

7c46d29ba4098441f430f20d2bb6f76a49b0ec68
diff --cc .gitignore
index 111ff9109,a305108b3..6b5cef68e
--- a/.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/mutators/mutators.qc
index e2331deb9,000000000..71569b7f9
mode 100644,000000..100644
--- a/qcsrc/server/mutators/mutators.qc
+++ 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 39faeb411,000000000..887f9929f
mode 100644,000000..100644
--- a/qcsrc/server/mutators/mutators_include.qc
+++ 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 60c522cdd,000000000..c0fbbe4ec
mode 100644,000000..100644
--- a/qcsrc/server/mutators/mutators_include.qh
+++ 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"