Merge branch 'core4' into feature/quick-start-py

(cherry picked from commit fc2a38f0cd7ec186f479b71ba63c23cb5bc156d1)

.gitattributes

@@ -0,0 +1,18 @@
+*.cpp ident
+*.h ident
+
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.c text
+*.h text
+*.cs text
+*.jade text
+*.json text
+*.js text
+*.css text
+*.htm text
+*.txt text
+*.sh text eol=lf

.gitignore

@@ -265,6 +265,7 @@ web/public_php/db_version_tool
 web/public_php/db_version_web
 web/public_php/role_service
 web/public_php/role_support
+web/public_php/role_admin
 web/public_php/role_domain
 web/public_php/db_version_ring
 web/public_php/config_user.php

CMakeLists.txt

@@ -34,6 +34,33 @@ IF(COMMAND cmake_policy)
   ENDIF()
 ENDIF()
 
+
+#-----------------------------------------------------------------------------
+# Downloads and install Hunger into HUNTER_ROOT directory.
+OPTION(HUNTER_ENABLED "Enable Hunter package manager" OFF)
+IF(HUNTER_ENABLED)
+  INCLUDE("CMakeModules/HunterGate.cmake")
+  HunterGate(
+    URL "https://github.com/cpp-pm/hunter/archive/v0.23.321.tar.gz"
+    SHA1 "5e53cbb0429037ea8e2592bfd92704b8ff3ab492"
+    FILEPATH "${CMAKE_CURRENT_LIST_DIR}/CMakeModules/HunterConfig.cmake"
+  )
+
+  # default options for hunterized build
+  SET(WITH_STATIC         ON CACHE BOOL "static" FORCE)
+  SET(WITH_STATIC_DRIVERS ON CACHE BOOL "static drivers" FORCE)
+  SET(WITH_STATIC_CURL    ON CACHE BOOL "static curl" FORCE)
+  SET(WITH_STATIC_LIBXML2 ON CACHE BOOL "static libxml2" FORCE)
+  SET(WITH_STATIC_EXTERNAL ON CACHE BOOL "static external" FORCE)
+  SET(WITH_EXTERNAL       OFF CACHE BOOL "external libs" FORCE)
+ 
+ # Workaround for PCH compilation issue, from curl intsizeof depencency
+  ADD_DEFINITIONS(-D__STDC_LIMIT_MACROS)
+ENDIF()
+
+
+#-----------------------------------------------------------------------------
+
 INCLUDE(nel)
 INCLUDE(ConfigureChecks)
 INCLUDE(CheckDepends)
@@ -53,16 +80,12 @@ ENDIF()
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(RyzomCore CXX C)
-SET(NL_VERSION_MAJOR 1)
-SET(NL_VERSION_MINOR 1)
+SET(NL_VERSION_MAJOR 4)
+SET(NL_VERSION_MINOR 0)
 SET(NL_VERSION_PATCH 0 CACHE STRING "Patch version")
 SET(YEAR "2001-${CURRENT_YEAR}")
 SET(AUTHOR "Winch Gate and The Ryzom Core Community")
 
-SET(RYZOM_VERSION_MAJOR 3)
-SET(RYZOM_VERSION_MINOR 6)
-SET(RYZOM_VERSION_PATCH 0)
-
 #-----------------------------------------------------------------------------
 # Redirect output files
 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
@@ -98,27 +121,27 @@ RYZOM_SETUP_PREFIX_PATHS()
 
 #-----------------------------------------------------------------------------
 # Default values for URL's
-SET(RYZOM_CLIENT_CREATE_ACCOUNT_URL  "https://open.ryzom.dev/ams/" CACHE STRING "Ryzom Client Create Account URL")
-SET(RYZOM_CLIENT_EDIT_ACCOUNT_URL    "https://open.ryzom.dev/ams/" CACHE STRING "Ryzom Client Edit Account URL")
-SET(RYZOM_CLIENT_FORGET_PASSWORD_URL "https://open.ryzom.dev/ams/" CACHE STRING "Ryzom Client Forget Password URL")
-SET(RYZOM_CLIENT_PATCH_URL           "https://cdn.ryzom.dev/open/patch/" CACHE STRING "Ryzom Client Patch URL")
-SET(RYZOM_CLIENT_APP_NAME            "default")
+SET(RYZOM_CLIENT_CREATE_ACCOUNT_URL     "https://core.ryzom.dev/ams/" CACHE STRING "Ryzom Client Create Account URL")
+SET(RYZOM_CLIENT_EDIT_ACCOUNT_URL       "https://core.ryzom.dev/ams/" CACHE STRING "Ryzom Client Edit Account URL")
+SET(RYZOM_CLIENT_FORGET_PASSWORD_URL    "https://core.ryzom.dev/ams/" CACHE STRING "Ryzom Client Forget Password URL")
+SET(RYZOM_CLIENT_PATCH_URL              "https://cdn.ryzom.dev/core4/patch/" CACHE STRING "Ryzom Client Patch URL")
+SET(RYZOM_CLIENT_APP_NAME               "core4")
 
-SET(RYZOM_WEBIG_MAIN_URL             "https://open.ryzom.dev/" CACHE STRING "Ryzom Client WebIG Main URL")
-SET(RYZOM_WEBIG_TRUSTED_DOMAIN       "open.ryzom.dev" CACHE STRING "Ryzom Client WebIG Trusted Domain")
+SET(RYZOM_CLIENT_RELEASENOTES_URL       "https://core4.ryzom.dev/releasenotes/index.php" CACHE STRING "Ryzom Client Release Notes URL")
+SET(RYZOM_CLIENT_RELEASENOTES_RING_URL  "https://core4.ryzom.dev/releasenotes_ring/index.php" CACHE STRING "Ryzom Client Release Notes URL")
 
 #-----------------------------------------------------------------------------
 # urls when compiling ryzom live client
 IF(WITH_RYZOM_LIVE)
   MESSAGE("Using RYZOM_LIVE urls")
-  SET(RYZOM_CLIENT_CREATE_ACCOUNT_URL  "https://account.ryzom.com/signup/from_client.php")
-  SET(RYZOM_CLIENT_EDIT_ACCOUNT_URL    "https://account.ryzom.com/payment_profile/index.php")
-  SET(RYZOM_CLIENT_FORGET_PASSWORD_URL "https://account.ryzom.com/payment_profile/lost_secure_password.php")
-  SET(RYZOM_CLIENT_PATCH_URL           "http://dl.ryzom.com/patch_live")
-  SET(RYZOM_CLIENT_APP_NAME            "ryzom_live")
-
-  SET(RYZOM_WEBIG_MAIN_URL             "https://app.ryzom.com/")
-  SET(RYZOM_WEBIG_TRUSTED_DOMAIN       "app.ryzom.com")
+  SET(RYZOM_CLIENT_CREATE_ACCOUNT_URL   "https://account.ryzom.com/signup/from_client.php")
+  SET(RYZOM_CLIENT_EDIT_ACCOUNT_URL     "https://account.ryzom.com/payment_profile/index.php")
+  SET(RYZOM_CLIENT_FORGET_PASSWORD_URL  "https://account.ryzom.com/payment_profile/lost_secure_password.php")
+  SET(RYZOM_CLIENT_PATCH_URL            "http://dl.ryzom.com/patch_live")
+  SET(RYZOM_CLIENT_APP_NAME             "ryzom_live")
+
+SET(RYZOM_CLIENT_RELEASENOTES_URL       "https://app.ryzom.com/releasenotes/index.php")
+SET(RYZOM_CLIENT_RELEASENOTES_RING_URL  "https://app.ryzom.com/releasenotes_ring/index.php")
 ENDIF()
 
 #-----------------------------------------------------------------------------
@@ -134,6 +157,36 @@ IF(WIN32)
   ENDIF()
 ENDIF()
 
+IF(HUNTER_ENABLED)
+  # This fix is for compiling OpenSSL in Azure Pipeline linux agent where ENV{SYSTEM} == "build"
+  IF(DEFINED ENV{SYSTEM} AND UNIX AND NOT APPLE)
+    STRING(TOUPPER "$ENV{SYSTEM}" _tmp)
+    IF (_tmp STREQUAL "BUILD")
+      UNSET(ENV{SYSTEM})
+    ENDIF()
+    UNSET(_tmp)
+  ENDIF()
+  ## TODO: hack for freetype hunter package
+  SET(ON 1)
+  ##
+  HUNTER_ADD_PACKAGE(ZLIB)
+
+  FIND_PACKAGE(ZLIB CONFIG REQUIRED)
+  SET(ZLIB_LIBRARY ZLIB::zlib)
+
+  HUNTER_ADD_PACKAGE(libxml2)
+  FIND_PACKAGE(libxml2 CONFIG REQUIRED)
+  SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} libxml2::libxml2)
+
+  HUNTER_ADD_PACKAGE(OpenSSL)
+  FIND_PACKAGE(OpenSSL REQUIRED)
+  # TODO: is OpenSSL::Crypto only needed for WIN32?
+  SET(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
+
+  # for precompiled headers, not needed if using TARGET_PRECOMPILE_HEADERS() from cmake 3.16+
+  SET(ZLIB_INCLUDE_DIR ZLIB_ROOT/include)
+  SET(LIBXML2_INCLUDE_DIR ${LIBXML2_ROOT}/include/libxml2)
+ELSE()
 FIND_PACKAGE(ZLIB REQUIRED)
 FIND_PACKAGE(LibXml2 REQUIRED)
 FIND_PACKAGE(PNG REQUIRED)
@@ -144,6 +197,7 @@ FIND_PACKAGE(Jpeg)
 IF(WIN32)
   SET(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} Crypt32.lib)
 ENDIF()
+ENDIF() #hunter
 
 IF(WITH_LIBOVR)
   FIND_PACKAGE(LibOVR)
@@ -156,7 +210,7 @@ ENDIF()
 NL_CONFIGURE_CHECKS()
 
 IF(WITH_STATIC_LIBXML2)
-  SET(LIBXML2_DEFINITIONS ${LIBXML2_DEFINITIONS} -DLIBXML_STATIC)
+  ADD_DEFINITIONS(-DLIBXML_STATIC)
 ENDIF()
 
 IF(WITH_LIBXML2_ICONV)
@@ -171,7 +225,7 @@ IF(WITH_STATIC)
     SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${WINSOCK2_LIB})
   ENDIF()
 
-  IF(UNIX)
+  IF(UNIX AND NOT HUNTER_ENABLED)
     # under Linux and OS X, recent libxml2 versions are linked against liblzma
     FIND_PACKAGE(LibLZMA)
     IF(LIBLZMA_LIBRARIES)
@@ -237,6 +291,7 @@ ENDIF()
 
 INCLUDE(FindHelpers)
 
+#TODO: hunter qt package
 IF(WITH_QT5)
   FIND_QT5()
 ENDIF()
@@ -248,6 +303,7 @@ IF(WITH_QT)
   FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtXml QtOpenGL REQUIRED)
 ENDIF()
 
+#TODO: hunter assimp package
 IF(WITH_ASSIMP)
   FIND_PACKAGE(assimp REQUIRED)
 ENDIF()
@@ -257,9 +313,20 @@ IF(WITH_NEL)
     FIND_PACKAGE(CppTest)
   ENDIF()
 
-  IF(WITH_GUI)
-    FIND_PACKAGE(Luabind REQUIRED)
-  ENDIF()
+  IF(HUNTER_ENABLED)
+    IF(WITH_GUI)
+      HUNTER_ADD_PACKAGE(luabind)
+      FIND_PACKAGE(Luabind REQUIRED)
+    ENDIF()
+
+    HUNTER_ADD_PACKAGE(CURL)
+    FIND_PACKAGE(CURL CONFIG REQUIRED)
+    # TODO: for nelgui
+    SET(CURL_LIBRARIES CURL::libcurl libxml2::libxml2)
+  ELSE()
+    IF(WITH_GUI)
+      FIND_PACKAGE(Luabind REQUIRED)
+    ENDIF()
 
     FIND_PACKAGE(CURL REQUIRED)
 
@@ -310,6 +377,7 @@ IF(WITH_NEL)
         ENDIF()
       ENDIF()
     ENDIF()
+  ENDIF() #hunter
 
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include)
   ADD_SUBDIRECTORY(nel)

CMakeModules/FindHelpers.cmake

@@ -176,6 +176,17 @@ MACRO(FIND_PACKAGE_HELPER NAME INCLUDE)
 
   SET(_INCLUDE_PATHS)
   SET(_LIBRARY_PATHS)
+  # Check for root directories passed to CMake with -DXXX_ROOT=...
+  IF(DEFINED ENV{${_UPNAME_FIXED}_ROOT})
+    SET(_TMP ${${_UPNAME_FIXED}_ROOT})
+    GET_FILENAME_COMPONENT(_TMP ${_TMP} ABSOLUTE)
+    LIST(APPEND _INCLUDE_PATHS ${_TMP}/include ${_TMP})
+    LIST(APPEND _LIBRARY_PATHS ${_TMP}/lib${LIB_SUFFIX})
+
+    IF(_IS_VERBOSE)
+      MESSAGE(STATUS "Using ${_UPNAME_FIXED}_ROOT as root directory ${_TMP}")
+    ENDIF()
+  ENDIF()
 
   # Check for root directories passed to CMake with -DXXX_DIR=...
   IF(DEFINED ${_UPNAME_FIXED}_DIR)
@@ -212,7 +223,7 @@ MACRO(FIND_PACKAGE_HELPER NAME INCLUDE)
     ENDFOREACH()
   ENDIF()
 
-  IF(UNIX)
+  IF(UNIX AND NOT DEFINED ENV{${_UPNAME_FIXED}_ROOT})
     # Append UNIX standard include paths
     SET(_UNIX_INCLUDE_PATHS)
 
@@ -262,11 +273,16 @@ MACRO(FIND_PACKAGE_HELPER NAME INCLUDE)
   ENDIF()
 
   # Append environment variables XXX_DIR
-  LIST(APPEND _LIBRARY_PATHS
-    $ENV{${_UPNAME}_DIR}/lib${LIB_SUFFIX}
-    $ENV{${_UPNAME_FIXED}_DIR}/lib${LIB_SUFFIX})
+  IF(DEFINED ENV{${_UPNAME}_DIR})
+    LIST(APPEND _LIBRARY_PATHS
+      $ENV{${_UPNAME}_DIR}/lib${LIB_SUFFIX})
+  ENDIF()
+  IF(DEFINED ENV{${_UPNAME_FIXED}_DIR})
+    LIST(APPEND _LIBRARY_PATHS
+      $ENV{${_UPNAME_FIXED}_DIR}/lib${LIB_SUFFIX})
+  ENDIF()
 
-  IF(UNIX)
+  IF(UNIX AND NOT DEFINED ENV{${_UPNAME_FIXED}_ROOT})
     SET(_UNIX_LIBRARY_PATHS)
 
     # Append multiarch libraries paths
@@ -311,15 +327,30 @@ MACRO(FIND_PACKAGE_HELPER NAME INCLUDE)
   LIST(REMOVE_DUPLICATES _DEBUG_LIBRARIES)
 
   # Search for release library
-  FIND_LIBRARY(${_UPNAME_FIXED}_LIBRARY_RELEASE
-    NAMES
-    ${_RELEASE_LIBRARIES}
-    HINTS ${PKG_${_NAME_FIXED}_LIBRARY_DIRS}
-    PATHS
-    ${_LIBRARY_PATHS}
-    ${_UNIX_LIBRARY_PATHS}
-    NO_CMAKE_SYSTEM_PATH
-  )
+  IF(DEFINED ENV{${_UPNAME_FIXED}_ROOT} AND NOT WIN32)
+    FIND_LIBRARY(${_UPNAME_FIXED}_LIBRARY_RELEASE
+      NAMES
+      ${_RELEASE_LIBRARIES}
+      HINTS ${PKG_${_NAME_FIXED}_LIBRARY_DIRS}
+      PATHS
+      ${_LIBRARY_PATHS}
+      ${_UNIX_LIBRARY_PATHS}
+      NO_CMAKE_PATH 
+      NO_CMAKE_SYSTEM_PATH
+      NO_CMAKE_ENVIRONMENT_PATH
+      NO_SYSTEM_ENVIRONMENT_PATH
+    )
+  ELSE()
+    FIND_LIBRARY(${_UPNAME_FIXED}_LIBRARY_RELEASE
+      NAMES
+      ${_RELEASE_LIBRARIES}
+      HINTS ${PKG_${_NAME_FIXED}_LIBRARY_DIRS}
+      PATHS
+      ${_LIBRARY_PATHS}
+      ${_UNIX_LIBRARY_PATHS}
+      NO_CMAKE_SYSTEM_PATH
+    )
+  ENDIF()
 
   IF(_IS_VERBOSE)
     IF(${_UPNAME_FIXED}_LIBRARY_RELEASE)
@@ -330,15 +361,30 @@ MACRO(FIND_PACKAGE_HELPER NAME INCLUDE)
   ENDIF()
 
   # Search for debug library
-  FIND_LIBRARY(${_UPNAME_FIXED}_LIBRARY_DEBUG
-    NAMES
-    ${_DEBUG_LIBRARIES}
-    HINTS ${PKG_${_NAME_FIXED}_LIBRARY_DIRS}
-    PATHS
-    ${_LIBRARY_PATHS}
-    ${_UNIX_LIBRARY_PATHS}
-    NO_CMAKE_SYSTEM_PATH
-  )
+  IF(DEFINED ENV{${_UPNAME_FIXED}_ROOT} AND NOT WIN32)
+    FIND_LIBRARY(${_UPNAME_FIXED}_LIBRARY_DEBUG
+      NAMES
+      ${_DEBUG_LIBRARIES}
+      HINTS ${PKG_${_NAME_FIXED}_LIBRARY_DIRS}
+      PATHS
+      ${_LIBRARY_PATHS}
+      ${_UNIX_LIBRARY_PATHS}
+      NO_CMAKE_PATH 
+      NO_CMAKE_SYSTEM_PATH
+      NO_CMAKE_ENVIRONMENT_PATH
+      NO_SYSTEM_ENVIRONMENT_PATH
+    )
+  ELSE()
+    FIND_LIBRARY(${_UPNAME_FIXED}_LIBRARY_DEBUG
+      NAMES
+      ${_DEBUG_LIBRARIES}
+      HINTS ${PKG_${_NAME_FIXED}_LIBRARY_DIRS}
+      PATHS
+      ${_LIBRARY_PATHS}
+      ${_UNIX_LIBRARY_PATHS}
+      NO_CMAKE_SYSTEM_PATH
+    )
+  ENDIF()
 
   IF(_IS_VERBOSE)
     IF(${_UPNAME_FIXED}_LIBRARY_DEBUG)
@@ -685,7 +731,7 @@ MACRO(FIND_LIBXML2)
         IF(CRYPT32_LIB)
           LIST(APPEND LIBXML2_LIBRARIES ${CRYPT32_LIB})
         ENDIF()
-      ELSE()
+      ELSEIF(NOT HUNTER_ENABLED)
         # under Linux and OS X, recent libxml2 versions are linked against liblzma
         FIND_PACKAGE(LibLZMA)
 

CMakeModules/FindIconv.cmake

@@ -16,7 +16,14 @@ ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
 
 FIND_PATH(ICONV_INCLUDE_DIR iconv.h HINTS /sw/include/ PATHS /opt/local) 
  
-FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c PATHS /opt/local)
+FIND_LIBRARY(ICONV_LIBRARIES_RELEASE NAMES iconv libiconv c PATHS /opt/local)
+FIND_LIBRARY(ICONV_LIBRARIES_DEBUG NAMES iconvd libiconvd c PATHS /opt/local)
+
+IF (ICONV_LIBRARIES_RELEASE AND ICONV_LIBRARIES_DEBUG)
+  SET(ICONV_LIBRARIES optimized ${ICONV_LIBRARIES_RELEASE} debug ${ICONV_LIBRARIES_DEBUG})
+ELSE()
+  SET(ICONV_LIBRARIES ${ICONV_LIBRARIES_RELEASE})
+ENDIF()
  
 IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
    SET(ICONV_FOUND TRUE) 
@@ -60,5 +67,6 @@ ENDIF()
 MARK_AS_ADVANCED(
   ICONV_INCLUDE_DIR
   ICONV_LIBRARIES
+  ICONV_LIBRARIES_DEBUG
   ICONV_SECOND_ARGUMENT_IS_CONST
 )

CMakeModules/FindLua53.cmake

@@ -38,11 +38,25 @@ find_path(LUA_INCLUDE_DIR lua.h
   /opt
 )
 
-find_library(LUA_LIBRARY
+FIND_LIBRARY(LUA_LIBRARY
   NAMES lua53 lua5.3 lua-5.3 lua
   HINTS
-    ENV LUA_DIR
-  PATH_SUFFIXES lib
+    $ENV{LUA_DIR}
+  PATH_SUFFIXES lib64 lib
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+)
+
+FIND_LIBRARY(LUA_LIBRARY_DEBUG
+  NAMES lua53-d lua5.3-d lua-5.3-d lua-d lua53d lua5.3d lua-5.3d luad
+  HINTS
+    $ENV{LUA_DIR}
+  PATH_SUFFIXES lib64 lib
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
@@ -59,7 +73,11 @@ if(LUA_LIBRARY)
     set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
   # For Windows and Mac, don't need to explicitly include the math library
   else()
-    set( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
+    if (LUA_LIBRARY_DEBUG)
+      set( LUA_LIBRARIES optimized ${LUA_LIBRARY} debug ${LUA_LIBRARY_DEBUG} CACHE STRING "Lua Libraries")
+    else()
+      set( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
+    endif()
   endif()
 endif()
 
@@ -77,5 +95,5 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua53
                                   REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
                                   VERSION_VAR LUA_VERSION_STRING)
 
-mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY)
+mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_LIBRARY_DEBUG LUA_MATH_LIBRARY)
 

CMakeModules/FindLua54.cmake

@@ -0,0 +1,99 @@
+# Locate Lua library
+# This module defines
+#  LUA54_FOUND, if false, do not try to link to Lua
+#  LUA_LIBRARIES
+#  LUA_INCLUDE_DIR, where to find lua.h
+#  LUA_VERSION_STRING, the version of Lua found (since CMake 2.8.8)
+#
+# Note that the expected include convention is
+#  #include "lua.h"
+# and not
+#  #include <lua/lua.h>
+# This is because, the lua location is not standardized and may exist
+# in locations other than lua/
+
+#=============================================================================
+# Copyright 2007-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+find_path(LUA_INCLUDE_DIR lua.h
+  HINTS
+    ENV LUA_DIR
+  PATH_SUFFIXES include/lua54 include/lua5.4 include/lua-5.4 include/lua include
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
+)
+
+FIND_LIBRARY(LUA_LIBRARY
+  NAMES lua54 lua5.4 lua-5.4 lua
+  HINTS
+    $ENV{LUA_DIR}
+  PATH_SUFFIXES lib64 lib
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+)
+
+FIND_LIBRARY(LUA_LIBRARY_DEBUG
+  NAMES lua54-d lua5.4-d lua-5.4-d lua-d lua54d lua5.4d lua-5.4d luad
+  HINTS
+    $ENV{LUA_DIR}
+  PATH_SUFFIXES lib64 lib
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+)
+
+if(LUA_LIBRARY)
+  # include the math library for Unix
+  if(UNIX AND NOT APPLE AND NOT BEOS)
+    find_library(LUA_MATH_LIBRARY m)
+    set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
+  # For Windows and Mac, don't need to explicitly include the math library
+  else()
+    if (LUA_LIBRARY_DEBUG)
+      set( LUA_LIBRARIES optimized ${LUA_LIBRARY} debug ${LUA_LIBRARY_DEBUG} CACHE STRING "Lua Libraries")
+    else()
+      set( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
+    endif()
+  endif()
+endif()
+
+if(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
+  file(STRINGS "${LUA_INCLUDE_DIR}/lua.h" lua_version_str REGEX "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua .+\"")
+
+  string(REGEX REPLACE "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([^\"]+)\".*" "\\1" LUA_VERSION_STRING "${lua_version_str}")
+  unset(lua_version_str)
+endif()
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
+# all listed variables are TRUE
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua54
+                                  REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
+                                  VERSION_VAR LUA_VERSION_STRING)
+
+mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_LIBRARY_DEBUG LUA_MATH_LIBRARY)
+

CMakeModules/FindLuabind.cmake

@@ -10,18 +10,32 @@ MACRO(FIND_CORRECT_LUA_VERSION)
   IF(LUABIND_LIBRARY_RELEASE MATCHES "\\.so")
     INCLUDE(CheckDepends)
 
-    # check for Lua 5.3
-    SET(LUA53_LIBRARIES liblua5.3 liblua-5.3 liblua.so.5.3)
+    # check for Lua 5.4
+    SET(LUA54_LIBRARIES liblua5.4 liblua-5.4 liblua.so.5.4)
 
-    FOREACH(_LIB ${LUA53_LIBRARIES})
+    FOREACH(_LIB ${LUA54_LIBRARIES})
       CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE _LIB LUALIB_FOUND)
       IF(LUALIB_FOUND)
-        MESSAGE(STATUS "Luabind is using Lua 5.3")
-        FIND_PACKAGE(Lua53 REQUIRED)
+        MESSAGE(STATUS "Luabind is using Lua 5.4")
+        FIND_PACKAGE(Lua54 REQUIRED)
         BREAK()
       ENDIF()
     ENDFOREACH()
 
