Merge branch 'master' into Mario/monsters

# Conflicts:
#	qcsrc/common/monsters/monster/mage.qh
#	qcsrc/common/monsters/monster/shambler.qh
#	qcsrc/common/monsters/monster/spider.qh
#	qcsrc/common/monsters/monster/wyvern.qh

diff --cc qcsrc/common/monsters/monster/mage.qh
index da94d99fcf58dcb84cf589894d1161cdf51a2757,194b6b2b2d2da88ccff35d24151e8537ec6a8d8b..077fc39c4da775279051d36d7ff6f01896267fa6
--- 1/qcsrc/common/monsters/monster/mage.qh
--- 2/qcsrc/common/monsters/monster/mage.qh
+++ b/qcsrc/common/monsters/monster/mage.qh
@@@ -8,8 -8,8 +8,8 @@@ MODEL(MON_MAGE, M_Model("nanomage.dpm")
  
  CLASS(Mage, Monster)
      ATTRIB(Mage, spawnflags, int, MON_FLAG_MELEE | MON_FLAG_RANGED);
-     ATTRIB(Mage, mins, vector, '-16 -16 -24');
-     ATTRIB(Mage, maxs, vector, '16 16 55');
 -    ATTRIB(Mage, m_mins, vector, '-36 -36 -24');
 -    ATTRIB(Mage, m_maxs, vector, '36 36 50');
++    ATTRIB(Mage, m_mins, vector, '-16 -16 -24');
++    ATTRIB(Mage, m_maxs, vector, '16 16 55');
  #ifdef GAMEQC
      ATTRIB(Mage, m_model, Model, MDL_MON_MAGE);
  #endif

diff --cc qcsrc/common/monsters/monster/spider.qh
index 452f9d43331ed248db0e091722948349d730b1ed,cd7fa9e6becb8c72c195bea86cfe256cf8fcf69d..a60fc4476f3f176362745fa7e44767d141813138
--- 1/qcsrc/common/monsters/monster/spider.qh
--- 2/qcsrc/common/monsters/monster/spider.qh
+++ b/qcsrc/common/monsters/monster/spider.qh
@@@ -8,8 -8,8 +8,8 @@@ MODEL(MON_SPIDER, M_Model("spider.dpm")
  
  CLASS(Spider, Monster)
      ATTRIB(Spider, spawnflags, int, MON_FLAG_MELEE | MON_FLAG_RANGED | MON_FLAG_RIDE);
-     ATTRIB(Spider, mins, vector, '-30 -30 -25');
-     ATTRIB(Spider, maxs, vector, '30 30 30');
 -    ATTRIB(Spider, m_mins, vector, '-18 -18 -25');
 -    ATTRIB(Spider, m_maxs, vector, '18 18 30');
++    ATTRIB(Spider, m_mins, vector, '-30 -30 -25');
++    ATTRIB(Spider, m_maxs, vector, '30 30 30');
  #ifdef GAMEQC
      ATTRIB(Spider, m_model, Model, MDL_MON_SPIDER);
  #endif

diff --cc qcsrc/common/monsters/monster/troll.qh
index df6188db7d4094bc4e034b640461f8f12f33892e,0000000000000000000000000000000000000000..808fbbc0395b70a3e61eccb1f3f17d358771a370
mode 100644,000000..100644
--- 1/qcsrc/common/monsters/monster/troll.qh
--- /dev/null
+++ b/qcsrc/common/monsters/monster/troll.qh
@@@ -1,28 -1,0 +1,28 @@@
-     ATTRIB(Troll, mins, vector, '-45 -45 -24');
-     ATTRIB(Troll, maxs, vector, '45 45 160');
 +#pragma once
 +
 +#ifdef GAMEQC
 +MSG_INFO_NOTIF(DEATH_SELF_MON_TROLL_MELEE,             1, 2, 1, "s1 s2loc spree_lost", "s1",    "notify_death",         "^BG%s^K1 was ripped apart by a Troll%s%s", "")
 +MSG_MULTI_NOTIF(DEATH_SELF_MON_TROLL_MELEE,                1,  NULL,           INFO_DEATH_SELF_MON_TROLL_MELEE,               CENTER_DEATH_SELF_MONSTER)
 +REGISTER_DEATHTYPE(MONSTER_TROLL_MELEE,                        DEATH_SELF_MON_TROLL_MELEE,        DEATH_MURDER_MONSTER,                       "monster")
 +#endif
 +
 +#ifdef GAMEQC
 +MODEL(MON_TROLL, M_Model("troll.dpm"));
 +#endif
 +
 +CLASS(Troll, Monster)
 +    ATTRIB(Troll, spawnflags, int, MON_FLAG_SUPERMONSTER | MON_FLAG_MELEE);
++    ATTRIB(Troll, m_mins, vector, '-45 -45 -24');
++    ATTRIB(Troll, m_maxs, vector, '45 45 160');
 +#ifdef GAMEQC
 +    ATTRIB(Troll, m_model, Model, MDL_MON_TROLL);
 +#endif
 +    ATTRIB(Troll, netname, string, "troll");
 +    ATTRIB(Troll, monster_name, string, _("Troll"));
 +ENDCLASS(Troll)
 +
 +REGISTER_MONSTER(TROLL, NEW(Troll)) {
 +#ifdef GAMEQC
 +    this.mr_precache(this);
 +#endif
 +}

diff --cc qcsrc/common/monsters/monster/wyvern.qh
index 52961eda96f39880691ca89b94d88ddd98767c9e,012c9c2a5e8817913ae557781fae0ac9787f8ba9..a6e32cec4dcc68222be5245f22f4666f667bae21
--- 1/qcsrc/common/monsters/monster/wyvern.qh
--- 2/qcsrc/common/monsters/monster/wyvern.qh
+++ b/qcsrc/common/monsters/monster/wyvern.qh
@@@ -7,9 -7,9 +7,9 @@@ MODEL(MON_WYVERN, M_Model("dragon.dpm")
  #endif
  
  CLASS(Wyvern, Monster)
 -    ATTRIB(Wyvern, spawnflags, int, MONSTER_TYPE_FLY | MONSTER_SIZE_BROKEN | MON_FLAG_RANGED | MON_FLAG_RIDE);
 -    ATTRIB(Wyvern, m_mins, vector, '-20 -20 -58');
 -    ATTRIB(Wyvern, m_maxs, vector, '20 20 20');
 +    ATTRIB(Wyvern, spawnflags, int, MONSTER_TYPE_FLY | MON_FLAG_RANGED | MON_FLAG_RIDE);
-     ATTRIB(Wyvern, mins, vector, '-30 -30 -24');
-     ATTRIB(Wyvern, maxs, vector, '30 30 30');
++    ATTRIB(Wyvern, m_mins, vector, '-30 -30 -24');
++    ATTRIB(Wyvern, m_maxs, vector, '30 30 30');
  #ifdef GAMEQC
      ATTRIB(Wyvern, m_model, Model, MDL_MON_WYVERN);
  #endif

diff --cc qcsrc/common/monsters/sv_monsters.qc
Simple merge

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

diff --cc qcsrc/server/mutators/mutator/gamemode_invasion.qc
Simple merge