Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Conditions/ConditionMgr.h
This commit is contained in:
Vincent_Michael committed 2013-01-07 16:39:01 +01:00
commit ecedb798aa
26 files changed
+1007 -539

No files matched your search

@@ -280,15 +280,6 @@ PlayerSave.Stats.SaveOnlyOnLogout = 1
vmap.enableLOS = 1
vmap.enableHeight = 1
#
# vmap.ignoreSpellIds
# Description: These spells are ignored for LoS calculation.
# List of ids with delimiter ','.
# Example: "7720,1337"
# Default: "7720"
vmap.ignoreSpellIds = "7720"
#
# vmap.petLOS
# Description: Check line of sight for pets, to avoid them attacking through walls.