+    IF(NOT LUALIB_FOUND)
+      # check for Lua 5.3
+      SET(LUA53_LIBRARIES liblua5.3 liblua-5.3 liblua.so.5.3)
+
+      FOREACH(_LIB ${LUA53_LIBRARIES})
+        CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE _LIB LUALIB_FOUND)
+        IF(LUALIB_FOUND)
+          MESSAGE(STATUS "Luabind is using Lua 5.3")
+          FIND_PACKAGE(Lua53 REQUIRED)
+          BREAK()
+        ENDIF()
+      ENDFOREACH()
+    ENDIF()
+
     IF(NOT LUALIB_FOUND)
       # check for Lua 5.2
       SET(LUA52_LIBRARIES liblua5.2 liblua-5.2 liblua.so.5.2)
@@ -69,7 +83,13 @@ MACRO(FIND_CORRECT_LUA_VERSION)
     ENDIF()
   ELSE()
     # TODO: find a way to detect Lua version
-    IF(WITH_LUA53)
+    IF(HUNTER_ENABLED)
+      HUNTER_ADD_PACKAGE(Lua)
+      FIND_PACKAGE(Lua CONFIG REQUIRED)
+      SET(LUA_LIBRARIES Lua::lua_lib)
+    ELSEIF(WITH_LUA54)
+      FIND_PACKAGE(Lua54 REQUIRED)
+    ELSEIF(WITH_LUA53)
       FIND_PACKAGE(Lua53 REQUIRED)
     ELSEIF(WITH_LUA52)
       FIND_PACKAGE(Lua52 REQUIRED)
@@ -89,6 +109,21 @@ ENDIF()
 SET(LIBRARY_NAME_RELEASE)
 SET(LIBRARY_NAME_DEBUG)
 
+IF(WITH_LUA54)
+  IF(WITH_STLPORT)
+    LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport_lua54)
+    LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlport_lua54d)
+  ENDIF()
+
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind_lua54)
+  LIST(APPEND LIBRARY_NAME_DEBUG luabind_lua54d)
+ENDIF()
+
+IF(HUNTER_ENABLED)
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind luabind09)
+  LIST(APPEND LIBRARY_NAME_DEBUG luabindd luabind09-d)
+ENDIF()
+
 IF(WITH_LUA53)
   IF(WITH_STLPORT)
     LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport_lua53)

CMakeModules/FindMSVC.cmake

@@ -45,24 +45,35 @@ ELSE()
 
   IF(MSVC_VERSION LESS 1920)
     SET(_NAME "2017")
-  ELSE()
+  ELSEIF(MSVC_VERSION LESS 1930)
     SET(_NAME "2019")
+  ELSE()
+    SET(_NAME "2022")
   ENDIF()
 
   STRING(REGEX REPLACE "/MSVC/.+" "/MSVC" VC_DIR ${_COMPILER})
 
-  FILE(GLOB MSVC_TOOLCHAIN_VERSIONS RELATIVE ${VC_DIR} "${VC_DIR}/*")
+  IF(DEFINED ENV{VCToolsVersion})
+  
+    SET(MSVC_TOOLCHAIN_VERSION $ENV{VCToolsVersion})
+  
+  ELSE()
 
-  IF(MSVC_TOOLCHAIN_VERSIONS)
-    LIST(SORT MSVC_TOOLCHAIN_VERSIONS)
-    LIST(REVERSE MSVC_TOOLCHAIN_VERSIONS)
-  ENDIF()
+    FILE(GLOB MSVC_TOOLCHAIN_VERSIONS RELATIVE ${VC_DIR} "${VC_DIR}/*")
 
-  IF(MSVC_TOOLCHAIN_VERSIONS)
-    LIST(GET MSVC_TOOLCHAIN_VERSIONS 0 MSVC_TOOLCHAIN_VERSION)
+    IF(MSVC_TOOLCHAIN_VERSIONS)
+      LIST(SORT MSVC_TOOLCHAIN_VERSIONS)
+      LIST(REVERSE MSVC_TOOLCHAIN_VERSIONS)
+    ENDIF()
 
-    SET(VC_DIR "${VC_DIR}/${MSVC_TOOLCHAIN_VERSION}")
+    IF(MSVC_TOOLCHAIN_VERSIONS)
+      LIST(GET MSVC_TOOLCHAIN_VERSIONS 0 MSVC_TOOLCHAIN_VERSION)
+    ENDIF()
+
+  ENDIF()
 
+  IF (MSVC_TOOLCHAIN_VERSION)
+    SET(VC_DIR "${VC_DIR}/${MSVC_TOOLCHAIN_VERSION}")
     MESSAGE(STATUS "Found Visual C++ ${_NAME} (${_VERSION} with toolchain ${MSVC_TOOLCHAIN_VERSION}) in ${VC_DIR}")
   ELSE()
     MESSAGE(FATAL_ERROR "Unable to find Visual C++ in ${VC_DIR}")

CMakeModules/FindWindowsSDK.cmake

@@ -501,6 +501,17 @@ IF(WINSDK_INCLUDE_DIR)
   IF(WINSDK_VERSION STREQUAL "7.1" AND (MSVC11 OR MSVC12 OR MSVC14))
     ADD_DEFINITIONS(-D_USING_V110_SDK71_)
   ENDIF()
+
+  IF(NOT DXSDK_DIR)
+    MESSAGE("Using DirectX from Windows SDK (${WINSDK_LIBRARY_DIRS})")
+    SET(DXSDK_DIR ${WINSDK_DIR})
+    FIND_LIBRARY(DXSDK_GUID_LIBRARY dxguid ${WINSDK_LIBRARY_DIRS})
+    FIND_LIBRARY(DXSDK_DINPUT_LIBRARY dinput8 ${WINSDK_LIBRARY_DIRS})
+    FIND_LIBRARY(DXSDK_DSOUND_LIBRARY dsound ${WINSDK_LIBRARY_DIRS})
+    FIND_LIBRARY(DXSDK_XAUDIO_LIBRARY xaudio2 ${WINSDK_LIBRARY_DIRS})
+    # TODO: FIND_LIBRARY(DXSDK_D3DX9_LIBRARY d3dx9)
+    FIND_LIBRARY(DXSDK_D3D9_LIBRARY d3d9 ${WINSDK_LIBRARY_DIRS})
+  ENDIF()
 ELSE()
   IF(NOT WindowsSDK_FIND_QUIETLY)
     MESSAGE(STATUS "Warning: Unable to find Windows SDK!")

CMakeModules/HunterConfig.cmake

@@ -0,0 +1,8 @@
+# This file is parsed by HunterGate command
+
+hunter_config(luabind
+  VERSION 0.9.1
+  URL  "https://github.com/ryzom/luabind/tarball/0ae9bd6e40fe6c70e9d032ff096370929f58c143"
+  SHA1 "1dfabfa89ee72066118e4e28e797830e118d2a9b"
+  )
+

CMakeModules/HunterGate.cmake

@@ -0,0 +1,537 @@
+# Copyright (c) 2013-2019, Ruslan Baratov
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# This is a gate file to Hunter package manager.
+# Include this file using `include` command and add package you need, example:
+#
+#     cmake_minimum_required(VERSION 3.2)
+#
+#     include("cmake/HunterGate.cmake")
+#     HunterGate(
+#         URL "https://github.com/path/to/hunter/archive.tar.gz"
+#         SHA1 "798501e983f14b28b10cda16afa4de69eee1da1d"
+#     )
+#
+#     project(MyProject)
+#
+#     hunter_add_package(Foo)
+#     hunter_add_package(Boo COMPONENTS Bar Baz)
+#
+# Projects:
+#     * https://github.com/hunter-packages/gate/
+#     * https://github.com/ruslo/hunter
+
+option(HUNTER_ENABLED "Enable Hunter package manager support" ON)
+
+if(HUNTER_ENABLED)
+  if(CMAKE_VERSION VERSION_LESS "3.2")
+    message(
+        FATAL_ERROR
+        "At least CMake version 3.2 required for Hunter dependency management."
+        " Update CMake or set HUNTER_ENABLED to OFF."
+    )
+  endif()
+endif()
+
+include(CMakeParseArguments) # cmake_parse_arguments
+
+option(HUNTER_STATUS_PRINT "Print working status" ON)
+option(HUNTER_STATUS_DEBUG "Print a lot info" OFF)
+option(HUNTER_TLS_VERIFY "Enable/disable TLS certificate checking on downloads" ON)
+set(HUNTER_ROOT "" CACHE FILEPATH "Override the HUNTER_ROOT.")
+
+set(HUNTER_ERROR_PAGE "https://hunter.readthedocs.io/en/latest/reference/errors")
+
+function(hunter_gate_status_print)
+  if(HUNTER_STATUS_PRINT OR HUNTER_STATUS_DEBUG)
+    foreach(print_message ${ARGV})
+      message(STATUS "[hunter] ${print_message}")
+    endforeach()
+  endif()
+endfunction()
+
+function(hunter_gate_status_debug)
+  if(HUNTER_STATUS_DEBUG)
+    foreach(print_message ${ARGV})
+      string(TIMESTAMP timestamp)
+      message(STATUS "[hunter *** DEBUG *** ${timestamp}] ${print_message}")
+    endforeach()
+  endif()
+endfunction()
+
+function(hunter_gate_error_page error_page)
+  message("------------------------------ ERROR ------------------------------")
+  message("    ${HUNTER_ERROR_PAGE}/${error_page}.html")
+  message("-------------------------------------------------------------------")
+  message("")
+  message(FATAL_ERROR "")
+endfunction()
+
+function(hunter_gate_internal_error)
+  message("")
+  foreach(print_message ${ARGV})
+    message("[hunter ** INTERNAL **] ${print_message}")
+  endforeach()
+  message("[hunter ** INTERNAL **] [Directory:${CMAKE_CURRENT_LIST_DIR}]")
+  message("")
+  hunter_gate_error_page("error.internal")
+endfunction()
+
+function(hunter_gate_fatal_error)
+  cmake_parse_arguments(hunter "" "ERROR_PAGE" "" "${ARGV}")
+  if("${hunter_ERROR_PAGE}" STREQUAL "")
+    hunter_gate_internal_error("Expected ERROR_PAGE")
+  endif()
+  message("")
+  foreach(x ${hunter_UNPARSED_ARGUMENTS})
+    message("[hunter ** FATAL ERROR **] ${x}")
+  endforeach()
+  message("[hunter ** FATAL ERROR **] [Directory:${CMAKE_CURRENT_LIST_DIR}]")
+  message("")
+  hunter_gate_error_page("${hunter_ERROR_PAGE}")
+endfunction()
+
+function(hunter_gate_user_error)
+  hunter_gate_fatal_error(${ARGV} ERROR_PAGE "error.incorrect.input.data")
+endfunction()
+
+function(hunter_gate_self root version sha1 result)
+  string(COMPARE EQUAL "${root}" "" is_bad)
+  if(is_bad)
+    hunter_gate_internal_error("root is empty")
+  endif()
+
+  string(COMPARE EQUAL "${version}" "" is_bad)
+  if(is_bad)
+    hunter_gate_internal_error("version is empty")
+  endif()
+
+  string(COMPARE EQUAL "${sha1}" "" is_bad)
+  if(is_bad)
+    hunter_gate_internal_error("sha1 is empty")
+  endif()
+
+  string(SUBSTRING "${sha1}" 0 7 archive_id)
+
+  if(EXISTS "${root}/cmake/Hunter")
+    set(hunter_self "${root}")
+  else()
+    set(
+        hunter_self
+        "${root}/_Base/Download/Hunter/${version}/${archive_id}/Unpacked"
+    )
+  endif()
+
+  set("${result}" "${hunter_self}" PARENT_SCOPE)
+endfunction()
+
+# Set HUNTER_GATE_ROOT cmake variable to suitable value.
+function(hunter_gate_detect_root)
+  # Check CMake variable
+  if(HUNTER_ROOT)
+    set(HUNTER_GATE_ROOT "${HUNTER_ROOT}" PARENT_SCOPE)
+    hunter_gate_status_debug("HUNTER_ROOT detected by cmake variable")
+    return()
+  endif()
+
+  # Check environment variable
+  if(DEFINED ENV{HUNTER_ROOT})
+    set(HUNTER_GATE_ROOT "$ENV{HUNTER_ROOT}" PARENT_SCOPE)
+    hunter_gate_status_debug("HUNTER_ROOT detected by environment variable")
+    return()
+  endif()
+
+  # Check HOME environment variable
+  if(DEFINED ENV{HOME})
+    set(HUNTER_GATE_ROOT "$ENV{HOME}/.hunter" PARENT_SCOPE)
+    hunter_gate_status_debug("HUNTER_ROOT set using HOME environment variable")
+    return()
+  endif()
+
+  # Check SYSTEMDRIVE and USERPROFILE environment variable (windows only)
+  if(WIN32)
+    if(DEFINED ENV{SYSTEMDRIVE})
+      set(HUNTER_GATE_ROOT "$ENV{SYSTEMDRIVE}/.hunter" PARENT_SCOPE)
+      hunter_gate_status_debug(
+          "HUNTER_ROOT set using SYSTEMDRIVE environment variable"
+      )
+      return()
+    endif()
+
+    if(DEFINED ENV{USERPROFILE})
+      set(HUNTER_GATE_ROOT "$ENV{USERPROFILE}/.hunter" PARENT_SCOPE)
+      hunter_gate_status_debug(
+          "HUNTER_ROOT set using USERPROFILE environment variable"
+      )
+      return()
+    endif()
+  endif()
+
+  hunter_gate_fatal_error(
+      "Can't detect HUNTER_ROOT"
+      ERROR_PAGE "error.detect.hunter.root"
+  )
+endfunction()
+
+function(hunter_gate_download dir)
+  string(
+      COMPARE
+      NOTEQUAL
+      "$ENV{HUNTER_DISABLE_AUTOINSTALL}"
+      ""
+      disable_autoinstall
+  )
+  if(disable_autoinstall AND NOT HUNTER_RUN_INSTALL)
+    hunter_gate_fatal_error(
+        "Hunter not found in '${dir}'"
+        "Set HUNTER_RUN_INSTALL=ON to auto-install it from '${HUNTER_GATE_URL}'"
+        "Settings:"
+        "  HUNTER_ROOT: ${HUNTER_GATE_ROOT}"
+        "  HUNTER_SHA1: ${HUNTER_GATE_SHA1}"
+        ERROR_PAGE "error.run.install"
+    )
+  endif()
+  string(COMPARE EQUAL "${dir}" "" is_bad)
+  if(is_bad)
+    hunter_gate_internal_error("Empty 'dir' argument")
+  endif()
+
+  string(COMPARE EQUAL "${HUNTER_GATE_SHA1}" "" is_bad)
+  if(is_bad)
+    hunter_gate_internal_error("HUNTER_GATE_SHA1 empty")
+  endif()
+
+  string(COMPARE EQUAL "${HUNTER_GATE_URL}" "" is_bad)
+  if(is_bad)
+    hunter_gate_internal_error("HUNTER_GATE_URL empty")
+  endif()
+
+  set(done_location "${dir}/DONE")
+  set(sha1_location "${dir}/SHA1")
+
+  set(build_dir "${dir}/Build")
+  set(cmakelists "${dir}/CMakeLists.txt")
+
+  hunter_gate_status_debug("Locking directory: ${dir}")
+  file(LOCK "${dir}" DIRECTORY GUARD FUNCTION)
+  hunter_gate_status_debug("Lock done")
+
+  if(EXISTS "${done_location}")
+    # while waiting for lock other instance can do all the job
+    hunter_gate_status_debug("File '${done_location}' found, skip install")
+    return()
+  endif()
+
+  file(REMOVE_RECURSE "${build_dir}")
+  file(REMOVE_RECURSE "${cmakelists}")
+
+  file(MAKE_DIRECTORY "${build_dir}") # check directory permissions
+
+  # Disabling languages speeds up a little bit, reduces noise in the output
+  # and avoids path too long windows error
+  file(
+      WRITE
+      "${cmakelists}"
+      "cmake_minimum_required(VERSION 3.2)\n"
+      "project(HunterDownload LANGUAGES NONE)\n"
+      "include(ExternalProject)\n"
+      "ExternalProject_Add(\n"
+      "    Hunter\n"
+      "    URL\n"
+      "    \"${HUNTER_GATE_URL}\"\n"
+      "    URL_HASH\n"
+      "    SHA1=${HUNTER_GATE_SHA1}\n"
+      "    DOWNLOAD_DIR\n"
+      "    \"${dir}\"\n"
+      "    TLS_VERIFY\n"
+      "    ${HUNTER_TLS_VERIFY}\n"
+      "    SOURCE_DIR\n"
+      "    \"${dir}/Unpacked\"\n"
+      "    CONFIGURE_COMMAND\n"
+      "    \"\"\n"
+      "    BUILD_COMMAND\n"
+      "    \"\"\n"
+      "    INSTALL_COMMAND\n"
+      "    \"\"\n"
+      ")\n"
+  )
+
+  if(HUNTER_STATUS_DEBUG)
+    set(logging_params "")
+  else()
+    set(logging_params OUTPUT_QUIET)
+  endif()
+
+  hunter_gate_status_debug("Run generate")
+
+  # Need to add toolchain file too.
+  # Otherwise on Visual Studio + MDD this will fail with error:
+  # "Could not find an appropriate version of the Windows 10 SDK installed on this machine"
+  if(EXISTS "${CMAKE_TOOLCHAIN_FILE}")
+    get_filename_component(absolute_CMAKE_TOOLCHAIN_FILE "${CMAKE_TOOLCHAIN_FILE}" ABSOLUTE)
+    set(toolchain_arg "-DCMAKE_TOOLCHAIN_FILE=${absolute_CMAKE_TOOLCHAIN_FILE}")
+  else()
+    # 'toolchain_arg' can't be empty
+    set(toolchain_arg "-DCMAKE_TOOLCHAIN_FILE=")
+  endif()
+
+  string(COMPARE EQUAL "${CMAKE_MAKE_PROGRAM}" "" no_make)
+  if(no_make)
+    set(make_arg "")
+  else()
+    # Test case: remove Ninja from PATH but set it via CMAKE_MAKE_PROGRAM
+    set(make_arg "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}")
+  endif()
+
+  execute_process(
+      COMMAND
+      "${CMAKE_COMMAND}"
+      "-H${dir}"
+      "-B${build_dir}"
+      "-G${CMAKE_GENERATOR}"
+      "${toolchain_arg}"
+      ${make_arg}
+      WORKING_DIRECTORY "${dir}"
+      RESULT_VARIABLE download_result
+      ${logging_params}
+  )
+
+  if(NOT download_result EQUAL 0)
+    hunter_gate_internal_error(
+        "Configure project failed."
+        "To reproduce the error run: ${CMAKE_COMMAND} -H${dir} -B${build_dir} -G${CMAKE_GENERATOR} ${toolchain_arg} ${make_arg}"
+        "In directory ${dir}"
+    )
+  endif()
+
+  hunter_gate_status_print(
+      "Initializing Hunter workspace (${HUNTER_GATE_SHA1})"
+      "  ${HUNTER_GATE_URL}"
+      "  -> ${dir}"
+  )
+  execute_process(
+      COMMAND "${CMAKE_COMMAND}" --build "${build_dir}"
+      WORKING_DIRECTORY "${dir}"
+      RESULT_VARIABLE download_result
+      ${logging_params}
+  )
+
+  if(NOT download_result EQUAL 0)
+    hunter_gate_internal_error("Build project failed")
+  endif()
+
+  file(REMOVE_RECURSE "${build_dir}")
+  file(REMOVE_RECURSE "${cmakelists}")
+
+  file(WRITE "${sha1_location}" "${HUNTER_GATE_SHA1}")
+  file(WRITE "${done_location}" "DONE")
+
+  hunter_gate_status_debug("Finished")
+endfunction()
+
+# Must be a macro so master file 'cmake/Hunter' can
+# apply all variables easily just by 'include' command
+# (otherwise PARENT_SCOPE magic needed)
+macro(HunterGate)
+  if(HUNTER_GATE_DONE)
+    # variable HUNTER_GATE_DONE set explicitly for external project
+    # (see `hunter_download`)
+    set_property(GLOBAL PROPERTY HUNTER_GATE_DONE YES)
+  endif()
+
+  # First HunterGate command will init Hunter, others will be ignored
+  get_property(_hunter_gate_done GLOBAL PROPERTY HUNTER_GATE_DONE SET)
+
+  if(NOT HUNTER_ENABLED)
+    # Empty function to avoid error "unknown function"
+    function(hunter_add_package)
+    endfunction()
+
+    set(
+        _hunter_gate_disabled_mode_dir
+        "${CMAKE_CURRENT_LIST_DIR}/cmake/Hunter/disabled-mode"
+    )
+    if(EXISTS "${_hunter_gate_disabled_mode_dir}")
+      hunter_gate_status_debug(
+          "Adding \"disabled-mode\" modules: ${_hunter_gate_disabled_mode_dir}"
+      )
+      list(APPEND CMAKE_PREFIX_PATH "${_hunter_gate_disabled_mode_dir}")
+    endif()
+  elseif(_hunter_gate_done)
+    hunter_gate_status_debug("Secondary HunterGate (use old settings)")
+    hunter_gate_self(
+        "${HUNTER_CACHED_ROOT}"
+        "${HUNTER_VERSION}"
+        "${HUNTER_SHA1}"
+        _hunter_self
+    )
+    include("${_hunter_self}/cmake/Hunter")
+  else()
+    set(HUNTER_GATE_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}")
+
+    string(COMPARE NOTEQUAL "${PROJECT_NAME}" "" _have_project_name)
+    if(_have_project_name)
+      hunter_gate_fatal_error(
+          "Please set HunterGate *before* 'project' command. "
+          "Detected project: ${PROJECT_NAME}"
+          ERROR_PAGE "error.huntergate.before.project"
+      )
+    endif()
+
+    cmake_parse_arguments(
+        HUNTER_GATE "LOCAL" "URL;SHA1;GLOBAL;FILEPATH" "" ${ARGV}
+    )
+
+    string(COMPARE EQUAL "${HUNTER_GATE_SHA1}" "" _empty_sha1)
+    string(COMPARE EQUAL "${HUNTER_GATE_URL}" "" _empty_url)
+    string(
+        COMPARE
+        NOTEQUAL
+        "${HUNTER_GATE_UNPARSED_ARGUMENTS}"
+        ""
+        _have_unparsed
+    )
+    string(COMPARE NOTEQUAL "${HUNTER_GATE_GLOBAL}" "" _have_global)
+    string(COMPARE NOTEQUAL "${HUNTER_GATE_FILEPATH}" "" _have_filepath)
+
+    if(_have_unparsed)
+      hunter_gate_user_error(
+          "HunterGate unparsed arguments: ${HUNTER_GATE_UNPARSED_ARGUMENTS}"
+      )
+    endif()
+    if(_empty_sha1)
+      hunter_gate_user_error("SHA1 suboption of HunterGate is mandatory")
+    endif()
+    if(_empty_url)
+      hunter_gate_user_error("URL suboption of HunterGate is mandatory")
+    endif()
+    if(_have_global)
+      if(HUNTER_GATE_LOCAL)
+        hunter_gate_user_error("Unexpected LOCAL (already has GLOBAL)")
+      endif()
+      if(_have_filepath)
+        hunter_gate_user_error("Unexpected FILEPATH (already has GLOBAL)")
+      endif()
+    endif()
+    if(HUNTER_GATE_LOCAL)
+      if(_have_global)
+        hunter_gate_user_error("Unexpected GLOBAL (already has LOCAL)")
+      endif()
+      if(_have_filepath)
+        hunter_gate_user_error("Unexpected FILEPATH (already has LOCAL)")
+      endif()
+    endif()
+    if(_have_filepath)
+      if(_have_global)
+        hunter_gate_user_error("Unexpected GLOBAL (already has FILEPATH)")
+      endif()
+      if(HUNTER_GATE_LOCAL)
+        hunter_gate_user_error("Unexpected LOCAL (already has FILEPATH)")
+      endif()
+    endif()
+
+    hunter_gate_detect_root() # set HUNTER_GATE_ROOT
+
+    # Beautify path, fix probable problems with windows path slashes
+    get_filename_component(
+        HUNTER_GATE_ROOT "${HUNTER_GATE_ROOT}" ABSOLUTE
+    )
+    hunter_gate_status_debug("HUNTER_ROOT: ${HUNTER_GATE_ROOT}")
+    if(NOT HUNTER_ALLOW_SPACES_IN_PATH)
+      string(FIND "${HUNTER_GATE_ROOT}" " " _contain_spaces)
+      if(NOT _contain_spaces EQUAL -1)
+        hunter_gate_fatal_error(
+            "HUNTER_ROOT (${HUNTER_GATE_ROOT}) contains spaces."
+            "Set HUNTER_ALLOW_SPACES_IN_PATH=ON to skip this error"
+            "(Use at your own risk!)"
+            ERROR_PAGE "error.spaces.in.hunter.root"
+        )
+      endif()
+    endif()
+
+    string(
+        REGEX
+        MATCH
+        "[0-9]+\\.[0-9]+\\.[0-9]+[-_a-z0-9]*"
+        HUNTER_GATE_VERSION
+        "${HUNTER_GATE_URL}"
+    )
+    string(COMPARE EQUAL "${HUNTER_GATE_VERSION}" "" _is_empty)
+    if(_is_empty)
+      set(HUNTER_GATE_VERSION "unknown")
+    endif()
+
+    hunter_gate_self(
+        "${HUNTER_GATE_ROOT}"
+        "${HUNTER_GATE_VERSION}"
+        "${HUNTER_GATE_SHA1}"
+        _hunter_self
+    )
+
+    set(_master_location "${_hunter_self}/cmake/Hunter")
+    if(EXISTS "${HUNTER_GATE_ROOT}/cmake/Hunter")
+      # Hunter downloaded manually (e.g. by 'git clone')
+      set(_unused "xxxxxxxxxx")
+      set(HUNTER_GATE_SHA1 "${_unused}")
+      set(HUNTER_GATE_VERSION "${_unused}")
+    else()
+      get_filename_component(_archive_id_location "${_hunter_self}/.." ABSOLUTE)
+      set(_done_location "${_archive_id_location}/DONE")
+      set(_sha1_location "${_archive_id_location}/SHA1")
+
+      # Check Hunter already downloaded by HunterGate
+      if(NOT EXISTS "${_done_location}")
+        hunter_gate_download("${_archive_id_location}")
+      endif()
+
+      if(NOT EXISTS "${_done_location}")
+        hunter_gate_internal_error("hunter_gate_download failed")
+      endif()
+
+      if(NOT EXISTS "${_sha1_location}")
+        hunter_gate_internal_error("${_sha1_location} not found")
+      endif()
+      file(READ "${_sha1_location}" _sha1_value)
+      string(TOLOWER "${_sha1_value}" _sha1_value_lower)
+      string(TOLOWER "${HUNTER_GATE_SHA1}" _HUNTER_GATE_SHA1_lower)
+      string(COMPARE EQUAL "${_sha1_value_lower}" "${_HUNTER_GATE_SHA1_lower}" _is_equal)
+      if(NOT _is_equal)
+        hunter_gate_internal_error(
+            "Short SHA1 collision:"
+            "  ${_sha1_value} (from ${_sha1_location})"
+            "  ${HUNTER_GATE_SHA1} (HunterGate)"
+        )
+      endif()
+      if(NOT EXISTS "${_master_location}")
+        hunter_gate_user_error(
+            "Master file not found:"
+            "  ${_master_location}"
+            "try to update Hunter/HunterGate"
+        )
+      endif()
+    endif()
+    include("${_master_location}")
+    set_property(GLOBAL PROPERTY HUNTER_GATE_DONE YES)
+  endif()
+endmacro()

