Merge branch 'master' into merge-master

src/server/apps/CMakeLists.txt

@@ -178,6 +178,25 @@ foreach(APPLICATION_NAME ${APPLICATIONS_BUILD_LIST})
   # Install config
   CopyApplicationConfig(${APP_PROJECT_NAME} ${APPLICATION_NAME})
 
+# Copy config merger tool (only once, after all app targets, if enabled)
+
+if(TOOL_CONFIG_MERGER)
+  if(WIN32)
+    if("${CMAKE_MAKE_PROGRAM}" MATCHES "MSBuild")
+      foreach(cfg IN ITEMS Debug Release RelWithDebInfo MinSizeRel)
+        file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/bin/${cfg}/configs")
+        file(COPY "${CMAKE_SOURCE_DIR}/apps/config-merger/python/" DESTINATION "${CMAKE_BINARY_DIR}/bin/${cfg}/configs")
+      endforeach()
+    elseif(MINGW)
+      file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/bin/configs")
+      file(COPY "${CMAKE_SOURCE_DIR}/apps/config-merger/python/" DESTINATION "${CMAKE_BINARY_DIR}/bin/configs")
+    endif()
+  elseif(UNIX)
+    file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/bin/configs")
+    file(COPY "${CMAKE_SOURCE_DIR}/apps/config-merger/python/" DESTINATION "${CMAKE_BINARY_DIR}/bin/configs")
+  endif()
+endif()
+
   if (UNIX)
     install(TARGETS ${APP_PROJECT_NAME} DESTINATION bin)
   elseif (WIN32)

src/server/apps/authserver/authserver.conf.dist

@@ -12,6 +12,7 @@
 #    CRYPTOGRAPHY
 #    UPDATE SETTINGS
 #    LOGGING SYSTEM SETTINGS
+#    NETWORK
 #
 ###################################################################################################
 
@@ -440,3 +441,20 @@ Logger.root=4,Console Auth
 
 #
 ###################################################################################################
+
+###################################################################################################
+# NETWORK
+#
+#    Network.UseSocketActivation
+#        Description: [LINUX ONLY FEATURE] Enable systemd socket activation support for the authserver.
+#                     When enabled and the process is started by systemd socket activation,
+#                     the server will use the socket passed by systemd instead of
+#                     creating and binding its own listening socket. Disabled by default.
+#
+#        Example:     1 - (Enabled)
+#        Default:     0 - (Disabled)
+
+Network.UseSocketActivation = 0
+
+#
+###################################################################################################

src/server/apps/worldserver/worldserver.conf.dist

@@ -53,6 +53,7 @@
 #    CHARTER
 #    GUILD
 #    FFAPVP
+#    OUTDOORPVP
 #    WINTERGRASP
 #    BATTLEGROUND
 #    ARENA
@@ -399,7 +400,7 @@ Network.EnableProxyProtocol = 0
 
 #
 #    Network.UseSocketActivation
-#        Description: Enable systemd socket activation support for the worldserver.
+#        Description: [LINUX ONLY FEATURE] Enable systemd socket activation support for the worldserver.
 #                     When enabled and the process is started by systemd socket activation,
 #                     the server will use the socket passed by systemd instead of
 #                     creating and binding its own listening socket. Disabled by default.
@@ -681,6 +682,7 @@ Appender.Playerbots=2,5,0,Playerbots.log,w
 # Appender.GM=2,5,15,gm_%s.log
 Appender.Errors=2,2,0,Errors.log,w
 # Appender.DB=3,5,0
+# Appender.Dev=2,5,0,Dev.log,a
 
 #  Logger config values: Given a logger "name"
 #    Logger.name
@@ -806,7 +808,7 @@ Logger.playerbots=5,Console Playerbots
 #Logger.spells.effect=4,Console Server
 #Logger.spells.scripts=4,Console Server
 #Logger.spells=4,Console Server
-#Logger.sql.dev=4,Console Server
+#Logger.sql.dev=4,Console Server Dev
 #Logger.sql.driver=4,Console Server
 #Logger.vehicles=4,Console Server
 #Logger.warden=4,Console Server
@@ -2796,8 +2798,7 @@ QuestPOI.Enabled = 1
 #        Description: Level difference between player and quest level at which quests are
 #                     considered low-level and are not shown via exclamation mark (!) at quest
 #                     givers.
-#        Default:     4  - (Enabled, Hide quests that have 4 levels less than the character)
-#                     -1 - (Disabled, Show all available quest marks)
+#        Default:     4  - (Enabled, Hide quests that are more than 4 levels lower than the character)
 
 Quests.LowLevelHideDiff = 4
 
@@ -2806,8 +2807,7 @@ Quests.LowLevelHideDiff = 4
 #        Description: Level difference between player and quest level at which quests are
 #                     considered high-level and are not shown via exclamation mark (!) at quest
 #                     givers.
-#        Default:     7  - (Enabled, Hide quests that have 7 levels more than the character)
-#                     -1 - (Disabled, Show all available quest marks)
+#        Default:     7  - (Enabled, Hide quests that are more than 7 levels higher than the character)
 
 Quests.HighLevelHideDiff = 7
 
@@ -3516,6 +3516,18 @@ FFAPvPTimer = 30
 #
 ###################################################################################################
 
+###################################################################################################
+# OUTDOORPVP
+#
+#     OutdoorPvPCaptureRate
+#        Description: Specify rate multiplier for outdoor PvP capture points. (e.g. Eastern Plaguelands, Hellfire Peninsula)
+#        Default:     1.0
+
+OutdoorPvPCaptureRate = 1.0
+
+#
+###################################################################################################
+
 ###################################################################################################
 # WINTERGRASP
 #