From: Samual Lenks <samual@xonotic.org>
Date: Mon, 6 Jan 2014 22:06:50 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/Mario/monsters'
X-Git-Tag: xonotic-v0.8.0~241^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=79af1d0a6a91cc42a4359ecdae84a9fa72593731;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/Mario/monsters'

# By Mario (531) and Samual Lenks (1)
# Via Mario (52) and Samual Lenks (1)
* origin/Mario/monsters: (532 commits)
  Clean up monster commands a bit more
  Update command aliases to match code
  Clean up mobspawn command a little bit
  Clean up invasion global functions a bit
  Fix mobbutcher command description
  Use printf macro
  Empty commit so we can test merge request submission again
  Don't check if monster has re-spawned when lowering counts
  Replace tabs with spaces in REGISTER_MONSTER lists
  Fix some invalid cvars
  Add some mutator hooks for regen & mob spawning
  Clean up CTF monster checks a little
  Attempt to clean up commands a bit
  Add a mutator hook for accuracy checking & fix notification typo
  Show icon for monster deaths
  Don't network monsterid
  Use spaces in command aliases
  Remove some now unused textures
  Remove an alias for a no longer valid command
  Remove freeze code, monsters no longer use freeze attacks
  ...
---

79af1d0a6a91cc42a4359ecdae84a9fa72593731