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

Conflicts:
	src/server/game/AuctionHouse/AuctionHouseMgr.h
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/NPCHandler.cpp
This commit is contained in:
Vincent-Michael committed 2013-06-11 22:07:11 +02:00
commit 0bebf40fe7
2824 files changed
+1553 -406

No files matched your search

@@ -18,6 +18,7 @@
# GAME MASTER SETTINGS
# VISIBILITY AND DISTANCES
# SERVER RATES
# STATS LIMITS
# AUTO BROADCAST
# BATTLEGROUND CONFIG
# BATTLEFIELD CONFIG
@@ -1971,6 +1972,28 @@ Die.Command.Mode = 1
#
###################################################################################################
###################################################################################################
# STATS LIMITS
#
# Stats.Limits.Enable
# Description: Enable or disable stats system
# Default: 0 - Disabled
Stats.Limits.Enable = 0
#
# Stats.Limit.[STAT]
# Description: Set percentage limit for dodge, parry, block and crit rating
# Default: 95.0 (95%)
Stats.Limits.Dodge = 95.0
Stats.Limits.Parry = 95.0
Stats.Limits.Block = 95.0
Stats.Limits.Crit = 95.0
#
###################################################################################################
###################################################################################################
# AUTO BROADCAST
#