Merge branch 'master' into Mario/monsters

# Conflicts:
#	qcsrc/common/monsters/monster/shambler.qc
#	qcsrc/common/monsters/monster/wyvern.qc
#	qcsrc/common/monsters/sv_monsters.qc

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

diff --cc qcsrc/common/mapinfo.qh
Simple merge

diff --cc qcsrc/common/monsters/monster/mage.qc
Simple merge

diff --cc qcsrc/common/monsters/monster/spider.qc
Simple merge

diff --cc qcsrc/common/monsters/monster/wyvern.qc
Simple merge

diff --cc qcsrc/common/monsters/sv_monsters.qc
index 990f318873abf743c7f4d4b4aab3cc0982d34851,4f2139cc170a56c78d49548f47b360e8ca8e78b3..319b699a706372cc3aca360df4259d50dfac907c
--- 1/qcsrc/common/monsters/sv_monsters.qc
--- 2/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@@ -213,8 -189,11 +213,12 @@@ void monster_changeteam(entity this, in
  .void(entity) monster_delayedfunc;
  void Monster_Delay_Action(entity this)
  {
 -      if(Monster_ValidTarget(this.owner, this.owner.enemy))
 +      // TODO: maybe do check for facing here
-       if(Monster_ValidTarget(this.owner, this.owner.enemy, false)) { this.monster_delayedfunc(this.owner); }
++      if(Monster_ValidTarget(this.owner, this.owner.enemy, false))
+       {
+               monster_makevectors(this.owner, this.owner.enemy);
+               this.monster_delayedfunc(this.owner);
+       }
  
        if(this.cnt > 1)
        {

diff --cc qcsrc/common/notifications/all.inc
Simple merge

diff --cc qcsrc/server/autocvars.qh
Simple merge

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

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