CMakeModules/nel.cmake

@@ -121,6 +121,22 @@ MACRO(NL_ADD_RUNTIME_FLAGS name)
 ENDMACRO(NL_ADD_RUNTIME_FLAGS)
 
 MACRO(NL_ADD_STATIC_VID_DRIVERS name)
+IF(HUNTER_ENABLED)
+  IF(WIN32)
+    SET(drv_suffix "_win")
+  ELSE()
+    SET(drv_suffix "")
+  ENDIF()
+  IF(WIN32 AND WITH_DRIVER_DIRECT3D)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_direct3d${drv_suffix})
+  ENDIF()
+  IF(WITH_DRIVER_OPENGL)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_opengl${drv_suffix})
+  ENDIF()
+  IF(WITH_DRIVER_OPENGLES)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_opengles${drv_suffix})
+  ENDIF()
+ELSE()
   IF(WITH_STATIC_DRIVERS)
     IF(WIN32)
       IF(WITH_DRIVER_DIRECT3D)
@@ -144,9 +160,29 @@ MACRO(NL_ADD_STATIC_VID_DRIVERS name)
       ENDIF()
     ENDIF()
   ENDIF()
+ENDIF()#hunter
 ENDMACRO(NL_ADD_STATIC_VID_DRIVERS)
 
 MACRO(NL_ADD_STATIC_SND_DRIVERS name)
+IF(HUNTER_ENABLED)
+  IF(WIN32)
+    SET(drv_suffix "_win")
+  ELSE()
+    SET(drv_suffix "")
+  ENDIF()
+  IF(WIN32 AND WITH_DRIVER_DSOUND)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_dsound${drv_suffix})
+  ENDIF()
+  IF(WIN32 AND WITH_DRIVER_XAUDIO2)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_xaudio2${drv_suffix})
+  ENDIF()
+  IF(WITH_DRIVER_FMOD)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_fmod${drv_suffix})
+  ENDIF()
+  IF(WITH_DRIVER_OPENAL)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_openal${drv_suffix})
+  ENDIF()
+ELSE()
   IF(WITH_STATIC_DRIVERS)
     IF(WIN32)
       IF(WITH_DRIVER_DSOUND)
@@ -175,6 +211,7 @@ MACRO(NL_ADD_STATIC_SND_DRIVERS name)
     ENDIF()
 
   ENDIF()
+ENDIF() #hunter
 ENDMACRO(NL_ADD_STATIC_SND_DRIVERS)
 
 ###
@@ -356,6 +393,7 @@ MACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS)
   OPTION(WITH_LUA51               "Build Ryzom Core using Lua 5.1"                ON )
   OPTION(WITH_LUA52               "Build Ryzom Core using Lua 5.2"                OFF)
   OPTION(WITH_LUA53               "Build Ryzom Core using Lua 5.3"                OFF)
+  OPTION(WITH_LUA54               "Build Ryzom Core using Lua 5.4"                OFF)
   OPTION(WITH_RYZOM_CLIENT_UAC    "Ask to run as Administrator"                   OFF)
   OPTION(WITH_RYZOM_PATCH         "Enable Ryzom in-game patch support"            OFF)
   OPTION(WITH_RYZOM_CUSTOM_PATCH_SERVER "Only use patch server from CFG file"     OFF)
@@ -1195,7 +1233,11 @@ MACRO(SETUP_EXTERNAL)
   ENDIF()
 
   IF(WIN32)
-    FIND_PACKAGE(External REQUIRED)
+    IF (HUNTER_ENABLED)
+      FIND_PACKAGE(External QUIET)
+    ELSE()
+      FIND_PACKAGE(External REQUIRED)
+    ENDIF()
 
     # If using custom boost, we need to define the right variables used by official boost CMake module
     IF(DEFINED BOOST_DIR)
@@ -1226,7 +1268,9 @@ MACRO(SETUP_EXTERNAL)
     SET(CMAKE_USE_PTHREADS_INIT 1)
     SET(Threads_FOUND TRUE)
   ELSE()
-    SET(THREADS_HAVE_PTHREAD_ARG ON)
+    IF(NOT MSVC)
+      SET(THREADS_HAVE_PTHREAD_ARG ON)
+    ENDIF()
     FIND_PACKAGE(Threads)
     # TODO: replace all -l<lib> by absolute path to <lib> in CMAKE_THREAD_LIBS_INIT
   ENDIF()
@@ -1238,7 +1282,7 @@ MACRO(SETUP_EXTERNAL)
 
   IF(WIN32)
     # Must include DXSDK before WINSDK
-    FIND_PACKAGE(DirectXSDK REQUIRED)
+    FIND_PACKAGE(DirectXSDK)
     # IF(DXSDK_INCLUDE_DIR)
     #   INCLUDE_DIRECTORIES(${DXSDK_INCLUDE_DIR})
     # ENDIF()
@@ -1247,5 +1291,8 @@ MACRO(SETUP_EXTERNAL)
   IF(MSVC)
     FIND_PACKAGE(MSVC REQUIRED)
     FIND_PACKAGE(WindowsSDK REQUIRED)
+    IF(NOT DXSDK_DIR)
+      MESSAGE(FATAL_ERROR "DirectX SDK or DirectX files from Windows SDK not found.")
+    ENDIF()
   ENDIF()
 ENDMACRO()

README.md

@@ -1,7 +1,63 @@
-# Ryzom Core [![Build Status](https://travis-ci.org/ryzom/ryzomcore.svg)](https://travis-ci.org/ryzom/ryzomcore)
+# Ryzom Core [![Build Status](https://dev.azure.com/ryzom/ryzomcore/_apis/build/status/ryzom.ryzomcore?branchName=core4)](https://dev.azure.com/ryzom/ryzomcore/_build)
 
 Ryzom Core is the open-source project related to Ryzom Game. Written in C++, Ryzom Core contains the whole code (client, server, tools) used to make the commercial MMORPG Ryzom. Ryzom Core is a toolkit for the development of massively multiplayer online universes. It provides the base technologies and a set of development methodologies for the development of both client and server code.
 
+Ryzom Core is open source and released under the terms of the GNU Affero General Public License 3.0 (GNU/AGPLv3) for the source code. The art assets are dual-licenced under the Creative Commons Attributions-ShareAlike 3.0 (CC-BY-SA) and Free Art License 1.3 (FAL 1.3).
 
+* Wiki: https://wiki.ryzom.dev/
+* IRC: https://freegamedev.net/irc/#ryzom
+* Discord: https://discord.gg/xjSBVkSmCy
 
