diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-13 23:21:50 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-13 23:21:50 +0200 |
| commit | 85e49d0d143b83432d85b5f645fb667cd166a9fc (patch) | |
| tree | f0a1eec3942b2d64fb6be70a37e1bc8b3333f796 /src/server/worldserver | |
| parent | 974bf5c427a5b134f09abf48d814f8c8f7e31e3c (diff) | |
| parent | f0cd684cd1f944622baac2164aa05e015e6d8060 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/worldserver/worldserver.conf.dist
Diffstat (limited to 'src/server/worldserver')
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 194186c2d9a..dfd382c310e 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -871,6 +871,13 @@ Instance.ResetTimeHour = 4 Instance.UnloadDelay = 1800000 # +# InstancesResetAnnounce +# Description: Announce the reset of one instance to whole party. +# Default: false - (Disabled, don't show, blizzlike) +# true - (Enabled, show) + +InstancesResetAnnounce = false +# # Quests.LowLevelHideDiff # Description: Level difference between player and quest level at which quests are # considered low-level and are not shown via exclamation mark (!) at quest @@ -1187,7 +1194,6 @@ Warden.BanDuration = 86400 ################################################################################################### # PLAYER INTERACTION # -# # AllowTwoSide.Interaction.Calendar # Description: Allow calendar invites between factions. # Default: 0 - (Disabled) @@ -2607,7 +2613,6 @@ UI.ShowQuestLevelsInDialogs = 0 ################################################################################################### ################################################################################################### -# # LOGGING SYSTEM SETTINGS # # Appender config values: Given a appender "name" @@ -2796,7 +2801,6 @@ Log.Async.Enable = 0 ################################################################################################### ################################################################################################### -# # GUILD LEVELING SETTINGS # # Guild.LevelingEnabled @@ -2858,7 +2862,6 @@ Guild.WeeklyReputationCap = 4375 ################################################################################################### ################################################################################################### -# # CURRENCIES SETTINGS # # Currency.ResetInterval @@ -2942,7 +2945,6 @@ Currency.ConquestPointsArenaReward = 180 # ################################################################################################### -# # PACKET SPOOF PROTECTION SETTINGS # # These settings determine which action to take when harmful packet spoofing is detected. |