Merge branch 'Mario/melee_mutator' into Mario/mutators

diff --cc defaultXonotic.cfg
index 7f718746acdb7b3435b5092dac0f757d1d66f2ed,d7ecf5fd8a9528f9efe94bb38995d055a19bbe06..bd9ebc176acdefaed3d348f7bfd07bfb13b057f2
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -1602,10 -1602,4 +1602,12 @@@ set cl_weapon_stay_alpha 0.75 "Alpha o
  
  seta g_superspectate 0 "server side, allows extended spectator functions through the cmd interface. followpowerup, followstrength, followstshield or followfc [red|blue] will transfer spectation to the relevent player, if any"
  
 +set g_random_gravity 0 "enable random gravity mutator"
 +set g_random_gravity_delay 3 "delay between gravity changes"
 +set g_random_gravity_negative_chance 0.5 "chance of gravity being a negative value"
 +set g_random_gravity_min -2000 "minimum gravity"
 +set g_random_gravity_max 2000 "maximum gravity"
 +set g_random_gravity_positive 1000 "positive gravity multiplier"
 +set g_random_gravity_negative 1000 "negative gravity multiplier"
++
+ set g_melee_only 0 "enable melee only arena"

diff --cc qcsrc/server/miscfunctions.qc
index 1b0fed0675349671bf0d867a52586dd34ccf5ff0,b9c1475d4d380c4710eb2860d47e02742519a2dd..d0a0a84a54675e86b3a8d0c2aeee97f624d23b1d
--- 1/qcsrc/server/miscfunctions.qc
--- 2/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@@ -918,14 -919,7 +918,15 @@@ void readlevelcvars(void
        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_norecoil", mutator_norecoil, 1);
 +      CHECK_MUTATOR_ADD("g_multijump", mutator_multijump, 1);
 +      CHECK_MUTATOR_ADD("g_jump_grunt", mutator_jump_grunt, 1);
 +      CHECK_MUTATOR_ADD("g_footsteps", mutator_footsteps, 1);
+       CHECK_MUTATOR_ADD("g_melee_only", mutator_melee_only, !cvar("g_minstagib"));
        CHECK_MUTATOR_ADD("g_sandbox", sandbox, 1);
        
        #undef CHECK_MUTATOR_ADD

diff --cc qcsrc/server/mutators/mutators.qh
index edfd81d31df045dbf215a900baf8bdec8109dbb1,e150bddbbde904acb257fe50d71b0993b63de160..48ada7784fe96f24543092dddbf1f99cb26890fc
--- 1/qcsrc/server/mutators/mutators.qh
--- 2/qcsrc/server/mutators/mutators.qh
+++ b/qcsrc/server/mutators/mutators.qh
@@@ -21,13 -21,6 +21,14 @@@ MUTATOR_DECLARATION(mutator_vampire)
  MUTATOR_DECLARATION(mutator_superspec);
  MUTATOR_DECLARATION(mutator_minstagib);
  MUTATOR_DECLARATION(mutator_touchexplode);
 +MUTATOR_DECLARATION(mutator_pinata);
 +MUTATOR_DECLARATION(mutator_midair);
 +MUTATOR_DECLARATION(mutator_bloodloss);
 +MUTATOR_DECLARATION(mutator_random_gravity);
 +MUTATOR_DECLARATION(mutator_norecoil);
 +MUTATOR_DECLARATION(mutator_multijump);
 +MUTATOR_DECLARATION(mutator_jump_grunt);
 +MUTATOR_DECLARATION(mutator_footsteps);
+ MUTATOR_DECLARATION(mutator_melee_only);
  
  MUTATOR_DECLARATION(sandbox);

diff --cc qcsrc/server/progs.src
index 3f97fd36f30b6aa0e966168e3864ebbed8cbd831,5b6825e8d88b1ea95be4aaf851bf34a878c15952..7be15ed7cb94790533a19132ee10f9e969c614cb
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -248,14 -248,7 +248,15 @@@ mutators/sandbox.q
  mutators/mutator_superspec.qc
  mutators/mutator_minstagib.qc
  mutators/mutator_touchexplode.qc
 +mutators/mutator_pinata.qc
 +mutators/mutator_midair.qc
 +mutators/mutator_bloodloss.qc
 +mutators/mutator_random_gravity.qc
 +mutators/mutator_norecoil.qc
 +mutators/mutator_multijump.qc
 +mutators/mutator_jump_grunt.qc
 +mutators/mutator_footsteps.qc
+ mutators/mutator_melee_only.qc
  
  ../warpzonelib/anglestransform.qc
  ../warpzonelib/mathlib.qc