-Ryzom Core is open source and released under the terms of the GNU Affero General Public License 3.0 (GNU/AGPLv3) for the source code and the Creative Commons Attributions-ShareAlike 3.0 (CC-BY-SA) for the art assets. Which means you can create your own game using Ryzom Core, for more information on doing so check out Creating Your Own Game Using Ryzom Core.
+## About the community
+
+We are a passionate group of gamers, and open-source aficionados. Many of us fell in love with the original vision and promise of the Saga of Ryzom, or the ideals of open source. For some the game was once our home, or still is. To others, it was an introduction to the open-source software world. We work on Ryzom Core because we care for the things we love, and the friendships we've made over the years.
+
+The Ryzom Core repository is maintained by the community independently. It is not officially affiliated with the commercial game, nor with Winch Gate Ltd. See the History section on why.
+
+## Support development
+
+We are happy to work on this project in our free time. If you would like to contribute to the project financially, you can support us and our loved ones through any of the following links.
+
+* [![Sponsor](https://img.shields.io/github/sponsors/kaetemi?style=social)]( https://github.com/sponsors/kaetemi) Jan Boon (Kaetemi), Polyverse OÜ. — Goes towards the Ryzom Core servers, and open-source development.
+
+If you're a regular source code or game asset contributor to the open-source project, feel free to add yourself to this list.
+
+## Project history
+
+The Saga of Ryzom was originally developed by Nevrax. A small game development company with a visionary creative direction.
+
+Several founders and developers of the company at the time were open-source aficionados. The ideal in their minds was to fully open source the game. Unfortunately, the investors thought differently and never fully bought into the open-source model. Only the engine was released at the time.
+
+This gave birth to the NeL project. The Nevrax Library. While there was public interest in the engine, the lack of commitment to open source by the company made it difficult for independent contributors to work on the project.
+
+When Nevrax eventually went bankrupt, they were initially bought out by Gameforge. A subsidiary called Gameforge France was formed to work on Ryzom.
+
+A community-led [Virtual Citizenship Association (VCA)]( https://web.archive.org/web/20080905175524/https://www.virtualcitizenship.org/), raising over € 170,000 in pledges, failed to win the bid. The open-source NeL community was later abandoned by Gameforge once Ryzom eventually fell into oblivion, and revived itself as the OpenNeL project. After Gameforge failed to fully pay for the bankruptcy deal, and some hush-hush behind the backs of the community-led VCA, the ownership was transferred back to the liquidator and onto Winch Gate Properties Limited.
+
+Fortunately, thanks to the efforts of original Nevrax employees, and key members of OpenNeL, the new owner showed some goodwill towards the open source community, and the full game client and server, as well as a substantial amount of graphics assets, were released as open source.
+
+With the promise of the game becoming an open source project, they worked together with the OpenNeL community, which renamed to Ryzom Core in order to advertise the game better. In practice, the commercial game servers were being developed on a private repository. Beyond bug fixes and enhancements to the client, the community had zero input. New features that required server modifications were disallowed. The collaboration was doomed to fail.
+
+The Ryzom Core community was backstabbed and slowly ignored by the new owner. A new Ryzom Forge project was launched behind closed doors, that claimed to make community contributions easier. Yet closing off development almost entirely to outsiders. No attempt was made by the new owner at fully committing to an open-source development model.
+
+New features on the commercial game developed by the Ryzom Forge team are primarily web applications using the in-game browser, circumventing the AGPLv3. Furthermore, the Ryzom Forge team had at one point updated their private server repository to link the binaries to the game engine on the public repository. This in violation of the AGPLv3 license on community contributions, forcing their hand to make their private server fork public. The web apps remain closed source. The team also shut down the Ryzom Ring player scenario tools on the official servers, in favor of closed source web-based tools that are exclusive to the official event team.
+
+As the commercial game owners historically, and still, have been a poorly committed and unreliable partner to running this as a truly open-source project, Ryzom Core is currently an independent community project, and is committed to remain that way and protect the rights of independent contributors.
+
+## Copyright and contributions
+
+All original source code is copyright (C) 2001-2022 Winch Gate Property Limited. The commercial game's official Git repositories are hosted on GitLab at https://gitlab.com/ryzom.
+
+The NeL Sound driver for XAudio2 is copyright (C) 2008-2014 Jan BOON <jan.boon@kaetemi.be>.
+
+Other community contributions and modifications are copyright their respective authors. Consult the OpenNeL SVN and the Ryzom Core Git repository histories for more details.
+
+The source code in this repository is licensed under the AGPLv3, unless specified otherwise. Likewise, by committing to this repository, you agree to license your modifications under the AGPLv3. You retain all copyright over your work (\*). As such, you have the option to additionally dual-license your fully-owned contributions under any other license. Configuration files are implied to be public domain samples, as they may contain sensitive data in a production environment.
+
+(\*) If, and only if, you have signed a CTA (part of the NDA, copyright and ownership - your contract may vary) with Winch Gate Ltd., your contributions, along with any other creations related to Ryzom, fall under that contract and will be copyright Winch Gate Ltd. instead (\*\*). As per your contract, your contributions are licensed back to you under the AGPLv3. You retain the moral rights to your work. These are non-transferable rights, which permit you to assert your authorship and be credited for your contributions. You should exercise this right.
+
+(\*\*) If you live in a legislation where contractual copyright assignments without employment or commercial transaction are unenforceable (e.g. Belgium), and you are not being paid by Winch Gate Ltd. for your current work, the CTA is null and void, and you retain full copyright ownership over your contributions. Consult a lawyer to assert your rights. Don't give them away.
+
+To comply with the AGPLv3 license, section 5(a), names of the contributors who own the copyrights to modifications will be added to the copyright notice in source files on a periodic basis. You may follow the existing format if you wish to do this yourself.
+
+The removal of any valid copyright notice is a violation of the AGPLv3 license.

azure-pipelines.yml

@@ -77,3 +77,91 @@ jobs:
         cd build
         make -j`nproc`
       displayName: 'Make'
+  - job: client
+    strategy:
+      matrix:
+        ubuntu:
+          vmImage: 'ubuntu-18.04'
+          releaseName: 'Ubuntu18'
+          aptPackages: >-
+            libasound2-dev
+            libgl1-mesa-dev
+            libjack-dev
+            libpulse-dev
+            libxrandr-dev
+            libxrender-dev
+            libxxf86vm-dev
+        win2019:
+          vmImage: 'windows-2019'
+          releaseName: 'Win64'
+          cmakeExtra: >-
+            -DWITH_DRIVER_DIRECT3D=ON
+            -DWITH_DRIVER_XAUDIO2=ON
+            -DDXSDK_DIR=C:/DXSDK
+        macOS11:
+          vmImage: 'macOS-11'
+          releaseName: 'macOS'
+          MACOSX_DEPLOYMENT_TARGET: 10.12
+          cmakeExtra: >-
+            -DWITH_LIBXML2_ICONV=OFF
+            -GXcode
+    timeoutInMinutes: 120
+    pool:
+      vmImage: $(vmImage)
+    steps:
+    - checkout: self
+      fetchDepth: 0
+    - script: |
+        sudo apt update
+        sudo apt remove -y man-db
+        sudo apt install -y --no-install-recommends $(aptPackages)
+      displayName: '(ubuntu) Dependencies'
+      condition: eq(variables['Agent.JobName'], 'client ubuntu')
+    - task: CmdLine@2
+      inputs:
+        script: |
+          aria2c https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe
+          7z x DXSDK_Jun10.exe -oC:\ -r -y
+          del DXSDK_Jun10.exe
+      displayName: '(windows) DirectX SDK'
+      condition: contains(variables['cmakeExtra'], 'DIRECT3D=ON')
+    - task: Cache@2
+      inputs:
+        key: 'hunter321b-$(releaseName)'
+        path: '$(Pipeline.Workspace)/.hunter/_Base/Cache'
+    - task: CMake@1
+      displayName: 'Configure'
+      inputs:
+        workingDirectory: $(Build.BinariesDirectory)
+        cmakeArgs: >-
+          $(cmakeExtra)
+          -DCMAKE_CONFIGURATION_TYPES=Release
+          -DFINAL_VERSION=OFF
+          -DHUNTER_CONFIGURATION_TYPES=Release
+          -DHUNTER_ENABLED=ON
+          -DHUNTER_ROOT=$(Pipeline.Workspace)/.hunter
+          -DHUNTER_STATUS_DEBUG=ON
+          -DWITH_DRIVER_OPENAL=ON
+          -DWITH_DRIVER_OPENGL=ON
+          -DWITH_INSTALL_LIBRARIES=OFF
+          -DWITH_NEL_SAMPLES=OFF
+          -DWITH_NEL_TESTS=OFF
+          -DWITH_NEL_TOOLS=OFF
+          -DWITH_RYZOM_CLIENT=ON
+          -DWITH_RYZOM_SERVER=OFF
+          -DWITH_RYZOM_TOOLS=OFF
+          $(Build.SourcesDirectory)
+    - task: CMake@1
+      displayName: 'Build'
+      inputs:
+        workingDirectory: $(Build.BinariesDirectory)
+        cmakeArgs: '--build . --config Release'
+    #- task: CMake@1
+    #  displayName: 'Install'
+    #  inputs:
+    #    workingDirectory: $(Build.BinariesDirectory)
+    #    cmakeArgs: --install . --config Release --prefix $(Build.StagingDirectory)
+    #- task: PublishPipelineArtifact@1
+    #  inputs:
+    #    targetPath: $(Build.StagingDirectory)/bin
+    #    artifactName: RyzomClient$(releaseName)Release

config.h.cmake

@@ -39,8 +39,8 @@
 #cmakedefine RYZOM_CLIENT_PATCH_URL "${RYZOM_CLIENT_PATCH_URL}"
 #cmakedefine RYZOM_CLIENT_APP_NAME "${RYZOM_CLIENT_APP_NAME}"
 
-#cmakedefine RYZOM_WEBIG_MAIN_URL "${RYZOM_WEBIG_MAIN_URL}"
-#cmakedefine RYZOM_WEBIG_TRUSTED_DOMAIN "${RYZOM_WEBIG_TRUSTED_DOMAIN}"
+#cmakedefine RYZOM_CLIENT_RELEASENOTES_RING_URL "${RYZOM_CLIENT_RELEASENOTES_RING_URL}"
+#cmakedefine RYZOM_CLIENT_RELEASENOTES_URL "${RYZOM_CLIENT_RELEASENOTES_URL}"
 
 #cmakedefine AUTHOR "${AUTHOR}"
 #cmakedefine YEAR "${YEAR}"

dist/debian/ryzomcore_version.sh

@@ -32,9 +32,9 @@ parse_version()
   export $VAR=$V
 }
 
-parse_version RYZOM $VERSION_FILE VERSION_MAJOR
-parse_version RYZOM $VERSION_FILE VERSION_MINOR
-parse_version RYZOM $VERSION_FILE VERSION_PATCH
+parse_version NL $VERSION_FILE VERSION_MAJOR
+parse_version NL $VERSION_FILE VERSION_MINOR
+parse_version NL $VERSION_FILE VERSION_PATCH
 
 VERSION=$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH
 

dist/nsis/ryzom_installer.nsi

@@ -1,120 +1,120 @@
-;--------------------------------
-;Include Modern UI
-!include "MUI2.nsh"
-
-;--------------------------------
-;General
-!define Company "Winch Gate"
-!define GenericProduct "Ryzom"
-!define Product "Ryzom Installer"
-!define RegistryCat "HKCU"
-!define RegistryKey "Software\${Company}\${GenericProduct}"
-!define Executable "ryzom_installer_qt_r.exe"
-!define SrcDir "RyzomInstaller"
-!define Installer "ryzom_installer_windows.exe"
-
-;Properly display all languages (Installer will not work on Windows 95, 98 or ME!)
-;Unicode true
-
-;New XP style
-XPStyle on
-
-;Name and file
-Name "${Product}"
-OutFile "${Installer}"
-
-;Default installation folder
-InstallDir "$LOCALAPPDATA\${GenericProduct}"
-
-;Get installation folder from registry if available
-InstallDirRegKey "${RegistryCat}" "${RegistryKey}" "${GenericProduct} Install Path"
-
-;Request application privileges for Windows Vista
-RequestExecutionLevel user
-
-;Best compression
-SetCompressor LZMA
-
-; ???
-AllowSkipFiles on
-
-;--------------------------------
-;Interface Settings
-
-!define MUI_ICON "${SrcDir}\${GenericProduct}.ico"
-!define MUI_UNICON "${SrcDir}\${GenericProduct}.ico"
-!define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "modern-header.bmp" ; optional
-!define MUI_WELCOMEFINISHPAGE_BITMAP "modern-wizard.bmp"
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP "modern-wizard.bmp"
-!define MUI_ABORTWARNING
-
-;Show all languages, despite user's codepage
-!define MUI_LANGDLL_ALLLANGUAGES
-
-;--------------------------------
-;Language Selection Dialog Settings
-
-;Remember the installer language
-!define MUI_LANGDLL_REGISTRY_ROOT "${RegistryCat}"
-!define MUI_LANGDLL_REGISTRY_KEY "${RegistryKey}"
-!define MUI_LANGDLL_REGISTRY_VALUENAME "Language"
-
-;--------------------------------
-;Pages
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-
-!define MUI_FINISHPAGE_RUN "$INSTDIR\${Executable}"
-
-!insertmacro MUI_PAGE_FINISH
-
-!insertmacro MUI_UNPAGE_WELCOME
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-!insertmacro MUI_UNPAGE_FINISH
-
-;--------------------------------
-;Languages
-
-!insertmacro MUI_LANGUAGE "English" ;first language is the default language
-!insertmacro MUI_LANGUAGE "French"
-!insertmacro MUI_LANGUAGE "German"
-!insertmacro MUI_LANGUAGE "Spanish"
-
-;--------------------------------
-;Reserve Files
-
-;If you are using solid compression, files that are required before
-;the actual installation should be stored first in the data block,
-;because this will make your installer start faster.
-
-!insertmacro MUI_RESERVEFILE_LANGDLL
-
-;--------------------------------
-;Installer Sections
-
-; ----------------------------------------
-; Default section
-Section
-  SetOutPath "$INSTDIR"
-
-  ;Client, configuration and misc files
-  File "${SrcDir}\${Executable}"
-  File "${SrcDir}\msvcp120.dll"
-  File "${SrcDir}\msvcr120.dll"
-
-  ;Shortcut on desktop
-  CreateShortCut "$DESKTOP\${Product}.lnk" "$INSTDIR\${Executable}"
-
-  ;Store installation folder
-  WriteRegStr "${RegistryCat}" "${RegistryKey}" "${GenericProduct} Install Path" $INSTDIR
-SectionEnd
-
-;--------------------------------
-;Installer Functions
-
-Function .onInit
-  !insertmacro MUI_LANGDLL_DISPLAY
-FunctionEnd
+;--------------------------------
+;Include Modern UI
+!include "MUI2.nsh"
+
+;--------------------------------
+;General
+!define Company "Winch Gate"
+!define GenericProduct "Ryzom"
+!define Product "Ryzom Installer"
+!define RegistryCat "HKCU"
+!define RegistryKey "Software\${Company}\${GenericProduct}"
+!define Executable "ryzom_installer_qt_r.exe"
+!define SrcDir "RyzomInstaller"
+!define Installer "ryzom_installer_windows.exe"
+
+;Properly display all languages (Installer will not work on Windows 95, 98 or ME!)
+;Unicode true
+
+;New XP style
+XPStyle on
+
+;Name and file
+Name "${Product}"
+OutFile "${Installer}"
+
+;Default installation folder
+InstallDir "$LOCALAPPDATA\${GenericProduct}"
+
+;Get installation folder from registry if available
+InstallDirRegKey "${RegistryCat}" "${RegistryKey}" "${GenericProduct} Install Path"
+
+;Request application privileges for Windows Vista
+RequestExecutionLevel user
+
+;Best compression
+SetCompressor LZMA
+
+; ???
+AllowSkipFiles on
+
+;--------------------------------
+;Interface Settings
+
+!define MUI_ICON "${SrcDir}\${GenericProduct}.ico"
+!define MUI_UNICON "${SrcDir}\${GenericProduct}.ico"
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "modern-header.bmp" ; optional
+!define MUI_WELCOMEFINISHPAGE_BITMAP "modern-wizard.bmp"
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP "modern-wizard.bmp"
+!define MUI_ABORTWARNING
+
+;Show all languages, despite user's codepage
+!define MUI_LANGDLL_ALLLANGUAGES
+
+;--------------------------------
+;Language Selection Dialog Settings
+
+;Remember the installer language
+!define MUI_LANGDLL_REGISTRY_ROOT "${RegistryCat}"
+!define MUI_LANGDLL_REGISTRY_KEY "${RegistryKey}"
+!define MUI_LANGDLL_REGISTRY_VALUENAME "Language"
+
+;--------------------------------
+;Pages
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+
+!define MUI_FINISHPAGE_RUN "$INSTDIR\${Executable}"
+
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_WELCOME
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
+
+;--------------------------------
+;Languages
+
+!insertmacro MUI_LANGUAGE "English" ;first language is the default language
+!insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Spanish"
+
+;--------------------------------
+;Reserve Files
+
+;If you are using solid compression, files that are required before
+;the actual installation should be stored first in the data block,
+;because this will make your installer start faster.
+
+!insertmacro MUI_RESERVEFILE_LANGDLL
+
+;--------------------------------
+;Installer Sections
+
+; ----------------------------------------
+; Default section
+Section
+  SetOutPath "$INSTDIR"
+
+  ;Client, configuration and misc files
+  File "${SrcDir}\${Executable}"
+  File "${SrcDir}\msvcp120.dll"
+  File "${SrcDir}\msvcr120.dll"
+
+  ;Shortcut on desktop
+  CreateShortCut "$DESKTOP\${Product}.lnk" "$INSTDIR\${Executable}"
+
+  ;Store installation folder
+  WriteRegStr "${RegistryCat}" "${RegistryKey}" "${GenericProduct} Install Path" $INSTDIR
+SectionEnd
+
+;--------------------------------
+;Installer Functions
+
+Function .onInit
+  !insertmacro MUI_LANGDLL_DISPLAY
+FunctionEnd

dist/nsis/ryzom_setup.nsi

@@ -1,298 +1,298 @@
-;--------------------------------
-;Include Modern UI
-!include "MUI2.nsh"
-
-;--------------------------------
-;General
-!define Company "Nevrax"
-!define Product "Ryzom"
-!define Version "2.1.0"
-!define Patch "661"
-!define RegistryCat "HKLM"
-!define RegistryKey "Software\${Company}\${Product}"
-!define Executable "client_ryzom_rd.exe"
-!define DstDir "Output"
-!define SrcDir "Ryzom"
-!define Installer "ryzom_setup_${Patch}.exe"
-
-;Registry key for uninstaller
-!define UninstallRegistryRoot "Software\Microsoft\Windows\CurrentVersion\Uninstall"
-!define UninstallRegistryKey "${UninstallRegistryRoot}\${Product}"
-
-;Properly display all languages (Installer will not work on Windows 95, 98 or ME!)
-Unicode true
-
-;New XP style
-XPStyle on
-
-;Name and file
-Name "${Product}"
-OutFile "${DstDir}\${Installer}"
-
-;Default installation folder
-InstallDir "$PROGRAMFILES\${Product}"
-
-;Get installation folder from registry if available
-InstallDirRegKey "${RegistryCat}" "${RegistryKey}" "${Product} Install Path"
-
-;Request application privileges for Windows Vista
-RequestExecutionLevel admin
-
-;Best compression
-SetCompressor LZMA
-
-; ???
-AllowSkipFiles on
-
-;--------------------------------
-;Variables
-
-;Will be used later
-Var MUI_TEMP
-Var STARTMENU_FOLDER
-
-;--------------------------------
-;Interface Settings
-
-!define MUI_ICON "${SrcDir}\ryzom.ico"
-!define MUI_UNICON "${SrcDir}\ryzom.ico"
-!define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "modern-header.bmp" ; optional
-!define MUI_WELCOMEFINISHPAGE_BITMAP "modern-wizard.bmp"
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP "modern-wizard.bmp"
-!define MUI_ABORTWARNING
-
-;Show all languages, despite user's codepage
-!define MUI_LANGDLL_ALLLANGUAGES
-
-;--------------------------------
-;Language Selection Dialog Settings
-
-;Remember the installer language
-!define MUI_LANGDLL_REGISTRY_ROOT "${RegistryCat}"
-!define MUI_LANGDLL_REGISTRY_KEY "${RegistryKey}"
-!define MUI_LANGDLL_REGISTRY_VALUENAME "Language"
-
-;--------------------------------
-;Pages
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_DIRECTORY
-
-;Start Menu Folder Page Configuration
-!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${RegistryCat}"
-!define MUI_STARTMENUPAGE_REGISTRY_KEY "${RegistryKey}"
-!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
-
-!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
-
-!insertmacro MUI_PAGE_INSTFILES
-
-!define MUI_FINISHPAGE_RUN "$INSTDIR\${Executable}"
-
-!insertmacro MUI_PAGE_FINISH
-
-!insertmacro MUI_UNPAGE_WELCOME
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-!insertmacro MUI_UNPAGE_FINISH
-
-;--------------------------------
-;Languages
-
-!insertmacro MUI_LANGUAGE "English" ;first language is the default language
-!insertmacro MUI_LANGUAGE "French"
-!insertmacro MUI_LANGUAGE "German"
-;!insertmacro MUI_LANGUAGE "Spanish"
-
-;--------------------------------
-;Reserve Files
-
-;If you are using solid compression, files that are required before
-;the actual installation should be stored first in the data block,
-;because this will make your installer start faster.
-
-!insertmacro MUI_RESERVEFILE_LANGDLL
-
-;--------------------------------
-;Descriptions
-
-;French
-LangString MSG_SUPPORT_URL_TITLE       ${LANG_FRENCH}  "Support"
-LangString MSG_SUPPORT_URL             ${LANG_FRENCH}  "http://app.ryzom.com/app_forum/index.php?page=topic/view/22047/1&post149889=fr#1"
-LangString MSG_HOME_URL_TITLE          ${LANG_FRENCH}  "${Product} sur le Web"
-LangString MSG_HOME_URL                ${LANG_FRENCH}  "http://ryzom.fr"
-LangString MSG_CONFIRM_DELETE_BACKUPS  ${LANG_FRENCH}  "Voulez-vous supprimer vos fichiers de sauvegarde ? Appuyer sur Oui pour effacer vos fichiers de sauvegarde."
-
-;English
-LangString MSG_SUPPORT_URL_TITLE       ${LANG_ENGLISH} "Support"
-LangString MSG_SUPPORT_URL             ${LANG_ENGLISH} "http://app.ryzom.com/app_forum/index.php?page=topic/view/22047/1&post149889=en#1"
-LangString MSG_HOME_URL_TITLE          ${LANG_ENGLISH} "${Product} on the Web"
-LangString MSG_HOME_URL                ${LANG_ENGLISH} "http://ryzom.com"
-LangString MSG_CONFIRM_DELETE_BACKUPS  ${LANG_ENGLISH} "Deleting Save Files? Click Yes to delete your own save files."
-
-;German
-LangString MSG_SUPPORT_URL_TITLE       ${LANG_GERMAN}  "Support"
-LangString MSG_SUPPORT_URL             ${LANG_GERMAN}  "http://app.ryzom.com/app_forum/index.php?page=topic/view/22047/1&post149889=de#1"
-LangString MSG_HOME_URL_TITLE          ${LANG_GERMAN}  "${Product} im Internet"
-LangString MSG_HOME_URL                ${LANG_GERMAN}  "http://ryzom.de"
-LangString MSG_CONFIRM_DELETE_BACKUPS  ${LANG_GERMAN}  "Gespeicherte Dateien löschen? Klicke Ja um die eigenen Dateien zu löschen."
-
-;--------------------------------
-;Installer Sections
-
-!macro CreateInternetShortcut FILENAME URL ICONFILE
-  WriteINIStr "${FILENAME}.url" "InternetShortcut" "URL" "${URL}"
-  WriteINIStr "${FILENAME}.url" "InternetShortcut" "IconFile" "${ICONFILE}"
-  WriteINIStr "${FILENAME}.url" "InternetShortcut" "IconIndex" "0"
-!macroend
-
-; ----------------------------------------
-; Default section
-Section
-  ;Install for All Users
-  SetShellVarContext all
-
-  ;Game directories
-  SetOutPath "$INSTDIR\cfg"
-  File /r "${SrcDir}\cfg\*.*"
-
-  SetOutPath "$INSTDIR\data"
-  File /r "${SrcDir}\data\*.*"
-
-  SetOutPath "$INSTDIR\examples"
-  File /r "${SrcDir}\examples\*.*"
-
-  SetOutPath "$INSTDIR\user"
-  File /r "${SrcDir}\user\*.*"
-
-  SetOutPath "$INSTDIR"
-
-  ;Client, configuration and misc files
-  File "${SrcDir}\client_default.cfg"
-  File "${SrcDir}\${Executable}"
-  File "${SrcDir}\configure.bat"
-  File "${SrcDir}\d3dcompiler_43.dll"
-  File "${SrcDir}\d3dx9_43.dll"
-  File "${SrcDir}\fmod.dll"
-  File "${SrcDir}\forum.url"
-  File "${SrcDir}\launch.bat"
-  File "${SrcDir}\msvcp100.dll"
-  File "${SrcDir}\msvcr100.dll"
-  File "${SrcDir}\nel_drv_direct3d_win_r.dll"
-  File "${SrcDir}\nel_drv_fmod_win_r.dll"
-  File "${SrcDir}\nel_drv_opengl_win_r.dll"
-  File "${SrcDir}\ryzom.ico"
-  File "${SrcDir}\ryzom.url"
-  File "${SrcDir}\Ryzom6.ico"
-
-  ;Create uninstaller
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
-
-  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-
-  ;Create shortcuts in Start Menu
-  CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
-  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\${Product}.lnk" "$INSTDIR\${Executable}"
-
-  ;Create URLs
-  !insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\$(MSG_SUPPORT_URL_TITLE)" "$(MSG_SUPPORT_URL)" "$INSTDIR\ryzom.ico"
-  !insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\$(MSG_HOME_URL_TITLE)" "$(MSG_HOME_URL)" "$INSTDIR\ryzom.ico"
-
-  !insertmacro MUI_STARTMENU_WRITE_END
-
-  ;Shortcut on desktop
-  CreateShortCut "$DESKTOP\${Product}.lnk" "$INSTDIR\${Executable}"
-
-  ;Add/Remove Program entry
-  WriteRegStr HKLM "${UninstallRegistryKey}" "DisplayIcon" "$INSTDIR\${Executable},0"
-  WriteRegStr HKLM "${UninstallRegistryKey}" "DisplayName" "${Product}"
-  WriteRegStr HKLM "${UninstallRegistryKey}" "DisplayVersion" "${Version}"
-  WriteRegStr HKLM "${UninstallRegistryKey}" "InstallLocation" "$INSTDIR"
-  WriteRegStr HKLM "${UninstallRegistryKey}" "QuietUninstallString" '"$INSTDIR\Uninstall.exe" /S'
-  WriteRegStr HKLM "${UninstallRegistryKey}" "UninstallString" "$INSTDIR\Uninstall.exe"
-  WriteRegStr HKLM "${UninstallRegistryKey}" "Publisher" "${Company}"
-  WriteRegStr HKLM "${UninstallRegistryKey}" "HelpLink" "$(MSG_SUPPORT_URL)"
-  WriteRegStr HKLM "${UninstallRegistryKey}" "URLInfoAbout" "$(MSG_HOME_URL)"
-
-  ;Store installation folder
-  WriteRegStr "${RegistryCat}" "${RegistryKey}" "${Product} Install Path" $INSTDIR
-SectionEnd
-
-;--------------------------------
-;Uninstaller Section
-Section "Uninstall"
-  ;Install for All Users
-  SetShellVarContext all
-
-  ;Game directories
-  RMDir /r "$INSTDIR\cfg"
-  RMDir /r "$INSTDIR\data"
-  RMDir /r "$INSTDIR\examples"
-
-  ;Temporary directories
-  RMDir /r "$INSTDIR\cache"
-  RMDir /r "$INSTDIR\unpack"
-
-  ;Client, configuration and misc files
-  Delete "$INSTDIR\client_default.cfg"
-  Delete "$INSTDIR\${Executable}"
-  Delete "$INSTDIR\configure.bat"
-  Delete "$INSTDIR\d3dcompiler_43.dll"
-  Delete "$INSTDIR\d3dx9_43.dll"
-  Delete "$INSTDIR\fmod.dll"
-  Delete "$INSTDIR\forum.url"
-  Delete "$INSTDIR\launch.bat"
-  Delete "$INSTDIR\msvcp100.dll"
-  Delete "$INSTDIR\msvcr100.dll"
-  Delete "$INSTDIR\nel_drv_direct3d_win_r.dll"
-  Delete "$INSTDIR\nel_drv_fmod_win_r.dll"
-  Delete "$INSTDIR\nel_drv_opengl_win_r.dll"
-  Delete "$INSTDIR\ryzom.ico"
-  Delete "$INSTDIR\ryzom.url"
-  Delete "$INSTDIR\Ryzom6.ico"
-
-  ;Delete uninstaller
-  Delete "$INSTDIR\Uninstall.exe"
-
-  MessageBox MB_YESNO "$(MSG_CONFIRM_DELETE_BACKUPS)" IDNO DontDeleteMiscFiles
-
-  ;Delete directory
-  RMDir /r "$INSTDIR"
-
-DontDeleteMiscFiles:
-
-  ;Delete directory if empty
-  RMDir "$INSTDIR"
-
-  ;Delete all shortcuts
-  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
-
-  ;Delete Start Menu shortcuts
-  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\${Product}.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\$(MSG_HOME_URL_TITLE).url"
-  Delete "$SMPROGRAMS\$MUI_TEMP\$(MSG_SUPPORT_URL_TITLE).url"
-  RMDir /r /REBOOTOK "$SMPROGRAMS\$MUI_TEMP"
-
-  ;Delete desktop shortcut
-  Delete "$DESKTOP\${Product}.lnk"
-
-  ;Delete registry
-  DeleteRegKey /ifempty "${RegistryCat}" "${RegistryKey}"
-  DeleteRegKey "${RegistryCat}" "${UninstallRegistryKey}"
-SectionEnd
-
-;--------------------------------
-;Installer Functions
-
-Function .onInit
-  !insertmacro MUI_LANGDLL_DISPLAY
-FunctionEnd
-
-;--------------------------------
-;Uninstaller Functions
-
-Function un.onInit
-  !insertmacro MUI_UNGETLANGUAGE
-FunctionEnd
+;--------------------------------
+;Include Modern UI
+!include "MUI2.nsh"
+
+;--------------------------------
+;General
+!define Company "Nevrax"
+!define Product "Ryzom"
+!define Version "2.1.0"
+!define Patch "661"
+!define RegistryCat "HKLM"
+!define RegistryKey "Software\${Company}\${Product}"
+!define Executable "client_ryzom_rd.exe"
+!define DstDir "Output"
+!define SrcDir "Ryzom"
+!define Installer "ryzom_setup_${Patch}.exe"
+
+;Registry key for uninstaller
+!define UninstallRegistryRoot "Software\Microsoft\Windows\CurrentVersion\Uninstall"
+!define UninstallRegistryKey "${UninstallRegistryRoot}\${Product}"
+
+;Properly display all languages (Installer will not work on Windows 95, 98 or ME!)
+Unicode true
+
+;New XP style
+XPStyle on
+
+;Name and file
+Name "${Product}"
+OutFile "${DstDir}\${Installer}"
+
+;Default installation folder
+InstallDir "$PROGRAMFILES\${Product}"
+
+;Get installation folder from registry if available
+InstallDirRegKey "${RegistryCat}" "${RegistryKey}" "${Product} Install Path"
+
+;Request application privileges for Windows Vista
+RequestExecutionLevel admin
+
+;Best compression
+SetCompressor LZMA
+
+; ???
+AllowSkipFiles on
+
+;--------------------------------
+;Variables
+
+;Will be used later
+Var MUI_TEMP
+Var STARTMENU_FOLDER
+
+;--------------------------------
+;Interface Settings
+
+!define MUI_ICON "${SrcDir}\ryzom.ico"
+!define MUI_UNICON "${SrcDir}\ryzom.ico"
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "modern-header.bmp" ; optional
+!define MUI_WELCOMEFINISHPAGE_BITMAP "modern-wizard.bmp"
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP "modern-wizard.bmp"
+!define MUI_ABORTWARNING
+
+;Show all languages, despite user's codepage
+!define MUI_LANGDLL_ALLLANGUAGES
+
+;--------------------------------
+;Language Selection Dialog Settings
+
+;Remember the installer language
+!define MUI_LANGDLL_REGISTRY_ROOT "${RegistryCat}"
+!define MUI_LANGDLL_REGISTRY_KEY "${RegistryKey}"
+!define MUI_LANGDLL_REGISTRY_VALUENAME "Language"
+
+;--------------------------------
+;Pages
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_DIRECTORY
+
+;Start Menu Folder Page Configuration
+!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${RegistryCat}"
+!define MUI_STARTMENUPAGE_REGISTRY_KEY "${RegistryKey}"
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
+
+!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
+
+!insertmacro MUI_PAGE_INSTFILES
+
+!define MUI_FINISHPAGE_RUN "$INSTDIR\${Executable}"
+
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_WELCOME
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
+
+;--------------------------------
+;Languages
+
+!insertmacro MUI_LANGUAGE "English" ;first language is the default language
+!insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_LANGUAGE "German"
+;!insertmacro MUI_LANGUAGE "Spanish"
+
+;--------------------------------
+;Reserve Files
+
+;If you are using solid compression, files that are required before
+;the actual installation should be stored first in the data block,
+;because this will make your installer start faster.
+
+!insertmacro MUI_RESERVEFILE_LANGDLL
+
+;--------------------------------
+;Descriptions
+
+;French
+LangString MSG_SUPPORT_URL_TITLE       ${LANG_FRENCH}  "Support"
+LangString MSG_SUPPORT_URL             ${LANG_FRENCH}  "http://app.ryzom.com/app_forum/index.php?page=topic/view/22047/1&post149889=fr#1"
+LangString MSG_HOME_URL_TITLE          ${LANG_FRENCH}  "${Product} sur le Web"
+LangString MSG_HOME_URL                ${LANG_FRENCH}  "http://ryzom.fr"
+LangString MSG_CONFIRM_DELETE_BACKUPS  ${LANG_FRENCH}  "Voulez-vous supprimer vos fichiers de sauvegarde ? Appuyer sur Oui pour effacer vos fichiers de sauvegarde."
+
+;English
+LangString MSG_SUPPORT_URL_TITLE       ${LANG_ENGLISH} "Support"
+LangString MSG_SUPPORT_URL             ${LANG_ENGLISH} "http://app.ryzom.com/app_forum/index.php?page=topic/view/22047/1&post149889=en#1"
+LangString MSG_HOME_URL_TITLE          ${LANG_ENGLISH} "${Product} on the Web"
+LangString MSG_HOME_URL                ${LANG_ENGLISH} "http://ryzom.com"
+LangString MSG_CONFIRM_DELETE_BACKUPS  ${LANG_ENGLISH} "Deleting Save Files? Click Yes to delete your own save files."
+
+;German
+LangString MSG_SUPPORT_URL_TITLE       ${LANG_GERMAN}  "Support"
+LangString MSG_SUPPORT_URL             ${LANG_GERMAN}  "http://app.ryzom.com/app_forum/index.php?page=topic/view/22047/1&post149889=de#1"
+LangString MSG_HOME_URL_TITLE          ${LANG_GERMAN}  "${Product} im Internet"
+LangString MSG_HOME_URL                ${LANG_GERMAN}  "http://ryzom.de"
+LangString MSG_CONFIRM_DELETE_BACKUPS  ${LANG_GERMAN}  "Gespeicherte Dateien löschen? Klicke Ja um die eigenen Dateien zu löschen."
+
+;--------------------------------
+;Installer Sections
+
+!macro CreateInternetShortcut FILENAME URL ICONFILE
+  WriteINIStr "${FILENAME}.url" "InternetShortcut" "URL" "${URL}"
+  WriteINIStr "${FILENAME}.url" "InternetShortcut" "IconFile" "${ICONFILE}"
+  WriteINIStr "${FILENAME}.url" "InternetShortcut" "IconIndex" "0"
+!macroend
+
+; ----------------------------------------
+; Default section
+Section
+  ;Install for All Users
+  SetShellVarContext all
+
+  ;Game directories
+  SetOutPath "$INSTDIR\cfg"
+  File /r "${SrcDir}\cfg\*.*"
+
+  SetOutPath "$INSTDIR\data"
+  File /r "${SrcDir}\data\*.*"
+
+  SetOutPath "$INSTDIR\examples"
+  File /r "${SrcDir}\examples\*.*"
+
+  SetOutPath "$INSTDIR\user"
+  File /r "${SrcDir}\user\*.*"
+
+  SetOutPath "$INSTDIR"
+
+  ;Client, configuration and misc files
+  File "${SrcDir}\client_default.cfg"
+  File "${SrcDir}\${Executable}"
+  File "${SrcDir}\configure.bat"
+  File "${SrcDir}\d3dcompiler_43.dll"
+  File "${SrcDir}\d3dx9_43.dll"
+  File "${SrcDir}\fmod.dll"
+  File "${SrcDir}\forum.url"
+  File "${SrcDir}\launch.bat"
+  File "${SrcDir}\msvcp100.dll"
+  File "${SrcDir}\msvcr100.dll"
+  File "${SrcDir}\nel_drv_direct3d_win_r.dll"
+  File "${SrcDir}\nel_drv_fmod_win_r.dll"
+  File "${SrcDir}\nel_drv_opengl_win_r.dll"
+  File "${SrcDir}\ryzom.ico"
+  File "${SrcDir}\ryzom.url"
+  File "${SrcDir}\Ryzom6.ico"
+
+  ;Create uninstaller
+  WriteUninstaller "$INSTDIR\Uninstall.exe"
+
+  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+
+  ;Create shortcuts in Start Menu
+  CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\${Product}.lnk" "$INSTDIR\${Executable}"
+
+  ;Create URLs
+  !insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\$(MSG_SUPPORT_URL_TITLE)" "$(MSG_SUPPORT_URL)" "$INSTDIR\ryzom.ico"
+  !insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\$(MSG_HOME_URL_TITLE)" "$(MSG_HOME_URL)" "$INSTDIR\ryzom.ico"
+
+  !insertmacro MUI_STARTMENU_WRITE_END
+
+  ;Shortcut on desktop
+  CreateShortCut "$DESKTOP\${Product}.lnk" "$INSTDIR\${Executable}"
+
+  ;Add/Remove Program entry
+  WriteRegStr HKLM "${UninstallRegistryKey}" "DisplayIcon" "$INSTDIR\${Executable},0"
+  WriteRegStr HKLM "${UninstallRegistryKey}" "DisplayName" "${Product}"
+  WriteRegStr HKLM "${UninstallRegistryKey}" "DisplayVersion" "${Version}"
+  WriteRegStr HKLM "${UninstallRegistryKey}" "InstallLocation" "$INSTDIR"
+  WriteRegStr HKLM "${UninstallRegistryKey}" "QuietUninstallString" '"$INSTDIR\Uninstall.exe" /S'
+  WriteRegStr HKLM "${UninstallRegistryKey}" "UninstallString" "$INSTDIR\Uninstall.exe"
+  WriteRegStr HKLM "${UninstallRegistryKey}" "Publisher" "${Company}"
+  WriteRegStr HKLM "${UninstallRegistryKey}" "HelpLink" "$(MSG_SUPPORT_URL)"
+  WriteRegStr HKLM "${UninstallRegistryKey}" "URLInfoAbout" "$(MSG_HOME_URL)"
+
+  ;Store installation folder
+  WriteRegStr "${RegistryCat}" "${RegistryKey}" "${Product} Install Path" $INSTDIR
+SectionEnd
+
+;--------------------------------
+;Uninstaller Section
+Section "Uninstall"
+  ;Install for All Users
+  SetShellVarContext all
+
+  ;Game directories
+  RMDir /r "$INSTDIR\cfg"
+  RMDir /r "$INSTDIR\data"
+  RMDir /r "$INSTDIR\examples"
+
+  ;Temporary directories
+  RMDir /r "$INSTDIR\cache"
+  RMDir /r "$INSTDIR\unpack"
+
+  ;Client, configuration and misc files
+  Delete "$INSTDIR\client_default.cfg"
+  Delete "$INSTDIR\${Executable}"
+  Delete "$INSTDIR\configure.bat"
+  Delete "$INSTDIR\d3dcompiler_43.dll"
+  Delete "$INSTDIR\d3dx9_43.dll"
+  Delete "$INSTDIR\fmod.dll"
+  Delete "$INSTDIR\forum.url"
+  Delete "$INSTDIR\launch.bat"
+  Delete "$INSTDIR\msvcp100.dll"
+  Delete "$INSTDIR\msvcr100.dll"
+  Delete "$INSTDIR\nel_drv_direct3d_win_r.dll"
+  Delete "$INSTDIR\nel_drv_fmod_win_r.dll"
+  Delete "$INSTDIR\nel_drv_opengl_win_r.dll"
+  Delete "$INSTDIR\ryzom.ico"
+  Delete "$INSTDIR\ryzom.url"
+  Delete "$INSTDIR\Ryzom6.ico"
+
+  ;Delete uninstaller
+  Delete "$INSTDIR\Uninstall.exe"
+
+  MessageBox MB_YESNO "$(MSG_CONFIRM_DELETE_BACKUPS)" IDNO DontDeleteMiscFiles
+
+  ;Delete directory
+  RMDir /r "$INSTDIR"
+
+DontDeleteMiscFiles:
+
+  ;Delete directory if empty
+  RMDir "$INSTDIR"
+
+  ;Delete all shortcuts
+  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+
+  ;Delete Start Menu shortcuts
+  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\${Product}.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\$(MSG_HOME_URL_TITLE).url"
+  Delete "$SMPROGRAMS\$MUI_TEMP\$(MSG_SUPPORT_URL_TITLE).url"
+  RMDir /r /REBOOTOK "$SMPROGRAMS\$MUI_TEMP"
+
+  ;Delete desktop shortcut
+  Delete "$DESKTOP\${Product}.lnk"
+
+  ;Delete registry
+  DeleteRegKey /ifempty "${RegistryCat}" "${RegistryKey}"
+  DeleteRegKey "${RegistryCat}" "${UninstallRegistryKey}"
+SectionEnd
+
+;--------------------------------
+;Installer Functions
+
+Function .onInit
+  !insertmacro MUI_LANGDLL_DISPLAY
+FunctionEnd
+
+;--------------------------------
+;Uninstaller Functions
+
+Function un.onInit
+  !insertmacro MUI_UNGETLANGUAGE
+FunctionEnd

nel/CMakeLists.txt

@@ -10,14 +10,20 @@ IF(WIN32)
 ENDIF()
 
 IF(WITH_3D)
-  FIND_PACKAGE(FreeType)
+  IF(HUNTER_ENABLED)
+    HUNTER_ADD_PACKAGE(freetype)
+    FIND_PACKAGE(freetype CONFIG REQUIRED)
+    SET(FREETYPE_LIBRARIES freetype::freetype)
+  ELSE()
+    FIND_PACKAGE(FreeType)
+  ENDIF() #hunter
 
   IF(WITH_NEL_CEGUI)
     FIND_PACKAGE(CEGUI)
   ENDIF()
 ENDIF()
 
-IF(WITH_SOUND)
+IF(WITH_SOUND AND NOT HUNTER_ENABLED)
   FIND_PACKAGE(Ogg)
   FIND_PACKAGE(Vorbis)
   IF(WITH_FFMPEG)

nel/include/nel/gui/group_html.h

@@ -85,7 +85,10 @@ namespace NLGUI
 			/// Language code of the browser( e.g.: en, hu )
 			std::string languageCode;
 			/// List of domains the widget can consider secure.
-			std::vector< std::string > trustedDomains;
+			std::vector<std::string> trustedDomains;
+			/// Web server
+			std::string webServer;
+			std::string webServerDomain;
 			/// Maximum concurrent MultiCurl connections per CGroupHTML instance
 			sint32 curlMaxConnections;
 
@@ -969,6 +972,7 @@ namespace NLGUI
 
 		// stop all curl downalods (html and data)
 		void releaseDownloads();
+		void releaseDataDownloads();
 		void checkDownloads();
 
 		// _CurlWWW download finished

nel/include/nel/gui/group_menu.h

@@ -188,6 +188,10 @@ namespace NLGUI
 		// Hide a line.
 		void setHiddenLine(uint line,  bool h);
 
+		// Highlight single line
+		void setSelected(uint line) { _Selected = line < _Lines.size() ? line : -1; }
+		void clearSelected() { _Selected = -1; }
+
 		// Max Visible Line (-1 == no limit)
 		void setMaxVisibleLine(sint32 mvl);
 		sint32 getMaxVisibleLine() { return _MaxVisibleLine; }
@@ -280,10 +284,13 @@ namespace NLGUI
 		std::vector<CGroupSubMenu*>		_SubMenus;
 
 		CGroupMenu						*_GroupMenu; // Master parent
+		sint32							_MouseOver;
 		sint32							_Selected;
 
 		sint32							_MaxVisibleLine; // -1 == no limit
 
+		bool							_ScrollToView;
+
 		friend class CGroupMenu;
 	private:
 		/** Clone this menu, and set its new father
@@ -371,6 +378,10 @@ namespace NLGUI
 		// Gray a line on the RootMenu
 		void	setGrayedLine(uint line, bool g);
 
+		// Highlight single line
+		void setSelected(uint line) { if (_RootMenu) _RootMenu->setSelected(line); }
+		void clearSelected() { if(_RootMenu) _RootMenu->clearSelected(); }
+
 		CGroupSubMenu	*getRootMenu() const { return _RootMenu; }
 
 		// Max Visible Line (-1 == no limit)

nel/include/nel/gui/interface_element.h

@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
@@ -383,7 +383,6 @@ namespace NLGUI
 		void dummySet(const std::string &value);
 
 	public:
-
 		// export some properties
 		REFLECT_EXPORT_START(CInterfaceElement, CReflectable)
 			REFLECT_BOOL ("active", getActive, setActive);
@@ -398,6 +397,7 @@ namespace NLGUI
 			REFLECT_SINT32 ("h_real", getHReal, dummySet);
 			REFLECT_STRING ("id", getIdByValue, dummySet);
 			REFLECT_STRING ("sizeref", getSizeRefAsString, setSizeRef);
+			REFLECT_STRING ("posparent", getPosParent, setPosParent);
 			REFLECT_LUA_METHOD("updateCoords", luaUpdateCoords);
 			REFLECT_LUA_METHOD("invalidateCoords", luaInvalidateCoords);
 			REFLECT_LUA_METHOD("invalidateContent", luaInvalidateContent);
@@ -524,6 +524,8 @@ namespace NLGUI
 		void parseSizeParent( const std::string &id );
 		void setSizeParent( const std::string &id );
 		void getSizeParent( std::string &id ) const;
+
+		std::string getPosParent() const;
 		
 		void setSerializable( bool b ){ serializable = b; }
 		bool IsSerializable() const{ return serializable; }

nel/include/nel/gui/view_text.h

@@ -118,9 +118,11 @@ namespace NLGUI
 		// Force only a subset of letter to be displayed. Default is 0/0xFFFFFFFF
 		void enableStringSelection(uint start, uint end);
 		void disableStringSelection();
+		void setShadowInSelection(bool s) { m_DisableShadowInSelection = !s; }
+		bool getShadowInSelection() const { return !m_DisableShadowInSelection; }
 
-		/// Get
-		std::string		getText() const { return _HardText.empty() ? _Text : _HardText; }
+		/// Get displayed text
+		std::string		getText() const { return _Text; }
 #ifdef RYZOM_LUA_UCSTRING
 		ucstring		getTextAsUtf16() const; // Compatibility
 		ucstring		getHardTextAsUtf16() const; // Compatibility
@@ -188,6 +190,7 @@ namespace NLGUI
 		/// From a line number, get the character at which it ends (not including any '\n' ), or -1 if invalid
 		void getLineEndIndex(uint line, sint &index, bool &endOfPreviousLine) const;
 
+		/// If localized, return localization key (ie "uiLanguage"), else return displayed text.
 		std::string getHardText() const { return _HardText.empty() ? _Text : _HardText; }
 		void        setHardText (const std::string &ht); //< Localizes strings starting with "ui"
 #ifdef RYZOM_LUA_UCSTRING
@@ -448,6 +451,7 @@ namespace NLGUI
 		bool	_StrikeThrough : 1;
 		bool    _ContinuousUpdate : 1;
 		bool	_Setuped : 1;
+		bool	m_DisableShadowInSelection : 1;
 
 		uint	_TextSelectionStart;
 		uint	_TextSelectionEnd;

nel/include/nel/gui/widget_manager.h

@@ -654,6 +654,8 @@ namespace NLGUI
 		bool _GroupSelection;
 		bool multiSelection;
 		uint32 _WidgetCount;
+
+		std::set<std::string> m_LoggedMissingElement;
 	};
 
 }

nel/include/nel/misc/cdb.h

@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
@@ -67,7 +68,7 @@ public:
 		S17, S18, S19, S20, S21, S22, S23, S24, S25, S26, S27, S28, S29, S30, S31, S32,
 		S33, S34, S35, S36, S37, S38, S39, S40, S41, S42, S43, S44, S45, S46, S47, S48,
 		S49, S50, S51, S52, S53, S54, S55, S56, S57, S58, S59, S60, S61, S62, S63, S64,
-		TEXT, Nb_Prop_Type
+		TEXT, PACKED, Nb_Prop_Type
 	};
 
 

nel/include/nel/misc/cdb_leaf.h

@@ -3,6 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
+// Copyright (C) 2014  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
@@ -96,6 +97,7 @@ public:
 		_Property = 0;
 		_oldProperty = 0;
 		_Type = UNKNOWN;
+		m_Nullable = false;
 		_Changed = false;
 		_LastChangeGC = 0;
 	}
@@ -235,6 +237,9 @@ private:
 	/// property type
 	EPropType			_Type;
 
+	/// nullable
+	bool				m_Nullable;
+
 	/// true if this value has changed
 	bool				_Changed;
 

nel/include/nel/misc/entity_id.h

@@ -25,6 +25,7 @@
 #include "debug.h"
 #include "common.h"
 #include "stream.h"
+#include "wang_hash.h"
 
 namespace NLMISC {
 
@@ -577,6 +578,7 @@ public:
 };*/
 
 // Traits for hash_map using CEntityId
+#if 0
 struct CEntityIdHashMapTraits
 {
 	enum { bucket_size = 4, min_buckets = 8 };
@@ -596,7 +598,27 @@ struct CEntityIdHashMapTraits
 		return id1.getShortId() < id2.getShortId();
 	}
 };
-
+#else
+struct CEntityIdHashMapTraits
+{
+	enum { bucket_size = 4, min_buckets = 8 };
+	CEntityIdHashMapTraits() { }
+	size_t operator() (const NLMISC::CEntityId &id ) const
+	{
+		uint64 hash64 = id.getUniqueId();
+		if (sizeof(size_t) == 8)
+		{
+			return (size_t)NLMISC::wangHash64(hash64);
+		}
+		else
+		{
+			uint32 hash32a = NLMISC::wangHash((uint32)(hash64 & 0xFFFFFFFF));
+			uint32 hash32b = NLMISC::wangHash((uint32)(hash64 >> 32));
+			return hash32a ^ hash32b;
+		}
+	}
+};
+#endif
 
 /*inline std::stringstream &operator << (std::stringstream &__os, const CEntityId &__t)
 {

nel/include/nel/misc/factory.h

@@ -71,11 +71,8 @@ public:
 	 */
 	void registerClass(const KeyType &key, IFactoryRegister<BaseClass> *factoryRegister)
 	{
-		// TODO: Removed assert because of crash of fes in 2019. We need found why... (ulukyn)
-		//nlassert(_FactoryRegisters.find(key) == _FactoryRegisters.end());
-		//_FactoryRegisters.insert(std::make_pair(key, factoryRegister));
-		if (_FactoryRegisters.find(key) == _FactoryRegisters.end())
-			_FactoryRegisters.insert(std::make_pair(key, factoryRegister));
+		nlassert(_FactoryRegisters.find(key) == _FactoryRegisters.end());
+		_FactoryRegisters.insert(std::make_pair(key, factoryRegister));
 	}
 
 	/** Create a new instance of a factorable object.

nel/include/nel/misc/mutex.h

@@ -257,7 +257,12 @@ public:
 #	endif // NL_DEBUG
 #	endif // NL_NO_ASM
 #elif defined(NL_OS_MAC)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+// warning: 'OSAtomicCompareAndSwap32' is deprecated: first deprecated in macOS 10.12 -
+// Use std::atomic_compare_exchange_strong_explicit(std::memory_order_relaxed) from <atomic> instead
 		return OSAtomicCompareAndSwap32(0, 1, reinterpret_cast<volatile sint32 *>(lockPtr));
+#pragma clang diagnostic pop
 #elif defined(NL_OS_UNIX)
 		// GCC implements the same functionality using a builtin function
 		// http://gcc.gnu.org/onlinedocs/gcc/Atomic-Builtins.html

nel/include/nel/misc/ucstring.h

@@ -20,8 +20,6 @@
 #ifndef NL_UCSTRING_H
 #define NL_UCSTRING_H
 
-#define RYZOM_LUA_UCSTRING
-
 #include "types_nl.h"
 #include "debug.h"
 

nel/include/nel/net/message.h

@@ -1,6 +1,9 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
+// This source file has been modified by the following contributors:
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
@@ -92,6 +95,11 @@ public:
 	/// exchange memory data
 	void swap(CMessage &other);
 
+#ifdef NL_CPP14
+	/// Move operator
+	CMessage &operator=(CMessage &&other) noexcept { swap(other); return *this; }
+#endif
+
 	/// Sets the message type as a string and put it in the buffer if we are in writing mode
 	void setType (const std::string &name, TMessageType type=OneWay);
 

nel/include/nel/sound/audio_mixer_user.h

@@ -42,7 +42,7 @@
 
 // Current version is 2, Ryzom Live uses 1
 // Provided to allow compatibility with old binary files
-#define NLSOUND_SHEET_VERSION_BUILT 1
+#define NLSOUND_SHEET_VERSION_BUILT 2
 
 namespace NLLIGO {
 	class CLigoConfig;

nel/samples/3d/cegui/CMakeLists.txt

@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(nl_sample_cegui WIN32 ${SRC})
 
-ADD_DEFINITIONS(-DCEGUI_DATA_DIR="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_cegui/datafiles/\\"")
+TARGET_COMPILE_DEFINITIONS(nl_sample_cegui PRIVATE "CEGUI_DATA_DIR=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_cegui/datafiles/\"")
 
 INCLUDE_DIRECTORIES(${CEGUI_INCLUDE_DIRS})
 

nel/samples/3d/cluster_viewer/CMakeLists.txt

@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(nl_sample_clusterview WIN32 ${SRC})
 
-ADD_DEFINITIONS(-DCV_DIR="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_clusterview/\\"")
+TARGET_COMPILE_DEFINITIONS(nl_sample_clusterview PRIVATE "CV_DIR=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_clusterview/\"")
 
 TARGET_LINK_LIBRARIES(nl_sample_clusterview nelmisc nel3d)
 NL_ADD_RUNTIME_FLAGS(nl_sample_clusterview)

nel/samples/3d/font/CMakeLists.txt

@@ -2,8 +2,9 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(nl_sample_font WIN32 ${SRC})
 
-ADD_DEFINITIONS(-DFONT_DIR="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_font/\\"")
+TARGET_COMPILE_DEFINITIONS(nl_sample_font PRIVATE "FONT_DIR=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_font/\"")
 
+# TODO: hunter TARGET_LINK_LIBRARIES(nl_sample_font PRIVATE nelmisc nel3d)
 TARGET_LINK_LIBRARIES(nl_sample_font nelmisc nel3d)
 NL_DEFAULT_PROPS(nl_sample_font "NeL, Samples, 3D: Font")
 NL_ADD_RUNTIME_FLAGS(nl_sample_font)

nel/samples/3d/font_perf/CMakeLists.txt

@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(nl_sample_font_perf ${SRC})
 
-ADD_DEFINITIONS(-DFONT_DIR="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_font_perf/\\"")
+TARGET_COMPILE_DEFINITIONS(nl_sample_font_perf PRIVATE "FONT_DIR=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_font_perf/\"")
 
 TARGET_LINK_LIBRARIES(nl_sample_font_perf nelmisc nel3d)
 NL_DEFAULT_PROPS(nl_sample_font_perf "NeL, Samples, 3D: Font Performance Test")

nel/samples/georges/CMakeLists.txt

@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(nl_sample_georges ${SRC})
 
-ADD_DEFINITIONS(-DGF_DIR="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_georges/\\"")
+TARGET_COMPILE_DEFINITIONS(nl_sample_georges PRIVATE "GF_DIR=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_georges/\"")
 
 TARGET_LINK_LIBRARIES(nl_sample_georges nelgeorges nelmisc)
 NL_DEFAULT_PROPS(nl_sample_georges "NeL, Samples: Georges")

nel/samples/misc/configfile/CMakeLists.txt

@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(nl_sample_configfile ${SRC})
 
-ADD_DEFINITIONS(-DNL_SAMPLE_CFG="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_configfile/\\"")
+TARGET_COMPILE_DEFINITIONS(nl_sample_configfile PRIVATE "NL_SAMPLE_CFG=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_configfile/\"")
 
 TARGET_LINK_LIBRARIES(nl_sample_configfile nelmisc)
 NL_DEFAULT_PROPS(nl_sample_configfile "NeL, Samples, Misc: Config Files")

nel/samples/misc/i18n/CMakeLists.txt

@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(nl_sample_i18n ${SRC})
 
-ADD_DEFINITIONS(-DNL_LANG_DATA="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_i18n/\\"")
+TARGET_COMPILE_DEFINITIONS(nl_sample_i18n PRIVATE "NL_LANG_DATA=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_i18n/\"")
 
 TARGET_LINK_LIBRARIES(nl_sample_i18n nelmisc)
 NL_DEFAULT_PROPS(nl_sample_i18n "NeL, Samples, Misc: I18N")

nel/samples/net/chat/CMakeLists.txt

@@ -2,7 +2,9 @@ ADD_EXECUTABLE(nl_sample_chatclient client.cpp kbhit.cpp kbhit.h)
 
 ADD_EXECUTABLE(nl_sample_chatserver WIN32 server.cpp)
 
-ADD_DEFINITIONS(-DCHAT_DIR="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_chat/\\"")
+SET(CHAT_DIR "CHAT_DIR=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_chat/\"")
+TARGET_COMPILE_DEFINITIONS(nl_sample_chatclient PRIVATE ${CHAT_DIR})
+TARGET_COMPILE_DEFINITIONS(nl_sample_chatserver PRIVATE ${CHAT_DIR})
 
 TARGET_LINK_LIBRARIES(nl_sample_chatclient nelmisc nelnet)
 NL_DEFAULT_PROPS(nl_sample_chatclient "NeL, Samples, Net, Chat: Chat Client")

nel/samples/net/class_transport/CMakeLists.txt

@@ -2,7 +2,9 @@ ADD_EXECUTABLE(nl_sample_ct_ai_service WIN32 ai_service.cpp)
 
 ADD_EXECUTABLE(nl_sample_ct_gd_service WIN32 gd_service.cpp)
 
-ADD_DEFINITIONS(-DNL_CT_CFG="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_class_transport/\\"")
+SET(NL_CT_CFG "NL_CT_CFG=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_class_transport/\"")
+TARGET_COMPILE_DEFINITIONS(nl_sample_ct_ai_service PRIVATE ${NL_CT_CFG})
+TARGET_COMPILE_DEFINITIONS(nl_sample_ct_gd_service PRIVATE ${NL_CT_CFG})
 
 TARGET_LINK_LIBRARIES(nl_sample_ct_ai_service nelmisc nelnet)
 NL_DEFAULT_PROPS(nl_sample_ct_ai_service "NeL, Samples, Net, Class Transport: AI Service")

nel/samples/net/login_system/CMakeLists.txt

@@ -2,7 +2,9 @@ ADD_EXECUTABLE(nl_sample_ls_client client.cpp)
 
 ADD_EXECUTABLE(nl_sample_ls_fes WIN32 frontend_service.cpp)
 
-ADD_DEFINITIONS(-DNL_LS_CFG="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_login_system/\\"")
+SET(NL_LS_CFG "NL_LS_CFG=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_login_system/\"")
+TARGET_COMPILE_DEFINITIONS(nl_sample_ls_client PRIVATE ${NL_LS_CFG})
+TARGET_COMPILE_DEFINITIONS(nl_sample_ls_fes PRIVATE ${NL_LS_CFG})
 
 TARGET_LINK_LIBRARIES(nl_sample_ls_client nelmisc nelnet)
 NL_DEFAULT_PROPS(nl_sample_ls_client "NeL, Samples, Net, Login Service: LS Client")

nel/samples/net/udp/CMakeLists.txt

@@ -4,14 +4,18 @@ ADD_EXECUTABLE(nl_sample_udpclient client.cpp graph.cpp graph.h simlag.cpp simla
 
 ADD_EXECUTABLE(nl_sample_udpserver WIN32 bench_service.cpp receive_task.cpp receive_task.h)
 
-ADD_DEFINITIONS(-DUDP_DIR="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_udp/\\"")
+SET(UDP_DIR "UDP_DIR=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_udp/\"")
+TARGET_COMPILE_DEFINITIONS(nl_sample_udpclient PRIVATE ${UDP_DIR})
+TARGET_COMPILE_DEFINITIONS(nl_sample_udpserver PRIVATE ${UDP_DIR})
+
+TARGET_LINK_LIBRARIES(nl_sample_udpclient nelmisc nelnet)
+TARGET_LINK_LIBRARIES(nl_sample_udpserver nelmisc nelnet)
 
 IF(WITH_3D)
   ADD_DEFINITIONS(-DUSE_3D)
+  TARGET_LINK_LIBRARIES(nl_sample_udpclient nel3d)
 ENDIF()
 
-TARGET_LINK_LIBRARIES(nl_sample_udpclient nelmisc nelnet nel3d)
-TARGET_LINK_LIBRARIES(nl_sample_udpserver nelmisc nelnet)
 NL_DEFAULT_PROPS(nl_sample_udpclient "NeL, Samples, Net, UDP: UDP Client")
 NL_DEFAULT_PROPS(nl_sample_udpserver "NeL, Samples, Net, UDP: UDP Server")
 NL_ADD_RUNTIME_FLAGS(nl_sample_udpclient)

nel/samples/pacs/CMakeLists.txt

@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(nl_sample_pacs WIN32 ${SRC})
 
-ADD_DEFINITIONS(-DNL_PACS_DATA="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_pacs/\\"")
+TARGET_COMPILE_DEFINITIONS(nl_sample_pacs PRIVATE "NL_PACS_DATA=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_pacs/\"")
 
 TARGET_LINK_LIBRARIES(nl_sample_pacs nelmisc nelpacs nel3d)
 NL_DEFAULT_PROPS(nl_sample_pacs "NeL, Samples: PACS")

nel/samples/sound/sound_sources/CMakeLists.txt

@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(nl_sample_sound_sources ${SRC})
 
-ADD_DEFINITIONS(-DNL_SOUND_DATA="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_sound/\\"")
+TARGET_COMPILE_DEFINITIONS(nl_sample_sound_sources PRIVATE "NL_SOUND_DATA=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_sound/\"")
 
 TARGET_LINK_LIBRARIES(nl_sample_sound_sources nelmisc nelsound)
 NL_DEFAULT_PROPS(nl_sample_sound_sources "NeL, Samples: Sound: Sound Sources")

nel/src/3d/driver/opengl/driver_opengl_window.cpp

@@ -668,8 +668,9 @@ bool CDriverGL::setDisplay(nlWindow wnd, const GfxMode &mode, bool show, bool re
 	// Retrieve the WGL extensions before init the driver.
 
 	// Offscreen mode ?
-	if (_CurrentMode.OffScreen)
+	if (mode.OffScreen)
 	{
+		_CurrentMode.OffScreen = true;
 		if (!createWindow(mode)) return false;
 
 		HWND tmpHWND = _win;
@@ -2064,6 +2065,8 @@ bool CDriverGL::setMode(const GfxMode& amode)
 		// if window is visible, then also restore mouse relative position.
 		if (!mode.DisplayDevice.empty() && mode.DisplayDevice != current.DisplayDevice)
 		{
+			setWindowStyle(EWSWindowed);
+
 			int screen = DefaultScreen(_dpy);
 			Window root = RootWindow(_dpy, screen);
 			uint mouseX = mode.Width / 2;
@@ -2090,6 +2093,7 @@ bool CDriverGL::setMode(const GfxMode& amode)
 			XMoveWindow(_dpy, _win, newX, newY);
 			_WindowX = newX;
 			_WindowY = newY;
+			setWindowStyle(EWSFullscreen);
 		}
 	}
 #endif
@@ -3105,13 +3109,24 @@ void CDriverGL::setWindowSize(uint32 width, uint32 height)
 	SetWindowPos(_win, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, flags);
 
 	// init window width and height
-	RECT clientRect;
-	GetClientRect(_win, &clientRect);
-	_CurrentMode.Width = uint16(clientRect.right-clientRect.left);
-	_CurrentMode.Height = uint16(clientRect.bottom-clientRect.top);
-	GetWindowRect(_win, &clientRect);
-	_WindowX = clientRect.left;
-	_WindowY = clientRect.top;
+	if (_CurrentMode.Windowed)
+	{
+		// TODO: this gives wrong info for initial fullscreen window so limit for windowed only for now
+		RECT clientRect;
+		GetClientRect(_win, &clientRect);
+		_CurrentMode.Width = uint16(clientRect.right-clientRect.left);
+		_CurrentMode.Height = uint16(clientRect.bottom-clientRect.top);
+		GetWindowRect(_win, &clientRect);
+		_WindowX = clientRect.left;
+		_WindowY = clientRect.top;
+	}
+	else
+	{
+		_CurrentMode.Width = width;
+		_CurrentMode.Height = height;
+		_WindowX = 0;
+		_WindowY = 0;
+	}
 
 #elif defined(NL_OS_MAC)
 

nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp

@@ -152,7 +152,7 @@ static NLMISC::TKey virtualKeycodeToNelKey(unsigned short keycode)
 	return NLMISC::KeyNOKEY;
 }
 
-bool CCocoaEventEmitter::pasteTextFromClipboard(ucstring &text)
+bool CCocoaEventEmitter::pasteTextFromClipboard(std::string &text)
 {
 	NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
 	NSArray *classArray = [NSArray arrayWithObject:[NSString class]];
@@ -163,17 +163,17 @@ bool CCocoaEventEmitter::pasteTextFromClipboard(ucstring &text)
 	{
 		NSArray *objectsToPaste = [pasteboard readObjectsForClasses:classArray options:options];
 		NSString *nstext = [objectsToPaste objectAtIndex:0];
-		text.fromUtf8([nstext UTF8String]);
+		text = [nstext UTF8String];
 		return true;
 	}
 	return false;
 }
 
-bool CCocoaEventEmitter::copyTextToClipboard(const ucstring &text)
+bool CCocoaEventEmitter::copyTextToClipboard(const std::string &text)
 {
 	NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
 	[pasteboard clearContents];
-	NSArray *copiedObjects = [NSArray arrayWithObject:[NSString stringWithUTF8String:text.toUtf8().c_str()]];
+	NSArray *copiedObjects = [NSArray arrayWithObject:[NSString stringWithUTF8String:text.c_str()]];
 	[pasteboard writeObjects:copiedObjects];
 	return true;
 }

nel/src/3d/driver/opengl/mac/cocoa_event_emitter.h

@@ -21,6 +21,7 @@
 #ifndef NL_COCOA_EVENT_EMITTER_H
 #define NL_COCOA_EVENT_EMITTER_H
 
+#include <string.h>
 #include "nel/misc/event_emitter.h"
 #include "nel/misc/event_server.h"
 #include "nel/misc/events.h"
@@ -53,8 +54,8 @@ public:
 	virtual void submitEvents(CEventServer& server, bool allWindows);
 	bool         handleQuitRequest();
 
-	virtual bool copyTextToClipboard(const ucstring &text);
-	virtual bool pasteTextFromClipboard(ucstring &text);
+	virtual bool copyTextToClipboard(const std::string &text);
+	virtual bool pasteTextFromClipboard(std::string &text);
 };
 
 }

nel/src/3d/mesh_base.cpp

@@ -172,6 +172,8 @@ void	CMeshBase::serialMeshBase(NLMISC::IStream &f)
 	 * ***********************************************/
 
 	/*
+	Version 10:
+		- Ryzom Core release check
 	Version 9:
 		- _CollisionMeshGeneration
 	Version 8:
@@ -194,7 +196,7 @@ void	CMeshBase::serialMeshBase(NLMISC::IStream &f)
 	Version 0:
 		- 1st version.
 	*/
-	sint ver = f.serialVersion(9);
+	sint ver = f.serialVersion(10);
 
 	if (ver >= 2)
 	{

nel/src/3d/zone.cpp

@@ -442,6 +442,8 @@ void			CZone::serial(NLMISC::IStream &f)
 	 *	It can be loaded/called through CAsyncFileManager for instance
 	 * ***********************************************/
 	/*
+	Version 5:
+		- Ryzom Core release check
 	Version 4:
 		- PointLights
 	Version 3:
@@ -453,7 +455,7 @@ void			CZone::serial(NLMISC::IStream &f)
 	Version 0:
 		- base verison.
 	*/
-	uint	ver= f.serialVersion(4);
+	uint	ver= f.serialVersion(5);
 
 	// No more compatibility before version 3
 	if (ver<3)

nel/src/gui/css_background_renderer.cpp

@@ -428,7 +428,7 @@ namespace NLGUI
 
 		if (bg.repeatX == CSS_VALUE_ROUND)
 		{
-			sint numTiles = std::max(1, (sint)std::round((float)areaW / texW));
+			sint numTiles = std::max(1, (sint)std::ceil(((float)areaW / texW) - 0.5f));
 			texW = areaW / numTiles;
 			if (bg.height.isAuto() && bg.repeatY != CSS_VALUE_ROUND)
 			{
@@ -439,7 +439,7 @@ namespace NLGUI
 
 		if (bg.repeatY == CSS_VALUE_ROUND)
 		{
-			sint numTiles = std::max(1, (sint)std::round((float)areaH / texH));
+			sint numTiles = std::max(1, (sint)std::ceil(((float)areaH / texH) - 0.5f));
 			texH = areaH / numTiles;
 			if (bg.width.isAuto() && bg.repeatX != CSS_VALUE_ROUND)
 			{

nel/src/gui/css_length.cpp

@@ -30,9 +30,10 @@ namespace NLGUI
 
 bool CSSLength::parseValue(const std::string &value, bool allowPercent, bool allowNegative)
 {
-	static const std::set<std::string> knownUnits = {
+	static const std::string knownUnitsArr[] = {
 		"%", "rem", "em", "px", "pt", "vw", "vh", "vi", "vb", "vmin", "vmax"
 	};
+	static const std::set<std::string> knownUnits(knownUnitsArr, &knownUnitsArr[sizeof(knownUnitsArr) / sizeof(knownUnitsArr[0])]);
 
 	std::string::size_type pos = 0;
 	std::string::size_type len = value.size();
@@ -65,10 +66,17 @@ bool CSSLength::parseValue(const std::string &value, bool allowPercent, bool all
 	}
 
 	std::string unit = toLowerAscii(value.substr(pos));
+	if (!allowPercent && unit == "%")
+		return false;
+
 	if (knownUnits.count(unit))
 	{
 		std::string tmpstr = value.substr(0, pos);
-		return fromString(tmpstr, m_Value);
+		if (fromString(tmpstr, m_Value))
+		{
+			setUnit(unit);
+			return true;
+		}
 	}
 
 	return false;

nel/src/gui/ctrl_scroll.cpp

@@ -1432,6 +1432,8 @@ namespace NLGUI
 		childElement->getCorner(childX, childY, childHotSpot);
 		if (_Vertical)
 		{
+			// remove previous scroll offset from child
+			childY -= _Target->getOfsY();
 			sint32	maxHReal= _Target->getMaxHReal();
 			sint32	hReal=	  _Target->getHReal();
 			if(hReal > maxHReal)
@@ -1473,6 +1475,8 @@ namespace NLGUI
 		}
 		else
 		{
+			// remove previous scroll offset from child
+			childX -= _Target->getOfsX();
 			sint32	maxWReal= _Target->getMaxWReal();
 			sint32	wReal=	  _Target->getWReal();
 			if(wReal > maxWReal)

nel/src/gui/ctrl_text_button.cpp

@@ -137,7 +137,7 @@ namespace NLGUI
 		if( name == "hardtext" )
 		{
 			if( _ViewText != NULL )
-				return _ViewText->getText();
+				return _ViewText->getHardText();
 			else
 				return std::string( "" );
 		}
@@ -488,7 +488,7 @@ namespace NLGUI
 		xmlNewProp( node, BAD_CAST "wmargin", BAD_CAST toString( _WMargin ).c_str() );
 		xmlNewProp( node, BAD_CAST "wmin", BAD_CAST toString( _WMin ).c_str() );
 		xmlNewProp( node, BAD_CAST "hmin", BAD_CAST toString( _HMin ).c_str() );
-		xmlNewProp( node, BAD_CAST "hardtext", BAD_CAST _ViewText->getText().c_str() );
+		xmlNewProp( node, BAD_CAST "hardtext", BAD_CAST _ViewText->getHardText().c_str() );
 		xmlNewProp( node, BAD_CAST "text_y", BAD_CAST toString( _TextY ).c_str() );
 		xmlNewProp( node, BAD_CAST "text_x", BAD_CAST toString( _TextX ).c_str() );
 		xmlNewProp( node, BAD_CAST "text_underlined", BAD_CAST toString( _ViewText->getUnderlined() ).c_str() );

nel/src/gui/dbgroup_combo_box.cpp

@@ -745,6 +745,10 @@ namespace NLGUI
 			groupMenu->setY(pCB->getYReal());
 			groupMenu->setBaseY(pCB->getYReal());
 
+			sint selected = pCB->getSelection();
+			if (selected >= 0)
+				groupMenu->setSelected((uint)selected);
+
 			// Must ensure the combo menu has same windows priority than the combo box window
 			CInterfaceGroup		*rootWin= pCB->getRootWindow();
 			if(rootWin)

nel/src/gui/group_editbox.cpp

@@ -755,6 +755,9 @@ namespace NLGUI
 		// Display the selection if needed
 		if (_CurrSelection == this && _SelectCursorPos!=_CursorPos)
 		{
+			// flush so that selection quad is covering text
+			rVR.flush();
+
 			sint32	blankTextId= rVR.getBlankTextureId();
 			CRGBA	col= _BackSelectColor;
 			col.A= CWidgetManager::getInstance()->getGlobalColorForContent().A;

nel/src/gui/group_html.cpp

@@ -299,6 +299,11 @@ namespace NLGUI
 
 	void CGroupHTML::ImageDownloadCB::finish()
 	{
+		// Image setTexture will remove itself from Images while iterating over it.
+		// Do the swap to keep iterator safe.
+		std::vector<SImageInfo> vec;
+		vec.swap(Images);
+
 		// tmpdest file does not exist if download skipped (ie cache was used)
 		if (CFile::fileExists(tmpdest) || CFile::getFileSize(tmpdest) == 0)
 		{
@@ -322,7 +327,7 @@ namespace NLGUI
 			// to temp file temporarily. that forces driver to reload texture from disk
 			// ITexture::touch() seem not to do this.
 			// cache was updated, first set texture as temp file
-			for(std::vector<SImageInfo>::iterator it = Images.begin(); it != Images.end(); ++it)
+			for(std::vector<SImageInfo>::iterator it = vec.begin(); it != vec.end(); ++it)
 			{
 				SImageInfo &img = *it;
 				Parent->setImage(img.Image, tmpdest, img.Type);
@@ -339,7 +344,7 @@ namespace NLGUI
 		}
 
 		// even if image was cached, incase there was 'http://' image set to CViewBitmap
-		for(std::vector<SImageInfo>::iterator it = Images.begin(); it != Images.end(); ++it)
+		for(std::vector<SImageInfo>::iterator it = vec.begin(); it != vec.end(); ++it)
 		{
 			SImageInfo &img = *it;
 			Parent->setImage(img.Image, dest, img.Type);
@@ -403,8 +408,11 @@ namespace NLGUI
 	// Check if domain is on TrustedDomain
 	bool CGroupHTML::isTrustedDomain(const string &domain)
 	{
+		if (domain == options.webServerDomain)
+			return true;
+
 		vector<string>::iterator it;
-		it = find ( options.trustedDomains.begin(), options.trustedDomains.end(), domain);
+		it = find(options.trustedDomains.begin(), options.trustedDomains.end(), domain);
 		return it != options.trustedDomains.end();
 	}
 
@@ -1053,6 +1061,13 @@ namespace NLGUI
 			_CurlWWW = NULL;
 		}
 
+		releaseDataDownloads();
+	}
+
+	void CGroupHTML::releaseDataDownloads()
+	{
+		LOG_DL("Clear pointers to %d curls", Curls.size());
+
 		// remove all queued and already started downloads
 		for(std::list<CDataDownload*>::iterator it = Curls.begin(); it != Curls.end(); ++it)
 		{
@@ -3080,14 +3095,7 @@ namespace NLGUI
 
 		paragraphChange ();
 
-		// clear the pointer to the current image download since all the button are deleted
-		LOG_DL("Clear pointers to %d curls", Curls.size());
-
-		// remove image refs from downloads
-		/*for(std::list<CDataDownload>::iterator it = Curls.begin(); it != Curls.end(); ++it)
-		{
-			it->imgs.clear();
-		}*/
+		releaseDataDownloads();
 	}
 
 	// ***************************************************************************
@@ -3416,6 +3424,16 @@ namespace NLGUI
 			string finalUrl;
 			bool isLocal = lookupLocalFile (finalUrl, _URL.c_str(), true);
 
+			if (!isLocal && _URL.c_str()[0] == '/')
+			{
+				if (options.webServer.empty())
+				{
+					// Try again later
+					return;
+				}
+				finalUrl = options.webServer + finalUrl;
+			}
+
 			_URL = finalUrl;
 
 			CUrlParser uri (_URL);

nel/src/gui/group_menu.cpp

@@ -129,9 +129,11 @@ namespace NLGUI
 		_SelectionView = NULL;
 		_GroupList = NULL;
 		_GroupMenu = NULL;
+		_MouseOver = -1;
 		_Selected = -1;
 		_MaxVisibleLine = -1;
 		_ScrollBar = NULL;
+		_ScrollToView = false;
 	}
 
 	// ------------------------------------------------------------------------------------------------
@@ -589,6 +591,7 @@ namespace NLGUI
 				_GroupList->setMaxH(widgetMaxH*_MaxVisibleLine+_GroupList->getSpace()*(_MaxVisibleLine-1));
 				if (_ScrollBar == NULL)
 				{
+					_ScrollToView = true;
 					_ScrollBar = new CCtrlScroll(CViewBase::TCtorParam());
 					_ScrollBar->setParent (this);
 					_ScrollBar->setParentPos (_GroupList);
@@ -882,8 +885,8 @@ namespace NLGUI
 		_SelectionView->setH (8);
 		_SelectionView->setY (4);
 
-
-		if (_Selected != -1 && _Lines[_Selected].ViewText != NULL)
+		sint highlight = _MouseOver != -1 ? _MouseOver : _Selected;
+		if (highlight != -1 && _Lines[highlight].ViewText != NULL)
 		{
 			CRGBA col= _GroupMenu->_HighLightOver;
 
@@ -891,11 +894,21 @@ namespace NLGUI
 			_SelectionView->setModulateGlobalColor(getModulateGlobalColor());
 
 			// get refElm and refElmYReal
-			GET_REF_ELM(_Selected)
+			GET_REF_ELM(highlight)
 
 			_SelectionView->setH (refElmHReal);
 			_SelectionView->setY (refElmYReal - this->getYReal());
 		}
+
+		// initial scroll after becoming active
+		if (_ScrollBar && _ScrollToView)
+		{
+			_ScrollToView = false;
+			if (_Selected != -1 && _Lines[_Selected].ViewText != NULL)
+				_ScrollBar->ensureVisible(_Lines[_Selected].ViewText, Hotspot_Tx, Hotspot_Mx);
+			else
+				_ScrollBar->setTrackPos(_GroupList->getHReal());
+		}
 	}
 
 	// ------------------------------------------------------------------------------------------------
@@ -911,12 +924,12 @@ namespace NLGUI
 			(xMouse < (_XReal + _WReal))&&
 			(yMouse > _YReal) &&
 			(yMouse <= (_YReal+ _HReal))))
-			_Selected= -1;
+			_MouseOver = -1;
 
 	//	CViewRenderer &rVR = *CViewRenderer::getInstance();
 
 		// Highlight (background under the selection)
-		if (_Selected != -1)
+		if (_MouseOver != -1 || _Selected != -1)
 		{
 			// display hightlight
 			if(_GroupMenu->_HighLightOver.A > 0)
@@ -946,7 +959,7 @@ namespace NLGUI
 				}
 				else
 				{
-					if (i == _Selected) // Colors when the text is selected
+					if (i == _MouseOver) // Colors when the text is selected
 					{
 						_Lines[i].ViewText->Over = true;
 						_Lines[i].ViewText->setColor (_Lines[i].ViewText->OldColorOver);
@@ -984,7 +997,7 @@ namespace NLGUI
 		if (event.getType() == NLGUI::CEventDescriptor::mouse)
 		{
 			const NLGUI::CEventDescriptorMouse &eventDesc = (const NLGUI::CEventDescriptorMouse &)event;
-			_Selected = -1;
+			_MouseOver = -1;
 
 			// TODO First check sub menus that can be not in the area of this menu
 
@@ -994,6 +1007,9 @@ namespace NLGUI
 				(eventDesc.getY() <= (_YReal+ _HReal))))
 				return false;
 
+			if (_ScrollBar && _ScrollBar->isIn(eventDesc.getX(), eventDesc.getY()))
+				return false;
+
 			uint32 i = 0;
 			for (i = 0; i < _Lines.size(); ++i)
 			{
@@ -1008,7 +1024,7 @@ namespace NLGUI
 						if ((eventDesc.getY() > refElmYReal) &&
 							(eventDesc.getY() <= (refElmYReal + refElmHReal + _GroupList->getSpace())))
 						{
-							_Selected = i;
+							_MouseOver = i;
 							break;
 						}
 					}
@@ -1018,16 +1034,16 @@ namespace NLGUI
 			if (eventDesc.getEventTypeExtended() == NLGUI::CEventDescriptorMouse::mouseleftup)
 			{
 				// If a line is selected and the line is not grayed
-				if ((_Selected != -1) && (!_Lines[i].ViewText->getGrayed()))
+				if ((_MouseOver != -1) && (!_Lines[i].ViewText->getGrayed()))
 				{
 
-					CAHManager::getInstance()->runActionHandler (	_Lines[_Selected].AHName,
+					CAHManager::getInstance()->runActionHandler (	_Lines[_MouseOver].AHName,
 											CWidgetManager::getInstance()->getCtrlLaunchingModal(),
-											_Lines[_Selected].AHParams );
+											_Lines[_MouseOver].AHParams );
 
-					if (_SubMenus[_Selected] != NULL)
+					if (_SubMenus[_MouseOver] != NULL)
 					{
-						openSubMenu (_Selected);
+						openSubMenu (_MouseOver);
 					}
 					else
 					{
@@ -1046,11 +1062,11 @@ namespace NLGUI
 			if (eventDesc.getEventTypeExtended() == NLGUI::CEventDescriptorMouse::mouserightup)
 			{
 				// If a line is selected and the line is not grayed and has right click action handler
-				if ((_Selected != -1) && (!_Lines[i].ViewText->getGrayed()) && !_Lines[_Selected].AHRightClick.empty())
+				if ((_MouseOver != -1) && (!_Lines[i].ViewText->getGrayed()) && !_Lines[_MouseOver].AHRightClick.empty())
 				{
-					CAHManager::getInstance()->runActionHandler (	_Lines[_Selected].AHRightClick,
+					CAHManager::getInstance()->runActionHandler (	_Lines[_MouseOver].AHRightClick,
 											CWidgetManager::getInstance()->getCtrlLaunchingModal(),
-											_Lines[_Selected].AHRightClickParams );
+											_Lines[_MouseOver].AHRightClickParams );
 					return true;
 				}
 			}
@@ -1408,7 +1424,14 @@ namespace NLGUI
 		_Lines.erase(_Lines.begin() + index);
 
 		//invalidate selection
-		_Selected = -1;
+		_MouseOver = -1;
+		if (_Selected != -1)
+		{
+			if (_Selected == index)
+				_Selected = -1;
+			else if (_Selected > index)
+				_Selected--;
+		}
 
 		if(_SubMenus[index])
 		{
@@ -1442,6 +1465,7 @@ namespace NLGUI
 	// ------------------------------------------------------------------------------------------------
 	void	CGroupSubMenu::reset()
 	{
+		_Selected = -1;
 		uint lineCount = (uint)_Lines.size();
 		for(sint k = lineCount - 1; k >= 0; --k)
 		{
@@ -1652,10 +1676,10 @@ namespace NLGUI
 			}
 		}
 
-		if(_ScrollBar && _GroupList)
-			_ScrollBar->setTrackPos(_GroupList->getHReal());
-
 		CGroupFrame::setActive(state);
+
+		// handle scrolling in next updateCoords() call
+		_ScrollToView = true;
 	}
 
 	// ------------------------------------------------------------------------------------------------
@@ -2526,6 +2550,10 @@ namespace NLGUI
 
 		CGroupFrame::setActive (state);
 
+		// skip rest if being hidden
+		if (!state)
+			return;
+
 		// must recompute now the pos of the menu
 		uint32 i;
 		for (i = 0; i < _ChildrenGroups.size(); ++i)

nel/src/gui/interface_element.cpp

@@ -438,6 +438,14 @@ namespace NLGUI
 		parseSizeRef(sizeref.c_str());
 	}
 
+	// ------------------------------------------------------------------------------------------------
+	std::string CInterfaceElement::getPosParent() const
+	{
+		std::string id;
+		getPosParent(id);
+		return id;
+	}
+
 	// ------------------------------------------------------------------------------------------------
 	std::string CInterfaceElement::getSizeRefAsString() const
 	{

nel/src/gui/libwww.cpp

@@ -208,9 +208,10 @@ namespace NLGUI
 	// ***************************************************************************
 	bool getCssLength (float &value, std::string &unit, const std::string &str, bool neg)
 	{
-		static const std::set<std::string> knownUnits = {
+		static const std::string knownUnitsArr[] = {
 			"%", "rem", "em", "px", "pt", "vw", "vh", "vi", "vb", "vmin", "vmax"
 		};
+		static const std::set<std::string> knownUnits(knownUnitsArr, &knownUnitsArr[sizeof(knownUnitsArr) / sizeof(knownUnitsArr[0])]);
 
 		std::string::size_type pos = 0;
 		std::string::size_type len = str.size();

nel/src/gui/view_bitmap.cpp

@@ -481,7 +481,13 @@ namespace NLGUI
 		}
 		else
 		{
-			_HtmlDownload = NULL;
+			if (_HtmlDownload)
+			{
+				CGroupHTML *groupHtml = dynamic_cast<CGroupHTML*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:webig:content:html"));
+				if (groupHtml)
+					groupHtml->removeImageDownload(_HtmlDownload, dynamic_cast<CViewBase*>(this));
+				_HtmlDownload = NULL;
+			}
 			_TextureId.setTexture (TxName.c_str (), _TxtOffsetX, _TxtOffsetY, _TxtWidth, _TxtHeight, false);
 		}
 	}

nel/src/gui/view_text.cpp

@@ -99,6 +99,7 @@ namespace NLGUI
 		_TextSelection= false;
 		_TextSelectionStart= 0;
 		_TextSelectionEnd= std::numeric_limits<uint>::max();
+		m_DisableShadowInSelection = true;
 
 		_InvalidTextContext= true;
 		_FirstLineX = 0;
@@ -1029,10 +1030,7 @@ namespace NLGUI
 
 			if (_MultiLine)
 			{
-				if (NLMISC::startsWith(propPtr, "u:"))
-					setTextFormatTaged(std::string(propPtr).substr(2));
-				else
-					setTextFormatTaged(CI18N::get(propPtr));
+				setTextFormatTaged(CI18N::get(propPtr));
 			}
 			else
 			{
@@ -1191,9 +1189,10 @@ namespace NLGUI
 		{
 			if (_Lines.empty()) return;
 
+			bool drawShadow = !(_TextSelection && m_DisableShadowInSelection);
 			TextContext->setHotSpot (UTextContext::BottomLeft);
-			TextContext->setShaded (_Shadow);
-			TextContext->setShadeOutline (_ShadowOutline);
+			TextContext->setShaded (_Shadow && drawShadow);
+			TextContext->setShadeOutline (_ShadowOutline && drawShadow);
 			TextContext->setShadeColor (shcol);
 			TextContext->setShadeExtent (_ShadowX*oow, _ShadowY*ooh);
 			TextContext->setFontSize (_FontSize*_Scale);
@@ -1323,9 +1322,10 @@ namespace NLGUI
 		{
 			nlassert(_Index != 0xFFFFFFFF);
 
+			bool drawShadow = !(_TextSelection && m_DisableShadowInSelection);
 			TextContext->setHotSpot (UTextContext::BottomLeft);
-			TextContext->setShaded (_Shadow);
-			TextContext->setShadeOutline (_ShadowOutline);
+			TextContext->setShaded (_Shadow && drawShadow);
+			TextContext->setShadeOutline (_ShadowOutline && drawShadow);
 			TextContext->setShadeColor (shcol);
 			TextContext->setShadeExtent (_ShadowX*oow, _ShadowY*ooh);
 			TextContext->setFontSize (_FontSize*_Scale);
@@ -1468,7 +1468,7 @@ namespace NLGUI
 			}
 		}
 
-		nlassert(_Text.empty() || ((_Localized && (NLMISC::startsWith(getText(), "ui"))) == (_HardText.empty() == _Text.empty())));
+		nlassert(_Text.empty() || ((_Localized && (NLMISC::startsWith(getHardText(), "ui"))) == (_HardText.empty() == _Text.empty())));
 	}
 
 	// ***************************************************************************

nel/src/gui/widget_manager.cpp

@@ -435,7 +435,22 @@ namespace NLGUI
 			CWidgetManager::SMasterGroup &rMG = _MasterGroups[nMasterGroup];
 			CInterfaceElement *pIEL = rMG.Group->getElement (sEltId);
 			if (pIEL != NULL)
+			{
+#if !FINAL_VERSION
+				if (m_LoggedMissingElement.find(sEltId) != m_LoggedMissingElement.end())
+				{
+					m_LoggedMissingElement.erase(sEltId);
+					nlwarning("Previously missing UI element with Id '%s' was now found!", sEltId.c_str());
+				}
+#endif
 				return pIEL;
+			}
+		}
+
+		if (m_LoggedMissingElement.find(sEltId) == m_LoggedMissingElement.end())
+		{
+			m_LoggedMissingElement.insert(sEltId);
+			nlwarning("Could not find UI element from Id '%s'...", sEltId.c_str());
 		}
 		return NULL;
 	}
@@ -1196,7 +1211,7 @@ namespace NLGUI
 
 					// Copy all aspects to the view
 					vtDst->setLocalized (vtSrc->isLocalized());
-					vtDst->setText (vtSrc->getText());
+					vtDst->setText (vtSrc->getHardText());
 					vtDst->setFontSize (vtSrc->getFontSize());
 					vtDst->setColor (vtSrc->getColor());
 					vtDst->setModulateGlobalColor(vtSrc->getModulateGlobalColor());

nel/src/misc/CMakeLists.txt

@@ -183,6 +183,21 @@ IF(WITH_GTK)
   ENDIF()
 ENDIF()
 
+IF(HUNTER_ENABLED)
+  HUNTER_ADD_PACKAGE(Jpeg)
+  FIND_PACKAGE(JPEG CONFIG REQUIRED)
+  SET(JPEG_LIBRARY JPEG::jpeg)
+
+  HUNTER_ADD_PACKAGE(giflib)
+  FIND_PACKAGE(giflib CONFIG REQUIRED)
+  SET(GIF_LIBRARY giflib::giflib)
+
+  HUNTER_ADD_PACKAGE(PNG)
+  FIND_PACKAGE(PNG CONFIG REQUIRED)
+  SET(PNG_LIBRARY   PNG::png)
+  SET(PNG_LIBRARIES PNG::png)
+ENDIF()
+
 IF(JPEG_FOUND)
   INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR})
   ADD_DEFINITIONS(-DUSE_JPEG)
@@ -202,6 +217,7 @@ ELSE()
   TARGET_LINK_LIBRARIES(nelmisc ${PNG_LIBRARY})
 ENDIF()
 
+#TODO: needed for hunter aswell?
 IF(UNIX)
   TARGET_LINK_LIBRARIES(nelmisc -lc -ldl)
   IF(APPLE)

nel/src/misc/cdb_leaf.cpp

@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
@@ -51,6 +51,18 @@ namespace NLMISC{
 //-----------------------------------------------
 void CCDBNodeLeaf::init(  xmlNodePtr node, IProgressCallback &/* progressCallBack */, bool /* mapBanks */, CCDBBankHandler * /* bankHandler */ )
 {
+	// Read nullable
+	CXMLAutoPtr nullable((const char*)xmlGetProp (node, (xmlChar*)"nullable"));
+	if ((const char *) nullable != NULL)
+	{
+		m_Nullable = (nullable.getDatas()[0] == '1');
+	}
+	else
+	{
+		m_Nullable = false;
+	}
+
+	// Read type
 	CXMLAutoPtr type((const char*)xmlGetProp (node, (xmlChar*)"type"));
 	nlassert((const char *) type != NULL);
 
@@ -87,6 +99,9 @@ void CCDBNodeLeaf::init(  xmlNodePtr node, IProgressCallback &/* progressCallBac
 		// IF it is a TEXT.
 		if(!strcmp(type, "TEXT"))
 			_Type = ICDBNode::TEXT;
+		// IF it is a PACKED.
+		else if (!strcmp(type, "PACKED"))
+			_Type = ICDBNode::PACKED;
 		// ELSE type unknown.
 		else
 		{
@@ -131,6 +146,15 @@ void CCDBNodeLeaf::write( CTextId& id, FILE * f)
 	fprintf(f,"%" NL_I64 "d\t%s\n",_Property,id.toString().c_str());
 } // write //
 
+inline uint readPackedBitCount(CBitMemStream & f)
+{
+	uint64 nibbleCount;
+	f.serial(nibbleCount, 4);
+	uint bits = (nibbleCount << 2) + 4;
+	// nlinfo("PACKED: %u bits", (uint32)(bits));
+	return bits;
+}
+
 //-----------------------------------------------
 //	readDelta
 //-----------------------------------------------
@@ -141,15 +165,26 @@ void CCDBNodeLeaf::readDelta(TGameCycle gc, CBitMemStream & f )
 	{
 		// Read the Property Value according to the Property Type.
 		uint64 recvd = 0;
-		uint bits;
-		if (_Type == TEXT)
-			bits = 32;
-		else if (_Type <= I64)
-			bits = _Type;
-		else
-			bits = _Type - 64;
-		f.serial(recvd, bits);
 
+		uint64 isNull = 0;
+		if (m_Nullable)
+		{
+			f.serial(isNull, 1);
+		}
+
+		uint bits;
+		if (!isNull)
+		{
+			if (_Type == TEXT)
+				bits = 32;
+			else if (_Type == PACKED)
+				bits = readPackedBitCount(f);
+			else if (_Type <= I64)
+				bits = _Type;
+			else
+				bits = _Type - 64;
+			f.serial(recvd, bits);
+		}
 
 		// if the DB update is older than last DB update, abort (but after the read!!)
 		if(gc<_LastChangeGC)
@@ -162,18 +197,24 @@ void CCDBNodeLeaf::readDelta(TGameCycle gc, CBitMemStream & f )
 		_Property = (sint64)recvd;
 
 		// if signed
-		if (! ((_Type == TEXT) || (_Type <= I64)))
+		if (! ((_Type == TEXT) || (_Type == PACKED) || (_Type <= I64)))
 		{
-			// extend bit sign
-			sint64 mask = (((sint64)1)<<bits)-(sint64)1;
-			if( (_Property >> (bits-1))==1 )
+			if (!isNull)
 			{
-				_Property |= ~mask;
+				// extend bit sign
+				sint64 mask = (((sint64)1)<<bits)-(sint64)1;
+				if( (_Property >> (bits-1))==1 )
+				{
+					_Property |= ~mask;
+				}
 			}
 		}
 		if ( verboseDatabase )
 		{
-			nlinfo( "CDB: Read value (%u bits) %" NL_I64 "d", bits, _Property );
+			if (!isNull)
+				nlinfo( "CDB: Read value (%u bits) %" NL_I64 "d", bits, _Property );
+			else
+				nlinfo( "CDB: Read null value %" NL_I64 "d", _Property );
 		}
 
 		// bkup the date of change

nel/src/misc/command.cpp

@@ -52,9 +52,8 @@ ICommand::ICommand(const char *categoryName, const char *commandName, const char
 
 	if (comm != LocalCommands->end ())
 	{
-		nlinfo("command with same name: %s", commandName);
 		// 2 commands have the same name
-		// nlstopex (("There are 2 commands that have the same name in the project (command name '%s'), skip the second definition", commandName));
+		nlstopex (("There are 2 commands that have the same name in the project (command name '%s'), skip the second definition", commandName));
 	}
 	else
 	{

nel/src/misc/eid_translator.cpp

@@ -288,7 +288,7 @@ void CEntityIdTranslator::registerEntity (const CEntityId &eid, const ucstring &
 		return;
 	}
 
-	//nlinfo ("EIT: Register EId %s EntityName '%s' UId %d UserName '%s'", reid.toString().c_str(), entityName.toString().c_str(), uid, userName.c_str());
+	nlinfo ("EIT: Register EId %s EntityName '%s' UId %d UserName '%s'", reid.toString().c_str(), entityName.toString().c_str(), uid, userName.c_str());
 	RegisteredEntities.insert (make_pair(reid, CEntityIdTranslator::CEntity(entityName, uid, userName, entitySlot, shardId)));
 	NameIndex.insert(make_pair(toLower(entityName), reid));
 }

nel/src/misc/seven_zip.cpp

@@ -17,6 +17,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "stdmisc.h"
 #include <nel/misc/seven_zip.h>
 
 #include <nel/misc/types_nl.h>

nel/src/misc/system_info.cpp

@@ -188,6 +188,7 @@
 #	endif // NL_CPU_INTEL
 #	ifdef NL_OS_MAC
 #		include <sys/mount.h>
+#		include <sys/sysctl.h>
 #	else
 #		include <sys/vfs.h>
 #	endif
@@ -1332,7 +1333,7 @@ uint64 CSystemInfo::getProcessorFrequency(bool quick)
 
 static bool DetectMMX()
 {
-	#ifdef NL_CPU_INTEL
+	#if defined(NL_CPU_INTEL) && (defined(HAVE_X86_64) || !defined(NL_COMP_GCC))
 		if (!CSystemInfo::hasCPUID()) return false; // cpuid not supported ...
 
 		sint32 CPUInfo[4];
@@ -1347,7 +1348,7 @@ static bool DetectMMX()
 
 static bool DetectSSE()
 {
-	#ifdef NL_CPU_INTEL
+	#if defined(NL_CPU_INTEL) && (defined(HAVE_X86_64) || !defined(NL_COMP_GCC))
 		if (!CSystemInfo::hasCPUID()) return false; // cpuid not supported ...
 
 		sint32 CPUInfo[4];

nel/src/net/admin.cpp

@@ -612,7 +612,7 @@ void initAdmin (bool dontUseAES)
 	{
 		CUnifiedNetwork::getInstance()->setServiceUpCallback ("AES", cbAESConnection, NULL);
 		CUnifiedNetwork::getInstance()->setServiceDownCallback ("AES", cbAESDisconnection, NULL);
-		CUnifiedNetwork::getInstance()->addService ("AES", CInetAddress("localhost:49997"));
+		CUnifiedNetwork::getInstance()->addService ("AES", CInetAddress("localhost:43997"));
 	}
 	CUnifiedNetwork::getInstance()->addCallbackArray (CallbackArray, sizeof(CallbackArray)/sizeof(CallbackArray[0]));
 }

nel/src/net/login_client.cpp

@@ -141,7 +141,7 @@ string CLoginClient::authenticateBegin(const string &loginServiceAddr, const ucs
 
 		string addr = loginServiceAddr;
 		if(addr.find(":") == string::npos)
-			addr += ":49997";
+			addr += ":43997";
 		if(_LSCallbackClient->connected())
 			_LSCallbackClient->disconnect();
 		_LSCallbackClient->connect (CInetAddress(addr));

nel/src/net/unified_network.cpp

@@ -266,9 +266,14 @@ void	uncbServiceIdentification(CMessage &msgin, TSockId from, CCallbackNetBase &
 
 	nlinfo ("HNETL5: + connect ident '%s' %s-%hu pos %hu ext %d", from->asString().c_str(), inSName.c_str(), inSid.get(), (uint16)pos, (uint8)isExternal);
 
-	if(isExternal)
+	if (isExternal)
 	{
-		nlassert (pos == 0);
+
+#ifdef NL_OS_WINDOWS
+		pos = 0;
+#else
+		nlassert(pos == 0);
+#endif
 	}
 
 	if (inSid.get() == 0)

nel/src/pacs/move_container.cpp

@@ -2,7 +2,7 @@
 // Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
@@ -418,7 +418,8 @@ void CMoveContainer::updateCells (CMovePrimitive *primitive, uint8 worldImage)
 	CPrimitiveWorldImage *wI=primitive->getWorldImage (worldImage);
 
 #if !FINAL_VERSION
-/*	// Check BB width not too large
+#ifndef RYZOM_FORGE
+	// Check BB width not too large
 	if (wI->getBBXMax() - wI->getBBXMin() > _CellWidth)
 	{
 		nlwarning ("Primitives have moved more than a cell, width: %f.", (float)(wI->getBBXMax() - wI->getBBXMin()));
@@ -429,7 +430,7 @@ void CMoveContainer::updateCells (CMovePrimitive *primitive, uint8 worldImage)
 	{
 		nlwarning ("Primitives have moved more than a cell, height: %f.", (float)(wI->getBBYMax() - wI->getBBYMin()));
 	}
-*/
+#endif
 #endif
 
 	// Get coordinate in the cell array

nel/src/sound/CMakeLists.txt

@@ -90,6 +90,23 @@ SOURCE_GROUP("user_classes" FILES ${USER_CLASSES})
 
 NL_TARGET_LIB(nelsound ${HEADERS} ${SRC})
 
+IF(HUNTER_ENABLED)
+  HUNTER_ADD_PACKAGE(libogg)
+  FIND_PACKAGE(libogg CONFIG REQUIRED)
+  SET(OGG_LIBRARY libogg::ogg)
+  SET(OGG_LIBRARIES libogg::ogg)
+
+  HUNTER_ADD_PACKAGE(vorbis)
+  FIND_PACKAGE(vorbis CONFIG REQUIRED)
+  SET(VORBIS_LIBRARY vorbis::vorbis)
+  SET(VORBISFILE_LIBRARY vorbis::vorbisfile)
+
+  IF(WITH_FFMPEG)
+    HUNTER_ADD_PACKAGE(ffmpeg)
+    FIND_PACKAGE(ffmpeg CONFIG REQUIRED)
+    SET(FFMPEG_LIBRARIES ffmpeg::avcodec ffmpeg::avformat ffmpeg::avutil ffmpeg::swresample)
+  ENDIF()
+ENDIF()
 
 INCLUDE_DIRECTORIES(${VORBIS_INCLUDE_DIR})
 INCLUDE_DIRECTORIES(${OGG_INCLUDE_DIR})

nel/src/sound/audio_decoder_vorbis.cpp

@@ -180,13 +180,17 @@ uint32 CAudioDecoderVorbis::getNextBytes(uint8 *buffer, uint32 minimum, uint32 m
 				nlwarning("ov_read returned OV_HOLE");
 				break;
 			case OV_EINVAL:
+				_IsMusicEnded = true;
 				nlwarning("ov_read returned OV_EINVAL");
 				break;
 			case OV_EBADLINK:
+				_IsMusicEnded = true;
 				nlwarning("ov_read returned OV_EBADLINK");
 				break;
 			default:
+				_IsMusicEnded = true;
 				nlwarning("ov_read returned %d", br);
+				break;
 			}
 		}
 	} while (bytes_read < minimum);

nel/src/sound/driver/openal/CMakeLists.txt

@@ -26,9 +26,16 @@ SOURCE_GROUP(util FILES
 
 NL_TARGET_DRIVER(${NLDRV_AL_LIB} ${SRC})
 
-INCLUDE_DIRECTORIES(${OPENAL_INCLUDE_DIR})
+IF(HUNTER_ENABLED)
+  HUNTER_ADD_PACKAGE(OpenAL)
+  FIND_PACKAGE(OpenAL CONFIG REQUIRED)
+  SET(OPENAL_LIBRARY OpenAL::OpenAL)
+  ADD_DEFINITIONS(-DAL_LIBTYPE_STATIC)
+ELSE()
+  INCLUDE_DIRECTORIES(${OPENAL_INCLUDE_DIR})
+ENDIF()# hunter
 
-TARGET_LINK_LIBRARIES(${NLDRV_AL_LIB} ${OPENAL_LIBRARY} nelmisc nelsnd_lowlevel)
+TARGET_LINK_LIBRARIES(${NLDRV_AL_LIB} nelmisc nelsnd_lowlevel ${OPENAL_LIBRARY})
 NL_DEFAULT_PROPS(${NLDRV_AL_LIB} "NeL, Driver, Sound: OpenAL")
 NL_ADD_RUNTIME_FLAGS(${NLDRV_AL_LIB})
 NL_ADD_LIB_SUFFIX(${NLDRV_AL_LIB})

nel/src/sound/driver/openal/ext_al.cpp

@@ -66,6 +66,7 @@ void alExtInitDevice(ALCdevice *device)
 		}
 	}
 
+#if !defined(AL_LIBTYPE_STATIC)
 // Windows and Mac OS always link to shared OpenAL library
 #if defined(NL_OS_WINDOWS) || defined(NL_OS_MAC) || !defined(NL_STATIC)
 	// EFX
@@ -114,6 +115,7 @@ void alExtInitDevice(ALCdevice *device)
 		}
 	}
 #endif
+#endif
 }
 
 #if EAX_AVAILABLE
@@ -137,6 +139,7 @@ EAXGetBufferMode eaxGetBufferMode = NULL;
 // ALC_EXT_EFX
 bool AlExtEfx = false;
 // effect objects
+#if !defined(AL_LIBTYPE_STATIC)
 #if defined(NL_OS_WINDOWS) || defined(NL_OS_MAC) || !defined(NL_STATIC)
 LPALGENEFXOBJECTS alGenEffects = NULL;
 LPALDELETEEFXOBJECTS alDeleteEffects = NULL;
@@ -174,6 +177,7 @@ LPALGETEFXOBJECTIV alGetAuxiliaryEffectSlotiv = NULL;
 LPALGETEFXOBJECTF alGetAuxiliaryEffectSlotf = NULL;
 LPALGETEFXOBJECTFV alGetAuxiliaryEffectSlotfv = NULL;
 #endif
+#endif
 }
 
 /* end of file */

nel/src/sound/sound.cpp

@@ -262,7 +262,7 @@ void				CSound::importForm(const std::string& filename, NLGEORGES::UFormElm& roo
 	_GroupController = CGroupControllerRoot::getInstance()->getGroupController(NLSOUND_SHEET_V1_DEFAULT_SOUND_GROUP_CONTROLLER);
 #else
 	std::string groupControllerPath;
-	root.getValueByName(groupControllerPath, ".GroupControllerPath");
+	root.getValueByName(groupControllerPath, ".GroupController");
 	_GroupController = CGroupControllerRoot::getInstance()->getGroupController(groupControllerPath);
 #endif
 

nel/tools/3d/plugin_max/nel_3dsmax_shared/StdAfx.cpp

@@ -21,5 +21,3 @@
 // and not in this file
 
 #include "stdafx.h"
-
-void nlmax_shared_stdafx_dummy() { }

nel/tools/3d/plugin_max/nel_export/std_afx.cpp

@@ -18,6 +18,3 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "std_afx.h"
-
-void nlmax_nel_export_std_afx_dummy() { }
-

nel/tools/3d/plugin_max/nel_mesh_lib/StdAfx.cpp

@@ -19,6 +19,3 @@
 
 
 #include "stdafx.h"
-
-void nlmax_mesh_library_stdafx_dummy() { }
-

nel/tools/3d/plugin_max/nel_patch_edit/stdafx.cpp

@@ -1,3 +1 @@
 #include "stdafx.h" 
-
-void nlmax_patch_edit_stdafx_dummy() { }

nel/tools/3d/plugin_max/nel_patch_lib/stdafx.cpp

@@ -18,5 +18,3 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdafx.h"
-
-void nlmax_patch_library_stdafx_dummy() { }

nel/tools/3d/plugin_max/nel_patch_paint/stdafx.cpp

@@ -1,3 +1 @@
 #include "stdafx.h" 
-
-void nlmax_patch_painter_stdafx_dummy() { }

nel/tools/build_gamedata/0_setup.py

@@ -65,158 +65,220 @@ if not args.noconf:
 	except NameError:
 		BuildQuality = 1
 	try:
-		if not args.preset:
-			ToolDirectories
+		if args.preset:
+			DummyUnknownName
+		RemapLocalFrom
 	except NameError:
-		ToolDirectories = [ 'R:/distribution/nel_tools_win_x64-distribution', 'R:/distribution/ryzom_tools_win_x64-distribution' ]
+		RemapLocalFrom = 'R:'
+	try:
+		if args.preset:
+			DummyUnknownName
+		RemapLocalTo
+	except NameError:
+		RemapLocalTo = os.getenv('RC_ROOT').replace('\\', '/')
+		if (not RemapLocalTo) or (not ':' in RemapLocalTo):
+			RemapLocalTo = 'R:'
+	try:
+		if args.preset:
+			DummyUnknownName
+		ToolDirectories
+	except NameError:
+		ToolDirectories = [ 'R:/distribution/nel_tools_win_x64', 'R:/distribution/ryzom_tools_win_x64' ]
 	try:
 		ToolSuffix
 	except NameError:
 		ToolSuffix = ".exe"
 	try:
-		if not args.preset:
-			ScriptDirectory
+		if args.preset:
+			DummyUnknownName
+		ScriptDirectory
 	except NameError:
 		ScriptDirectory = "R:/code/nel/tools/build_gamedata"
 	try:
-		if not args.preset:
-			WorkspaceDirectory
+		if args.preset:
+			DummyUnknownName
+		WorkspaceDirectory
 	except NameError:
 		WorkspaceDirectory = "R:/leveldesign/workspace"
 	try:
-		if not args.preset:
-			DatabaseDirectory
+		if args.preset:
+			DummyUnknownName
+		DatabaseDirectory
 	except NameError:
 		DatabaseDirectory = "R:/graphics"
 	try:
-		if not args.preset:
-			SoundDirectory
+		if args.preset:
+			DummyUnknownName
+		SoundDirectory
 	except NameError:
 		SoundDirectory = "R:/sound"
 	try:
-		if not args.preset:
-			SoundDfnDirectory
+		if args.preset:
+			DummyUnknownName
+		SoundDfnDirectory
 	except NameError:
 		SoundDfnDirectory = "R:/sound/DFN"
 	try:
-		if not args.preset:
-			ExportBuildDirectory
+		if args.preset:
+			DummyUnknownName
+		ExportBuildDirectory
 	except NameError:
 		ExportBuildDirectory = "R:/pipeline/export"
 	try:
-		if not args.preset:
-			InstallDirectory
+		if args.preset:
+			DummyUnknownName
+		InstallDirectory
 	except NameError:
 		InstallDirectory = "R:/pipeline/install"
 	try:
-		if not args.preset:
-			ClientDevDirectory
+		if args.preset:
+			DummyUnknownName
+		ClientDevDirectory
 	except NameError:
 		ClientDevDirectory = "R:/pipeline/client_dev"
 	try:
-		if not args.preset:
-			ClientPatchDirectory
+		if args.preset:
+			DummyUnknownName
+		ClientDevLiveDirectory
+	except NameError:
+		ClientDevLiveDirectory = "R:/pipeline/client_dev_live"
+	try:
+		if args.preset:
+			DummyUnknownName
+		ClientPatchDirectory
 	except NameError:
 		ClientPatchDirectory = "R:/pipeline/client_patch"
 	try:
-		if not args.preset:
-			ClientInstallDirectory
+		if args.preset:
+			DummyUnknownName
+		ClientInstallDirectory
 	except NameError:
 		ClientInstallDirectory = "R:/pipeline/client_install"
 	try:
-		if not args.preset:
-			ShardInstallDirectory
+		if args.preset:
+			DummyUnknownName
+		ShardInstallDirectory
 	except NameError:
 		ShardInstallDirectory = "R:/pipeline/shard"
 	try:
-		if not args.preset:
-			WorldEditInstallDirectory
+		if args.preset:
+			DummyUnknownName
+		ShardDevDirectory
+	except NameError:
+		ShardDevDirectory = "R:/pipeline/shard_dev"
+	try:
+		if args.preset:
+			DummyUnknownName
+		WorldEditInstallDirectory
 	except NameError:
 		WorldEditInstallDirectory = "R:/pipeline/worldedit"
 	try:
-		if not args.preset:
-			WorldEditorFilesDirectory
+		if args.preset:
+			DummyUnknownName
+		WorldEditorFilesDirectory
 	except NameError:
 		WorldEditorFilesDirectory = "R:/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files"
 	try:
-		if not args.preset:
-			LeveldesignDirectory
+		if args.preset:
+			DummyUnknownName
+		LeveldesignDirectory
 	except NameError:
 		LeveldesignDirectory = "R:/leveldesign"
 	try:
-		if not args.preset:
-			LeveldesignDfnDirectory
+		if args.preset:
+			DummyUnknownName
+		LeveldesignDfnDirectory
 	except NameError:
 		LeveldesignDfnDirectory = "R:/leveldesign/DFN"
 	try:
-		if not args.preset:
-			LeveldesignWorldDirectory
+		if args.preset:
+			DummyUnknownName
+		LeveldesignWorldDirectory
 	except NameError:
 		LeveldesignWorldDirectory = "R:/leveldesign/world"
 	try:
-		if not args.preset:
-			PrimitivesDirectory
+		if args.preset:
+			DummyUnknownName
+		PrimitivesDirectory
 	except NameError:
 		PrimitivesDirectory = "R:/leveldesign/primitives"
 	try:
-		if not args.preset:
-			LeveldesignDataCommonDirectory
+		if args.preset:
+			DummyUnknownName
+		LeveldesignDataCommonDirectory
 	except NameError:
 		LeveldesignDataCommonDirectory = "R:/leveldesign/common"
 	try:
-		if not args.preset:
-			LeveldesignDataShardDirectory
+		if args.preset:
+			DummyUnknownName
+		LeveldesignDataShardDirectory
 	except NameError:
 		LeveldesignDataShardDirectory = "R:/leveldesign/shard"
 	try:
-		if not args.preset:
-			TranslationDirectory
+		if args.preset:
+			DummyUnknownName
+		TranslationDirectory
 	except NameError:
 		TranslationDirectory = "R:/leveldesign/translation"
 	try:
-		if not args.preset:
-			GamedevDirectory
+		if args.preset:
+			DummyUnknownName
+		GamedevDirectory
 	except NameError:
 		GamedevDirectory = "R:/code/ryzom/client/data/gamedev"
 	try:
-		if not args.preset:
-			DataCommonDirectory
+		if args.preset:
+			DummyUnknownName
+		DataCommonDirectory
 	except NameError:
 		DataCommonDirectory = "R:/code/ryzom/common/data_common"
 	try:
-		if not args.preset:
-			DataShardDirectory
+		if args.preset:
+			DummyUnknownName
+		DataShardDirectory
 	except NameError:
 		DataShardDirectory = "R:/code/ryzom/server/data_shard"
 	try:
-		if not args.preset:
-			WindowsExeDllCfgDirectories
+		if args.preset:
+			DummyUnknownName
+		WindowsExeDllCfgDirectories
 	except NameError:
 		# TODO: Separate 64bit and 32bit
 		WindowsExeDllCfgDirectories = [ '', 'R:/build/fv_x64/bin/Release', 'R:/distribution/external_x64', 'R:/code/ryzom/client', '', '', '' ]
 	try:
-		if not args.preset:
-			LinuxServiceExecutableDirectory
+		if args.preset:
+			DummyUnknownName
+		LinuxServiceExecutableDirectory
+	except NameError:
+		LinuxServiceExecutableDirectory = "R:/build/server_gcc/bin"
+	try:
+		if args.preset:
+			DummyUnknownName
+		LinuxClientExecutableDirectory
 	except NameError:
-		LinuxServiceExecutableDirectory = "R:/build/gcc_server/bin"
+		LinuxClientExecutableDirectory = "R:/build/client_gcc/bin"
 	try:
-		if not args.preset:
-			LinuxClientExecutableDirectory
+		if args.preset:
+			DummyUnknownName
+		PatchmanDevDirectory
 	except NameError:
-		LinuxClientExecutableDirectory = "R:/build/gcc_client/bin"
+		PatchmanDevDirectory = "R:/patchman/terminal_dev"
 	try:
-		if not args.preset:
-			PatchmanCfgAdminDirectory
+		if args.preset:
+			DummyUnknownName
+		PatchmanCfgAdminDirectory
 	except NameError:
 		PatchmanCfgAdminDirectory = "R:/patchman/admin_install"
 	try:
-		if not args.preset:
-			PatchmanCfgDefaultDirectory
+		if args.preset:
+			DummyUnknownName
+		PatchmanCfgDefaultDirectory
 	except NameError:
 		PatchmanCfgDefaultDirectory = "R:/patchman/default"
 	try:
-		if not args.preset:
-			PatchmanBridgeServerDirectory
+		if args.preset:
+			DummyUnknownName
+		PatchmanBridgeServerDirectory
 	except NameError:
 		PatchmanBridgeServerDirectory = "R:/pipeline/bridge_server"
 	try:
@@ -276,9 +338,11 @@ if not args.noconf:
 		ExportBuildDirectory = askVar(log, "[OUT] Export Build Directory", ExportBuildDirectory).replace("\\", "/")
 		InstallDirectory = askVar(log, "[OUT] Install Directory", InstallDirectory).replace("\\", "/")
 		ClientDevDirectory = askVar(log, "[OUT] Client Dev Directory", ClientDevDirectory).replace("\\", "/")
+		ClientDevLiveDirectory = askVar(log, "[OUT] Client Dev Live Directory", ClientDevLiveDirectory).replace("\\", "/")
 		ClientPatchDirectory = askVar(log, "[OUT] Client Patch Directory", ClientPatchDirectory).replace("\\", "/")
 		ClientInstallDirectory = askVar(log, "[OUT] Client Install Directory", ClientInstallDirectory).replace("\\", "/")
 		ShardInstallDirectory = askVar(log, "[OUT] Shard Data Install Directory", ShardInstallDirectory).replace("\\", "/")
+		ShardDevDirectory = askVar(log, "[OUT] Shard Dev Directory", ShardDevDirectory).replace("\\", "/")
 		WorldEditInstallDirectory = askVar(log, "[OUT] World Edit Data Install Directory", WorldEditInstallDirectory).replace("\\", "/")
 		LeveldesignDirectory = askVar(log, "[IN] Leveldesign Directory", LeveldesignDirectory).replace("\\", "/")
 		LeveldesignDfnDirectory = askVar(log, "[IN] Leveldesign DFN Directory", LeveldesignDfnDirectory).replace("\\", "/")
@@ -300,6 +364,7 @@ if not args.noconf:
 		WindowsExeDllCfgDirectories[6] = askVar(log, "[IN] Septenary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[6]).replace("\\", "/")
 		LinuxServiceExecutableDirectory = askVar(log, "[IN] Linux Service Executable Directory", LinuxServiceExecutableDirectory).replace("\\", "/")
 		LinuxClientExecutableDirectory = askVar(log, "[IN] Linux Client Executable Directory", LinuxClientExecutableDirectory).replace("\\", "/")
+		PatchmanDevDirectory = askVar(log, "[IN] Patchman Directory", PatchmanDevDirectory).replace("\\", "/")
 		PatchmanCfgAdminDirectory = askVar(log, "[IN] Patchman Cfg Admin Directory", PatchmanCfgAdminDirectory).replace("\\", "/")
 		PatchmanCfgDefaultDirectory = askVar(log, "[IN] Patchman Cfg Default Directory", PatchmanCfgDefaultDirectory).replace("\\", "/")
 		PatchmanBridgeServerDirectory = askVar(log, "[OUT] Patchman Bridge Server Patch Directory", PatchmanBridgeServerDirectory).replace("\\", "/")
@@ -350,6 +415,9 @@ if not args.noconf:
 	sf.write("# Quality option for this site (1 for BEST, 0 for DRAFT)\n")
 	sf.write("BuildQuality = " + str(BuildQuality) + "\n")
 	sf.write("\n")
+	sf.write("RemapLocalFrom = \"" + str(RemapLocalFrom) + "\"\n")
+	sf.write("RemapLocalTo = \"" + str(RemapLocalTo) + "\"\n")
+	sf.write("\n")
 	sf.write("ToolDirectories = " + str(ToolDirectories) + "\n")
 	sf.write("ToolSuffix = \"" + str(ToolSuffix) + "\"\n")
 	sf.write("\n")
@@ -366,9 +434,11 @@ if not args.noconf:
 	sf.write("# Install directories\n")
 	sf.write("InstallDirectory = \"" + str(InstallDirectory) + "\"\n")
 	sf.write("ClientDevDirectory = \"" + str(ClientDevDirectory) + "\"\n")
+	sf.write("ClientDevLiveDirectory = \"" + str(ClientDevLiveDirectory) + "\"\n")
 	sf.write("ClientPatchDirectory = \"" + str(ClientPatchDirectory) + "\"\n")
 	sf.write("ClientInstallDirectory = \"" + str(ClientInstallDirectory) + "\"\n")
 	sf.write("ShardInstallDirectory = \"" + str(ShardInstallDirectory) + "\"\n")
+	sf.write("ShardDevDirectory = \"" + str(ShardDevDirectory) + "\"\n")
 	sf.write("WorldEditInstallDirectory = \"" + str(WorldEditInstallDirectory) + "\"\n")
 	sf.write("\n")
 	sf.write("# Utility directories\n")
@@ -390,6 +460,7 @@ if not args.noconf:
 	sf.write("WindowsExeDllCfgDirectories = " + str(WindowsExeDllCfgDirectories) + "\n")
 	sf.write("LinuxServiceExecutableDirectory = \"" + str(LinuxServiceExecutableDirectory) + "\"\n")
 	sf.write("LinuxClientExecutableDirectory = \"" + str(LinuxClientExecutableDirectory) + "\"\n")
+	sf.write("PatchmanDevDirectory = \"" + str(PatchmanDevDirectory) + "\"\n")
 	sf.write("PatchmanCfgAdminDirectory = \"" + str(PatchmanCfgAdminDirectory) + "\"\n")
 	sf.write("PatchmanCfgDefaultDirectory = \"" + str(PatchmanCfgDefaultDirectory) + "\"\n")
 	sf.write("PatchmanBridgeServerDirectory = \"" + str(PatchmanBridgeServerDirectory) + "\"\n")
@@ -407,8 +478,18 @@ if not args.noconf:
 	sf.write("\n")
 	sf.write("\n")
 	sf.write("# end of file\n")
+	sf.flush()
+	sf.close()
+	sf = open("configuration/buildsite_local.py", "w")
+	sfr = open("configuration/buildsite.py", "r")
+	for l in sfr:
+		sf.write(l.replace(RemapLocalFrom + '/', RemapLocalTo + '/'))
+	sf.flush()
+	sfr.close()
 	sf.close()
 
+from buildsite_local import *
+
 sys.path.append(WorkspaceDirectory)
 from projects import *
 
@@ -448,6 +529,7 @@ printLog(log, "")
 # Additional directories
 printLog(log, ">>> Setup additional directories <<<")
 mkPath(log, ClientDevDirectory)
+mkPath(log, ClientDevLiveDirectory)
 mkPath(log, ClientPatchDirectory)
 mkPath(log, ClientInstallDirectory)
 
@@ -503,6 +585,7 @@ if not args.noverify:
 	findTool(log, ToolDirectories, TranslationToolsTool, ToolSuffix)
 	findTool(log, ToolDirectories, BuildWorldPackedColTool, ToolSuffix)
 	findTool(log, ToolDirectories, R2IslandsTexturesTool, ToolSuffix)
+	findTool(log, ToolDirectories, PatchmanServiceTool, ToolSuffix)
 
 log.close()
 if os.path.isfile("0_setup.log"):

nel/tools/build_gamedata/1_export.py

@@ -47,7 +47,7 @@ if os.path.isfile("log.log"):
 	os.remove("log.log")
 log = open("log.log", "w")
 from scripts import *
-from buildsite import *
+from buildsite_local import *
 from tools import *
 
 sys.path.append(WorkspaceDirectory)

nel/tools/build_gamedata/2_build.py

@@ -47,7 +47,7 @@ if os.path.isfile("log.log"):
 	os.remove("log.log")
 log = open("log.log", "w")
 from scripts import *
-from buildsite import *
+from buildsite_local import *
 from tools import *
 
 sys.path.append(WorkspaceDirectory)

nel/tools/build_gamedata/3_install.py

@@ -47,7 +47,7 @@ if os.path.isfile("log.log"):
 	os.remove("log.log")
 log = open("log.log", "w")
 from scripts import *
-from buildsite import *
+from buildsite_local import *
 from tools import *
 
 sys.path.append(WorkspaceDirectory)

nel/tools/build_gamedata/9_upload.py

@@ -31,7 +31,7 @@ if os.path.isfile("log.log"):
 	os.remove("log.log")
 log = open("log.log", "w")
 from scripts import *
-from buildsite import *
+from buildsite_local import *
 from tools import *
 
 try:

nel/tools/build_gamedata/a1_worldedit_data.py

@@ -31,7 +31,7 @@ if os.path.isfile("log.log"):
 	os.remove("log.log")
 log = open("log.log", "w")
 from scripts import *
-from buildsite import *
+from buildsite_local import *
 from tools import *
 
 sys.path.append(WorkspaceDirectory)

nel/tools/build_gamedata/all_dev.bat

@@ -1,15 +1,17 @@
-title Ryzom Core: 0_setup.py --noconf
-0_setup.py --noconf
-title Ryzom Core: 1_export.py
-1_export.py
-title Ryzom Core: 2_build.py
-2_build.py
-title Ryzom Core: 3_install.py
-3_install.py
-title Ryzom Core: a1_worldedit_data.py
-a1_worldedit_data.py
-title Ryzom Core: b1_client_dev.py
-b1_client_dev.py
-title Ryzom Core: b2_shard_data.py
-b2_shard_data.py
-title Ryzom Core: Ready
+title Ryzom Core: 0_setup.py --noconf
+python 0_setup.py --noconf
+title Ryzom Core: 1_export.py
+python 1_export.py
+title Ryzom Core: 2_build.py
+python 2_build.py
+title Ryzom Core: 3_install.py
+python 3_install.py
+title Ryzom Core: a1_worldedit_data.py
+python a1_worldedit_data.py
+title Ryzom Core: b1_client_dev.py
+python b1_client_dev.py
+title Ryzom Core: b2_shard_data.py
+python b2_shard_data.py
+title Ryzom Core: b3_shard_dev.py
+python b3_shard_dev.py
+title Ryzom Core: Ready

nel/tools/build_gamedata/all_install_dev.bat

@@ -1,9 +1,11 @@
-title Ryzom Core: 3_install.py
-3_install.py
-title Ryzom Core: a1_worldedit_data.py
-a1_worldedit_data.py
-title Ryzom Core: b1_client_dev.py
-b1_client_dev.py
-title Ryzom Core: b2_shard_data.py
-b2_shard_data.py
-title Ryzom Core: Ready
+title Ryzom Core: 3_install.py
+python 3_install.py
+title Ryzom Core: a1_worldedit_data.py
+python a1_worldedit_data.py
+title Ryzom Core: b1_client_dev.py
+python b1_client_dev.py
+title Ryzom Core: b2_shard_data.py
+python b2_shard_data.py
+title Ryzom Core: b3_shard_dev.py
+python b3_shard_dev.py
+title Ryzom Core: Ready

nel/tools/build_gamedata/b1_client_dev.py

@@ -24,14 +24,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # 
 
-import time, sys, os, shutil, subprocess, distutils.dir_util
+import time, sys, os, shutil, subprocess, distutils.dir_util, socket
 sys.path.append("configuration")
 
 if os.path.isfile("log.log"):
 	os.remove("log.log")
 log = open("log.log", "w")
 from scripts import *
-from buildsite import *
+from buildsite_local import *
 from tools import *
 
 sys.path.append(WorkspaceDirectory)
@@ -45,9 +45,10 @@ printLog(log, "-------")
 printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
 printLog(log, "")
 
-if not os.path.isfile(ClientDevDirectory + "/client.cfg"):
-	printLog(log, ">>> Generate client.cfg <<<")
-	cfg = open(ClientDevDirectory + "/client.cfg", "w")
+mkPath(log, ClientDevLiveDirectory)
+if not os.path.isfile(ClientDevLiveDirectory + "/client.cfg"):
+	printLog(log, ">>> Generate live dev client.cfg <<<")
+	cfg = open(ClientDevLiveDirectory + "/client.cfg", "w")
 	cfg.write("RootConfigFilename   = \"client_default.cfg\";\n")
 	cfg.write("PreDataPath          = {\n")
 	cfg.write("\t\"user\", \"patch\", \"" + DataCommonDirectory + "\", \"" + GamedevDirectory + "\", \"" + LeveldesignDirectory + "/translation/translated\", \"" + InstallDirectory + "\", \"data\", \"examples\" \n")
@@ -57,6 +58,24 @@ if not os.path.isfile(ClientDevDirectory + "/client.cfg"):
 	cfg.write("DisplayLuaDebugInfo  = 1;\n")
 	cfg.write("AllowDebugLua        = 1;\n")
 	cfg.write("FullScreen           = 0;\n")
+	cfg.flush()
+	cfg.close()
+	printLog(log, "")
+
+mkPath(log, ClientDevDirectory)
+if not os.path.isfile(ClientDevDirectory + "/client.cfg"):
+	printLog(log, ">>> Generate local dev client.cfg <<<")
+	cfg = open(ClientDevDirectory + "/client.cfg", "w")
+	cfgr = open(ClientDevLiveDirectory + "/client.cfg", "r")
+	for l in cfgr:
+		cfg.write(l)
+	cfgr.close()
+	cfg.write("StartupHost          = \"http://" + socket.gethostname() + ":9042\";\n")
+	cfg.write("Application          = {\n")
+	cfg.write("	\"dev\", \"./client_ryzom_r.exe\", \"./\" \n")
+	cfg.write("};\n")
+	cfg.flush()
+	cfg.close()
 	printLog(log, "")
 
 printLog(log, ">>> Install data <<<")
@@ -64,13 +83,22 @@ for category in InstallClientData:
 	if (category["UnpackTo"] != None):
 		printLog(log, "CATEGORY " + category["Name"])
 		targetPath = ClientDevDirectory
+		targetPathLive = ClientDevLiveDirectory
 		if (category["UnpackTo"] != ""):
 			targetPath += "/" + category["UnpackTo"]
+			targetPathLive += "/" + category["UnpackTo"]
 		mkPath(log, targetPath)
+		mkPath(log, targetPathLive)
 		for package in category["Packages"]:
 			printLog(log, "PACKAGE " + package[0])
 			mkPath(log, InstallDirectory + "/" + package[0])
-			copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPath)
+			if "exedll" in package[0]:
+				if package[0] == "exedll": # or package[0] == platformExeDll # TODO: 64-bit and Linux separation of exedll, only include one
+					copyFileIfNeeded(log, InstallDirectory + "/" + package[0] + "/client_default.cfg", targetPath)
+					copyFileIfNeeded(log, InstallDirectory + "/" + package[0] + "/client_default.cfg", targetPathLive)
+			else:
+				copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPath)
+				copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPathLive)
 printLog(log, "")
 
 log.close()

nel/tools/build_gamedata/b2_shard_data.py

@@ -31,7 +31,7 @@ if os.path.isfile("log.log"):
 	os.remove("log.log")
 log = open("log.log", "w")
 from scripts import *
-from buildsite import *
+from buildsite_local import *
 from tools import *
 
 sys.path.append(WorkspaceDirectory)

nel/tools/build_gamedata/b3_shard_dev.py

@@ -0,0 +1,152 @@
+#!/usr/bin/python
+# 
+# \file b2_shard_data.py
+# \brief Install shard data
+# \date 2009-02-18 16:19GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Install shard data
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2009-2014  by authors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+
+import time, sys, os, shutil, subprocess, distutils.dir_util
+sys.path.append("configuration")
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite_local import *
+from tools import *
+
+sys.path.append(WorkspaceDirectory)
+from projects import *
+
+# Log error
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Install to shard dev")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+# Find tools
+PatchmanService = findTool(log, ToolDirectories, PatchmanServiceTool, ToolSuffix)
+printLog(log, "")
+
+mkPath(log, ShardDevDirectory)
+mkPath(log, ShardDevDirectory + "/local")
+printLog(log, ">>> Generate shard dev local.cfg <<<")
+cfg = open(ShardDevDirectory + "/local.cfg", "w")
+cfg.write("WindowStyle = \"WIN\";\n")
+cfg.write("Paths += {\n")
+cfg.write("	\"" + ShardDevDirectory + "/local\",\n")
+cfg.write("	\"" + DataCommonDirectory + "\",\n")
+cfg.write("	\"" + DataShardDirectory + "\",\n")
+cfg.write("	\"" + LeveldesignDirectory + "\",\n")
+cfg.write("	\"" + WorldEditorFilesDirectory + "\",\n")
+for dir in InstallShardDataDirectories:
+	mkPath(log, ShardInstallDirectory + "/" + dir)
+	cfg.write("	\"" + ShardInstallDirectory + "/" + dir + "\",\n")
+for multiDir in InstallShardDataMultiDirectories:
+	dstDir = multiDir[0]
+	mkPath(log, ShardInstallDirectory + "/" + dstDir)
+	cfg.write("	\"" + ShardInstallDirectory + "/" + dstDir + "\",\n")
+cfg.write("};\n")
+cfg.write("RRDToolPath = \"..\\..\\..\\external\\rrdtool\\rrdtool.exe\";\n")
+cfg.write("StartCommands += {\n")
+cfg.write("	// \"gw_aes.transportRemove aes_l3c\",\n")
+cfg.write("};\n")
+cfg.write("NegFiltersWarning += {\n")
+cfg.write("	\"already inserted from\",\n")
+cfg.write("};\n")
+cfg.write("// Allow player to stay connected to FS when services go down\n")
+cfg.write("DontNeedBackend = 1;\n")
+cfg.flush()
+cfg.close()
+printLog(log, "")
+
+if not os.path.exists(ShardDevDirectory  + "/aes_state.txt"):
+	printLog(log, ">>> Generate shard dev aes_state.txt <<<")
+	f = open(ShardDevDirectory + "/aes_state.txt", "w")
+	f.write("ShardOrders unifier so_autostart_off\n")
+	f.write("ShardOrders mainland so_autostart_off\n")
+	f.write("ShardOrders ring so_autostart_off\n")
+	f.flush()
+	f.close()
+	printLog(log, "")
+
+mkPath(log, ShardDevDirectory + "/ras")
+if not os.path.exists(ShardDevDirectory  + "/ras/as_state.txt"):
+	printLog(log, ">>> Generate shard dev as_state.txt <<<")
+	f = open(ShardDevDirectory + "/ras/as_state.txt", "w")
+	f.write("ShardOrders unifier so_autostart_off\n")
+	f.write("ShardOrders mainland so_autostart_off\n")
+	f.write("ShardOrders ring so_autostart_off\n")
+	f.flush()
+	f.close()
+	printLog(log, "")
+
+for execDir in InstallShardDataExecutables:
+	dstDir = execDir[0]
+	mkPath(log, PatchmanCfgDefaultDirectory)
+	mkPath(log, InstallDirectory)
+	mkPath(log, ShardDevDirectory + "/live/" + dstDir)
+	printLog(log, "SHARD PACKAGE " + dstDir)
+	copyFileListNoTreeIfNeeded(log, PatchmanCfgDefaultDirectory, ShardDevDirectory + "/live/" + dstDir, execDir[2])
+	copyFileListNoTreeIfNeeded(log, InstallDirectory, ShardDevDirectory + "/live/" + dstDir, execDir[3])
+	for cfgName in execDir[2]:
+		cfgPath = ShardDevDirectory + "/live/" + dstDir + "/" + cfgName
+		found = False
+		with open(cfgPath, "r") as f:
+			for l in f:
+				if "Paths += {" in l:
+					found = True
+		if not found:
+			with open(cfgPath, "a") as cfg:
+				cfg.write("\n")
+				cfg.write("Paths += {\n")
+				cfg.write("	\"" + ShardDevDirectory + "/live/" + dstDir + "\",\n")
+				cfg.write("};\n")
+				cfg.write("\n")
+				cfg.flush()
+printLog(log, "")
+
+
+if PatchmanService == "":
+	toolLogFail(log, PatchmanServiceTool, ToolSuffix)
+else:
+	mkPath(log, PatchmanDevDirectory)
+	cwDir = os.getcwd().replace("\\", "/")
+	os.chdir(PatchmanDevDirectory)
+	if os.path.isfile("log.log"):
+		os.remove("log.log")
+	subprocess.call([ PatchmanService, "-C.", "-L." ])
+	if os.path.isfile("log.log"):
+		f = open("log.log", "r")
+		for l in f:
+			printLog(log, l.rstrip())
+		f.close()
+	os.chdir(cwDir)
+	printLog(log, "")
+
+log.close()
+if os.path.isfile("b3_shard_dev.log"):
+	os.remove("b3_shard_dev.log")
+shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_shard_dev.log")
+shutil.move("log.log", "b3_shard_dev.log")

nel/tools/build_gamedata/c1_shard_patch.py

@@ -35,7 +35,7 @@ if os.path.isfile("log.log"):
 	os.remove("log.log")
 log = open("log.log", "w")
 from scripts import *
-from buildsite import *
+from buildsite_local import *
 from tools import *
 
 sys.path.append(WorkspaceDirectory)

nel/tools/build_gamedata/characters_dev.bat

@@ -1,11 +1,11 @@
-title Ryzom Core: 1_export.py (CHARACTERS)
-1_export.py -ipj common/characters common/characters_maps_hr
-title Ryzom Core: 2_build.py (CHARACTERS)
-2_build.py -ipj common/characters common/characters_maps_hr
-title Ryzom Core: 3_install.py (CHARACTERS)
-3_install.py -ipj common/characters common/characters_maps_hr
-title Ryzom Core: b1_client_dev.py (CHARACTERS)
-b1_client_dev.py
-title Ryzom Core: b2_shard_data.py (CHARACTERS)
-b2_shard_data.py
-title Ryzom Core: Ready (CHARACTERS)
+title Ryzom Core: 1_export.py (CHARACTERS)
+python 1_export.py -ipj common/characters common/characters_maps_hr
+title Ryzom Core: 2_build.py (CHARACTERS)
+python 2_build.py -ipj common/characters common/characters_maps_hr
+title Ryzom Core: 3_install.py (CHARACTERS)
+python 3_install.py -ipj common/characters common/characters_maps_hr
+title Ryzom Core: b1_client_dev.py (CHARACTERS)
+python b1_client_dev.py
+title Ryzom Core: b2_shard_data.py (CHARACTERS)
+python b2_shard_data.py
+title Ryzom Core: Ready (CHARACTERS)

nel/tools/build_gamedata/configuration/scripts.py

@@ -96,6 +96,20 @@ def needUpdateLogRemoveDest(log, source, dest):
 	printLog(log, "SKIP " + dest)
 	return 0
 
+def needUpdateLogRemoveDestSilentSkip(log, source, dest):
+	if (os.path.isfile(source)):
+		if (os.path.isfile(dest)):
+			if (os.stat(source).st_mtime > os.stat(dest).st_mtime):
+				os.remove(dest)
+				printLog(log, source + " -> " + dest)
+				return 1
+			else:
+				return 0
+		printLog(log, source + " -> " + dest)
+		return 1
+	printLog(log, "MISSING " + source)
+	return 0
+
 def copyFileList(log, dir_source, dir_target, files):
 	for fileName in files:
 		if fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*":

nel/tools/build_gamedata/configuration/tools.py

@@ -98,4 +98,5 @@ PatchGenTool = "patch_gen"
 TranslationToolsTool = "translation_tools"
 BuildWorldPackedColTool = "build_world_packed_col"
 R2IslandsTexturesTool = "r2_islands_textures"
+PatchmanServiceTool = "ryzom_patchman_service"
 SevenZipTool = "7za"