Merge branch '58-add-rotz-roty-and-dist-reflect-lua-to-3dcamera-of-a-scene' into 'main/gingo-test'

Resolve "Add rotz roty and dist reflect lua to 3DCamera of a scene"

See merge request ryzom/ryzom-core!48

.gitignore

@@ -165,6 +165,7 @@ build/*
 install/*
 win-build/
 build_*
+install_*
 nel/tools/build_gamedata/configuration/buildsite.py
 
 # Linux nel compile

CMakeLists.txt

@@ -34,11 +34,37 @@ 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)
+ENDIF()
+
+
+#-----------------------------------------------------------------------------
+
 INCLUDE(nel)
 INCLUDE(ConfigureChecks)
 INCLUDE(CheckDepends)
 INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL)
 
+MESSAGE("EXTERNAL ${WITH_EXTERNAL}")
+
 # Force out of source builds.
 CHECK_OUT_OF_SOURCE()
 
@@ -134,6 +160,28 @@ IF(WIN32)
   ENDIF()
 ENDIF()
 
+IF(HUNTER_ENABLED)
+  ## 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 +192,7 @@ FIND_PACKAGE(Jpeg)
 IF(WIN32)
   SET(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} Crypt32.lib)
 ENDIF()
+ENDIF() #hunter
 
 IF(WITH_LIBOVR)
   FIND_PACKAGE(LibOVR)
@@ -237,6 +286,7 @@ ENDIF()
 
 INCLUDE(FindHelpers)
 
+#TODO: hunter qt package
 IF(WITH_QT5)
   FIND_QT5()
 ENDIF()
@@ -248,6 +298,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,6 +308,17 @@ IF(WITH_NEL)
     FIND_PACKAGE(CppTest)
   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()
@@ -310,6 +372,7 @@ IF(WITH_NEL)
         ENDIF()
       ENDIF()
     ENDIF()
+  ENDIF() #hunter
 
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include)
   ADD_SUBDIRECTORY(nel)

CMakeModules/FindLuabind.cmake

@@ -69,7 +69,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 +95,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/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/nimetu/luabind/tarball/2fa4606"
+  SHA1 "3b4646bab9f0b2362d7b8d71d78e40deaf3cc747"
+  )
+

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)
 
 ###
@@ -249,6 +286,8 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
   OPTION(WITH_ASSIMP              "Use assimp exporter"                           OFF)
   OPTION(WITH_LIBGSF              "Use libgsf for max file library"               OFF)
 
+  OPTION(WITH_FFMPEG              "Use ffmpeg for audio decoder"                  OFF)
+
   ###
   # GUI toolkits
   ###
@@ -1193,7 +1232,11 @@ MACRO(SETUP_EXTERNAL)
   ENDIF()
 
   IF(WIN32)
+    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)
@@ -1236,7 +1279,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()
@@ -1245,5 +1288,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()

azure-pipelines.yml

@@ -1,59 +1,55 @@
 jobs:
-  - job: ubuntu16
+  - job: ubuntu18
     timeoutInMinutes: 120
     pool:
-      vmImage: 'Ubuntu-16.04'
+      vmImage: 'ubuntu-18.04'
     steps:
     - script: |
-        sudo apt-get update
+        sudo apt update
-        sudo apt-get install -y software-properties-common
+        sudo apt install -y software-properties-common
-        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+        # sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-        sudo apt-get update
+        sudo apt update
-        sudo apt-get install cmake build-essential -y
+        sudo apt install cmake build-essential -y
-        sudo apt-get install gcc-8 g++-8 -y
+        sudo apt install gcc-8 g++-8 -y
         sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60
         sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 60
-        sudo apt-get install bison autoconf automake -y
+        sudo apt install bison autoconf automake -y
-        sudo apt-get install libpng12-dev -y
+        sudo apt install libpng-dev -y
-        sudo apt-get install libjpeg-dev -y
+        sudo apt install libjpeg-dev -y
-        sudo apt-get install libgif-dev libfreetype6-dev -y
+        sudo apt install libgif-dev libfreetype6-dev -y
-        sudo apt-get install freeglut3-dev -y
+        sudo apt install freeglut3-dev -y
-        sudo apt-get install liblua5.1-dev libluabind-dev libcpptest-dev -y
+        sudo apt install liblua5.2-dev libluabind-dev libcpptest-dev -y
-        sudo apt-get install libogg-dev libvorbis-dev libopenal-dev -y
+        sudo apt install libogg-dev libvorbis-dev libopenal-dev -y
-        sudo apt-get install libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libpostproc-dev -y
+        sudo apt install libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libpostproc-dev -y
-        sudo apt-get install libmysqlclient-dev -y
+        sudo apt install libmysqlclient-dev -y
-        sudo apt-get install libxml2-dev -y
+        sudo apt install libxml2-dev -y
-        sudo apt-get install libcurl4-openssl-dev libssl-dev -y
+        sudo apt install libcurl4-openssl-dev libssl-dev -y
-        sudo apt-get install libsquish-dev -y
+        sudo apt install libsquish-dev -y
-        sudo apt-get install liblzma-dev -y
+        sudo apt install liblzma-dev -y
-        sudo apt-get install libgsf-1-dev -y
+        sudo apt install libgsf-1-dev -y
-        sudo apt-get install qtbase5-dev qttools5-dev qttools5-dev-tools
+        sudo apt install qtbase5-dev qttools5-dev qttools5-dev-tools
       displayName: 'Dependencies'
     - script: |
         mkdir build
         cmake --version
         cd build
-        cmake -DWITH_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=ON -DWITH_LUA51=ON -DWITH_RYZOM=ON -DWITH_RYZOM_SERVER=ON -DWITH_RYZOM_CLIENT=ON -DWITH_RYZOM_TOOLS=ON -DWITH_NEL_TOOLS=ON -DWITH_NELNS=ON -DWITH_NELNS_LOGIN_SYSTEM=ON -DWITH_NELNS_SERVER=ON -DWITH_QT5=ON -DWITH_LIBGSF=ON ..
+        cmake -DWITH_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=ON -DWITH_LUA51=OFF -DWITH_LUA52=ON -DWITH_RYZOM=ON -DWITH_RYZOM_SERVER=ON -DWITH_RYZOM_CLIENT=ON -DWITH_RYZOM_TOOLS=ON -DWITH_NEL_TOOLS=ON -DWITH_NELNS=ON -DWITH_NELNS_LOGIN_SYSTEM=ON -DWITH_NELNS_SERVER=ON -DWITH_QT5=ON -DWITH_LIBGSF=ON ..
         cat CMakeCache.txt
       displayName: 'CMake'
     - script: |
         cd build
         make -j`nproc`
       displayName: 'Make'
-  - job: ubuntu18
+  - job: ubuntu20
     timeoutInMinutes: 120
     pool:
-      vmImage: 'ubuntu-18.04'
+      vmImage: 'ubuntu-20.04'
     steps:
     - script: |
         sudo apt update
         sudo apt install -y software-properties-common
-        # sudo add-apt-repository ppa:ubuntu-toolchain-r/test
         sudo apt update
         sudo apt install cmake build-essential -y
-        sudo apt install gcc-8 g++-8 -y
-        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60
-        sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 60
         sudo apt install bison autoconf automake -y
         sudo apt install libpng-dev -y
         sudo apt install libjpeg-dev -y
@@ -81,3 +77,88 @@ jobs:
         cd build
         make -j`nproc`
       displayName: 'Make'
+  - job: windows2019
+    timeoutInMinutes: 120
+    pool:
+      vmImage: 'windows-2019'
+    steps:
+    - checkout: self
+      fetchDepth: 1
+    - task: Cache@2
+      inputs:
+        key: 'hunter-win2019-x64-rel'
+        path: "c:/.hunter/_Base/Cache"
+    - 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
+    - task: CMake@1
+      inputs:
+        workingDirectory: build.release
+        cmakeArgs: '-DCMAKE_CONFIGURATION_TYPES=Release -DHUNTER_ENABLED=ON -DHUNTER_CONFIGURATION_TYPES=Release -DFINAL_VERSION=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=OFF -DWITH_NEL_TOOLS=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -DWITH_DRIVER_DIRECT3D=ON -DWITH_DRIVER_XAUDIO2=ON -DDXSDK_DIR=C:/DXSDK ..'
+    - task: MSBuild@1
+      inputs:
+        solution: build.release/ALL_BUILD.vcxproj
+        maximumCpuCount: true
+        configuration: release
+        platform: 'x64'
+  - job: ubuntu18hunter
+    timeoutInMinutes: 120
+    pool:
+      vmImage: ubuntu-18.04
+    steps:
+    - checkout: self
+      fetchDepth: 0
+    - script: |
+        sudo apt-get update
+        sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libasound2-dev libgl1-mesa-dev libjack-dev libpulse-dev libxrandr-dev libxrender-dev libxxf86vm-dev
+      displayName: 'Dependencies'
+    - task: Cache@2
+      inputs:
+        key: 'hunter317-ubuntu18-rel"'
+        path: "$(Pipeline.Workspace)/.hunter/_Base/Cache"
+    - script: |
+        mkdir build.release
+        cmake --version
+        cd build.release
+        unset SYSTEM
+        export MAKEFLAGS=-j`nproc`
+        cmake -DCMAKE_BUILD_TYPE=Release -DHUNTER_ENABLED=ON -DHUNTER_CONFIGURATION_TYPES=Release -DHUNTER_ROOT="$(Pipeline.Workspace)/.hunter" -DFINAL_VERSION=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=OFF -DWITH_NEL_TOOLS=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON ..
+      displayName: 'CMake, release'
+    - script: |
+        cd build.release
+        make -j`nproc`
+      displayName: 'Make, release'
+    #- task: PublishPipelineArtifact@1
+    #  inputs:
+    #    targetPath: build.release/bin
+    #    artifactName: RyzomUbuntu18Release
+  - job: macOS11
+    timeoutInMinutes: 120
+    pool:
+      vmImage: 'macOS-11'
+    steps:
+    - checkout: self
+      fetchDepth: 0
+    - task: Cache@2
+      inputs:
+        key: 'hunter317-macOS11-rel"'
+        path: "$(Pipeline.Workspace)/.hunter/_Base/Cache"
+    - task: CMake@1
+      inputs:
+        workingDirectory: build.release
+        cmakeArgs: '-GXcode -DCMAKE_CONFIGURATION_TYPES=Release -DHUNTER_ENABLED=ON -DHUNTER_STATUS_DEBUG=ON -DHUNTER_CONFIGURATION_TYPES=Release -DHUNTER_ROOT="$(Pipeline.Workspace)/.hunter" -DWITH_LIBXML2_ICONV=OFF -DFINAL_VERSION=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=OFF -DWITH_NEL_TOOLS=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -DWITH_DRIVER_DIRECT3D=OFF -DWITH_DRIVER_XAUDIO2=OFF ..'
+    - task: Xcode@5
+      inputs:
+        actions: 'build'
+        configuration: Release
+        sdk: macosx12.0
+        xcWorkspacePath: 'build.release/RyzomCore.xcodeproj'
+        scheme: 'ALL_BUILD'
+        packageApp: false
+    #- task: PublishPipelineArtifact@1
+    #  inputs:
+    #    targetPath: build.release/bin/
+    #    artifactName: RyzomClientMacOS11Release

nel/CMakeLists.txt

@@ -10,17 +10,25 @@ IF(WIN32)
 ENDIF()
 
 IF(WITH_3D)
+  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)
-  FIND_PACKAGE(FFmpeg COMPONENTS AVCODEC AVFORMAT AVUTIL SWRESAMPLE)
+  IF(WITH_FFMPEG)
+    FIND_PACKAGE(FFmpeg REQUIRED COMPONENTS AVCODEC AVFORMAT AVUTIL SWRESAMPLE)
+  ENDIF()
 
   IF(WITH_DRIVER_OPENAL)
     FIND_PACKAGE(OpenAL)

nel/include/nel/gui/group_html.h

@@ -969,6 +969,7 @@ namespace NLGUI
 
 		// stop all curl downalods (html and data)
 		void releaseDownloads();
+		void releaseDataDownloads();
 		void checkDownloads();
 
 		// _CurlWWW download finished

nel/include/nel/gui/html_element.h

@@ -76,16 +76,16 @@ namespace NLGUI
 		void reindexChilds();
 
 		// escape text tag or attribute value
-		std::string htmlEscape(std::string val, bool isAttribute = false) const;
+		std::string htmlEscape(const std::string &val) const;
 
 		// serialize element attributes as string
-		std::string serializeAttributes() const;
+		std::string serializeAttributes(bool escape = true) const;
 
 		// serialize child elements as html string
-		std::string serializeChilds() const;
+		std::string serializeChilds(bool escape = true) const;
 
 		// serialize itself and children as html string
-		std::string serialize() const;
+		std::string serialize(bool escape = true) const;
 
 		// debug
 		std::string toString(bool tree = false, uint depth = 0) const;

nel/include/nel/gui/view_text.h

@@ -119,8 +119,8 @@ namespace NLGUI
 		void enableStringSelection(uint start, uint end);
 		void disableStringSelection();
 
-		/// Get
+		/// Get displayed text
-		std::string		getText() const { return _HardText.empty() ? _Text : _HardText; }
+		std::string		getText() const { return _Text; }
 #ifdef RYZOM_LUA_UCSTRING
 		ucstring		getTextAsUtf16() const; // Compatibility
 		ucstring		getHardTextAsUtf16() const; // Compatibility
@@ -188,6 +188,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
@@ -282,8 +283,10 @@ namespace NLGUI
 		bool	_FontSizeCoef;
 		bool	_Embolden;
 		bool	_Oblique;
-		// width of the font in pixel. Just a Hint for tabing format (computed with '_')
+		// width of the font in pixel. 
 		float	_FontWidth;
+		// width of tabs
+		float	_TabWidth;
 		// strings to use when computing font size
 		std::string _FontSizingChars;
 		std::string _FontSizingFallback;

nel/include/nel/misc/cdb_leaf.h

@@ -96,6 +96,7 @@ public:
 		_Property = 0;
 		_oldProperty = 0;
 		_Type = UNKNOWN;
+		m_Nullable = false;
 		_Changed = false;
 		_LastChangeGC = 0;
 	}
@@ -235,6 +236,9 @@ private:
 	/// property type
 	EPropType			_Type;
 
+	/// nullable
+	bool				m_Nullable;
+
 	/// true if this value has changed
 	bool				_Changed;
 

nel/include/nel/misc/debug.h

@@ -380,7 +380,7 @@ extern bool _assertex_stop_1(bool &ignoreNextTime);
 #define nlassume(exp) do { } while (0)
 #endif
 
-#ifdef NL_NO_DEBUG
+#ifdef NL_NO_ASSERT
 #	define nlassert(exp) nlassume(exp)
 #	define nlassertonce(exp) nlassume(exp)
 #	define nlassertex(exp, str) nlassume(exp)

nel/include/nel/misc/types_nl.h

@@ -174,10 +174,6 @@
 #	define NL_COMP_GCC
 #endif
 
-#if defined(_HAS_CPP0X) || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(NL_COMP_VC_VERSION) && NL_COMP_VC_VERSION >= 110)
-#	define NL_ISO_CPP0X_AVAILABLE
-#endif
-
 #if defined(NL_COMP_GCC) && (__cplusplus >= 201103L)
 #	define NL_NO_EXCEPTION_SPECS
 #endif
@@ -233,6 +229,10 @@
 #	endif
 #endif
 
+#if defined(_HAS_CPP0X) || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(NL_COMP_VC_VERSION) && NL_COMP_VC_VERSION >= 110) || (defined(NL_COMP_GCC) && (GCC_VERSION >= 40400) && (__cplusplus >= 201103L))
+#	define NL_ISO_CPP0X_AVAILABLE
+#endif
+
 // Remove stupid Visual C++ warnings
 #ifdef NL_OS_WINDOWS
 #	pragma warning (disable : 4503)			// STL: Decorated name length exceeded, name was truncated
@@ -274,7 +274,7 @@
 
 //#define NL_NO_DEBUG
 #undef NL_NO_DEBUG
-
+#define NL_NO_ASSERT
 
 // Standard types
 

nel/include/nel/web/http_client_curl.h

@@ -34,7 +34,7 @@ class CCurlHttpClient
 public:
 
 	/// Constructor
-	CCurlHttpClient() : _CurlStruct(NULL) {}
+	CCurlHttpClient() : _CurlStruct(NULL), m_Verify(true) {}
 
 	/// Connect to an http server (string by val is intended). If you specify a whole URL, an attempt will be made to determine the server.
 	bool connect(const std::string &server);
@@ -63,6 +63,8 @@ public:
 	/// Disconnect if connected (otherwise does nothing)
 	void disconnect();
 
+	const char *lastError() { return &m_ErrorBuf[0]; }
+
 protected:
 
 	/// Helper
@@ -78,6 +80,10 @@ private:
 
 	std::vector<uint8>	_ReceiveBuffer;
 	std::string			_Auth; // must be kept here because curl only stores the char pointer
+
+	std::vector<char> m_ErrorBuf;
+	bool m_Verify;
+
 };
 
 extern CCurlHttpClient CurlHttpClient;

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

@@ -4,6 +4,7 @@ ADD_EXECUTABLE(nl_sample_font WIN32 ${SRC})
 
 ADD_DEFINITIONS(-DFONT_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/src/3d/driver/opengl/driver_opengl.h

@@ -999,6 +999,9 @@ private:
 	bool					createWindow(const GfxMode& mode);
 	bool					destroyWindow();
 
+	// Return monitor info and positon in multi monitor setup or false if monitor not found.
+	bool					getMonitorByName(const std::string &name, sint32 &x, sint32 &y, uint32 &w, uint32 &h) const;
+
 	enum EWindowStyle { EWSWindowed, EWSFullscreen };
 
 	void					setWindowSize(uint32 width, uint32 height);

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

@@ -650,8 +650,6 @@ bool CDriverGL::setDisplay(nlWindow wnd, const GfxMode &mode, bool show, bool re
 
 	_win = EmptyWindow;
 
-	_CurrentMode = mode;
-
 	_WindowVisible = false;
 	_Resizable = resizeable;
 	_DestroyWindow = false;
@@ -1194,6 +1192,8 @@ bool CDriverGL::saveScreenMode()
 
 #ifdef HAVE_XRANDR
 
+	// TODO: if using mode switching, save current xrandr mode to _OldSizeID
+	res = true;
 	if (!res && _xrandr_version > 0)
 	{
 		XRRScreenConfiguration *screen_config = XRRGetScreenInfo(_dpy, RootWindow(_dpy, screen));
@@ -1254,6 +1254,8 @@ bool CDriverGL::restoreScreenMode()
 
 #ifdef HAVE_XRANDR
 
+	// TODO: if using mode switching, then restore mode from _OldSizeID
+	res = true;
 	if (!res && _xrandr_version > 0)
 	{
 		Window root = RootWindow(_dpy, screen);
@@ -1348,7 +1350,8 @@ bool CDriverGL::setScreenMode(const GfxMode &mode)
 		&& mode.Width == previousMode.Width
 		&& mode.Height == previousMode.Height
 		&& mode.Depth == previousMode.Depth
-		&& mode.Frequency == previousMode.Frequency)
+		&& mode.Frequency == previousMode.Frequency
+		&& mode.DisplayDevice == previousMode.DisplayDevice)
 		return true;
 
 #if defined(NL_OS_WINDOWS)
@@ -1388,6 +1391,8 @@ bool CDriverGL::setScreenMode(const GfxMode &mode)
 	bool found = false;
 
 #ifdef HAVE_XRANDR
+	// TODO: implement mode switching using xrandr crts
+	found = true;
 
 	if (!found && _xrandr_version > 0)
 	{
@@ -1911,8 +1916,92 @@ bool CDriverGL::setWindowStyle(EWindowStyle windowStyle)
 	return true;
 }
 
+bool CDriverGL::getMonitorByName(const std::string &name, sint32 &x, sint32 &y, uint32 &w, uint32 &h) const
+{
+	bool found = false;
+
+#if HAVE_XRANDR
+	int screen = DefaultScreen(_dpy);
+
+	// xrandr 1.5+
+	if (_xrandr_version >= 105)
+	{
+		int nmonitors = 0;
+		XRRMonitorInfo *monitor = XRRGetMonitors(_dpy, RootWindow(_dpy, screen), 1, &nmonitors);
+		if (!monitor)
+			return false;
+
+		for(sint i = 0; i< nmonitors; ++i)
+		{
+			char* pname = XGetAtomName(_dpy, monitor[i].name);
+			found = (nlstricmp(pname, name) == 0);
+			XFree(pname);
+
+			if (found)
+			{
+				x = monitor[i].x;
+				y = monitor[i].y;
+				w = monitor[i].width;
+				h = monitor[i].height;
+				
+				break;
+			}
+		}
+
+		XRRFreeMonitors(monitor);
+	}
+	else
+	{
+		XRRScreenResources *resources = XRRGetScreenResourcesCurrent(_dpy, RootWindow(_dpy, screen));
+		if (!resources)
+			resources = XRRGetScreenResources(_dpy, RootWindow(_dpy, screen));
+
+		for(uint i = 0; i < resources->noutput; ++i)
+		{
+			XRROutputInfo *output = XRRGetOutputInfo(_dpy, resources, resources->outputs[i]);
+			if (!output)
+				continue;
+
+			if (output->crtc && output->connection == RR_Connected && nlstricmp(name, output->name) == 0)
+			{
+				// physical monitor
+				XRRCrtcInfo *crtc = XRRGetCrtcInfo(_dpy, resources, output->crtc);
+				if (crtc)
+				{
+					found = true;
+					x = crtc->x;
+					y = crtc->y;
+
+					// TODO: test rotation
+					if (crtc->rotation == RR_Rotate_0 || crtc->rotation == RR_Rotate_180)
+					{
+						w = crtc->width;
+						h = crtc->height;
+					}
+					else
+					{
+						w = crtc->height;
+						h = crtc->width;
+					}
+
+					XRRFreeCrtcInfo(crtc);
+				}
+			}
+
+			XRRFreeOutputInfo(output);
+
+			if (found)
+				break;
+		}
+
+		XRRFreeScreenResources(resources);
+	}
+#endif
+	return found;
+}
+
 // --------------------------------------------------
-bool CDriverGL::setMode(const GfxMode& mode)
+bool CDriverGL::setMode(const GfxMode& amode)
 {
 	H_AUTO_OGL(CDriverGL_setMode);
 
@@ -1920,6 +2009,10 @@ bool CDriverGL::setMode(const GfxMode& mode)
 	if (!_DestroyWindow)
 		return true;
 
+#if !(HAVE_XRANDR)
+	const GfxMode &mode = amode;
+#endif
+
 #if defined(NL_OS_WINDOWS)
 	// save relative cursor
 	POINT cursorPos;
@@ -1929,21 +2022,92 @@ bool CDriverGL::setMode(const GfxMode& mode)
 	BOOL cursorPosOk = isSystemCursorInClientArea()
 		&& GetCursorPos(&cursorPos)
 		&& ScreenToClient(_win, &cursorPos);
+
+	// FIXME: this probably needs to use _CurrentMode instead of mode
 	sint curX = (sint)cursorPos.x * (sint)mode.Width;
 	sint curY = (sint)cursorPos.y * (sint)mode.Height;
 #endif
 
+#if HAVE_XRANDR
+	GfxMode mode = amode;
+
+	if (!mode.Windowed)
+	{
+		GfxMode current;
+		if (!getCurrentScreenMode(current))
+			nlinfo("3D: XrandR: Reading active monitor info failed");
+
+		sint newX = _WindowX;
+		sint newY = _WindowY;
+
+		// make sure resolution matches requested or currently active monitor's resolution
+		mode.Width = current.Width;
+		mode.Height = current.Height;
+		if (!mode.DisplayDevice.empty())
+		{
+			uint newW = current.Width;
+			uint newH = current.Height;
+			if (getMonitorByName(mode.DisplayDevice, newX, newY, newW, newH))
+			{
+				mode.Width = newW;
+				mode.Height = newH;
+			}
+			else
+			{
+				nlinfo("3D: XrandR: Reading requested monitor '%s' info failed, using '%s'", mode.DisplayDevice.c_str(), current.DisplayDevice.c_str());
+				mode.DisplayDevice = current.DisplayDevice;
+			}
+		}
+
+		// switching monitors.
+		// first move mouse pointer to target monitor and then move window.
+		// 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;
+			uint mouseY = mode.Height / 2;
+
+			XWindowAttributes xwa;
+			XGetWindowAttributes(_dpy, _win, &xwa);
+			if (xwa.map_state != IsUnmapped)
+			{
+				Window root_win;
+				Window child_win;
+				sint root_x, root_y, win_x, win_y;
+				uint mask;
+
+				Bool res = XQueryPointer(_dpy, _win, &root_win, &child_win, &root_x, &root_y, &win_x, &win_y, &mask);
+				if (res)
+				{
+					mouseX = (uint)((float)win_x * mode.Width / current.Width);
+					mouseY = (uint)((float)win_y * mode.Height / current.Height);
+				}
+			}
+
+			XWarpPointer(_dpy, None, root, None, None, None, None, newX + mouseX, newY + mouseY);
+			XMoveWindow(_dpy, _win, newX, newY);
+			_WindowX = newX;
+			_WindowY = newY;
+			setWindowStyle(EWSFullscreen);
+		}
+	}
+#endif
+
 	if (!setScreenMode(mode))
 		return false;
 
-	// when changing window style, it's possible system change window size too
-	setWindowStyle(mode.Windowed ? EWSWindowed : EWSFullscreen);
-
-	if (!mode.Windowed)
 	_CurrentMode.Depth = mode.Depth;
+	_CurrentMode.Frequency = mode.Frequency;
+	_CurrentMode.DisplayDevice = mode.DisplayDevice;
 
-	setWindowSize(mode.Width, mode.Height);
+	// when changing window style, it's possible system change window size too
+	setWindowStyle(mode.Windowed ? EWSWindowed : EWSFullscreen);
 	setWindowPos(_WindowX, _WindowY);
+	setWindowSize(mode.Width, mode.Height);
 
 	switch (_CurrentMode.Depth)
 	{
@@ -2120,6 +2284,66 @@ bool CDriverGL::getModes(std::vector<GfxMode> &modes)
 	int screen = DefaultScreen(_dpy);
 
 #if defined(HAVE_XRANDR)
+	if (_xrandr_version >= 105)
+	{
+		int nmonitors = 0;
+		// virtual monitors
+		XRRMonitorInfo *monitor = XRRGetMonitors(_dpy, RootWindow(_dpy, screen), 1, &nmonitors);
+		for(sint i = 0; i < nmonitors; ++i)
+		{
+			char * name = XGetAtomName(_dpy, monitor[i].name);
+			GfxMode mode;
+			mode.DisplayDevice = name;
+			mode.Width = monitor[i].width;
+			mode.Height = monitor[i].height;
+			mode.Frequency = 0;
+			modes.push_back(mode);
+			XFree(name);
+		}
+		XRRFreeMonitors(monitor);
+	}
+	else
+	{
+		XRRScreenResources *resources = XRRGetScreenResourcesCurrent(_dpy, RootWindow(_dpy, screen));
+		if (!resources)
+			resources = XRRGetScreenResources(_dpy, RootWindow(_dpy, screen));
+
+		std::map<int, int> resourceModeMap;
+		for(sint i = 0; i< resources->nmode; ++i)
+			resourceModeMap.insert(std::make_pair(resources->modes[i].id, i));
+
+		for(sint i = 0; i < resources->noutput; ++i)
+		{
+			XRROutputInfo *output = XRRGetOutputInfo(_dpy, resources, resources->outputs[i]);
+			if (!output)
+				continue;
+
+			if (output->crtc && output->connection == RR_Connected)
+			{
+				// physical monitor
+				XRRCrtcInfo *crtc = XRRGetCrtcInfo(_dpy, resources, output->crtc);
+				if (crtc)
+				{
+					std::map<int,int>::const_iterator it = resourceModeMap.find(crtc->mode);
+					if (it != resourceModeMap.end())
+					{
+						GfxMode mode;
+						mode.DisplayDevice = output->name;
+						mode.Width = resources->modes[it->second].width;
+						mode.Height = resources->modes[it->second].height;
+						mode.Frequency = 0;
+
+						modes.push_back(mode);
+					}
+					XRRFreeCrtcInfo(crtc);
+				}
+			}
+			XRRFreeOutputInfo(output);
+		}
+
+		XRRFreeScreenResources(resources);
+	}
+	found = modes.size() > 0;
 	if (!found && _xrandr_version >= 100)
 	{
 		XRRScreenConfiguration *screen_config = XRRGetScreenInfo(_dpy, RootWindow(_dpy, screen));
@@ -2255,6 +2479,120 @@ bool CDriverGL::getCurrentScreenMode(GfxMode &mode)
 	int screen = DefaultScreen(_dpy);
 
 #ifdef HAVE_XRANDR
+	int x = 0;
+	int y = 0;
+	Window child;
+
+	// get window position so we can compare monitors (or mouse position if window not visible yet) 
+	XWindowAttributes xwa;
+	XGetWindowAttributes(_dpy, _win, &xwa);
+	if (xwa.map_state != IsUnmapped)
+	{
+		XTranslateCoordinates(_dpy, _win, xwa.root, xwa.x, xwa.y, &x, &y, &child);
+	}
+	else
+	{
+		sint rx, ry, wx, wy;
+		uint mask;
+		Bool res = XQueryPointer(_dpy, RootWindow(_dpy, screen), &child, &child, &rx, &ry, &wx, &wy, &mask);
+		if (res)
+		{
+			x = rx;
+			y = ry;
+		}
+	}
+
+	if (_xrandr_version >= 105)
+	{
+		int nmonitors = 0;
+		XRRMonitorInfo *monitor = XRRGetMonitors(_dpy, RootWindow(_dpy, screen), 1, &nmonitors);
+		if (monitor)
+		{
+			sint bestMatch = -1;
+			for(sint i = 0; i< nmonitors; ++i)
+			{
+				if ((x >= monitor[i].x && x < (monitor[i].x + monitor[i].width) &&
+					y >= monitor[i].y && y < (monitor[i].y + monitor[i].height)) ||
+					(monitor[i].primary && bestMatch == -1))
+				{
+					bestMatch = i;
+				}
+			}
+
+			// best match or primary monitor
+			if (bestMatch != -1)
+			{
+				found = true;
+				char* pname = XGetAtomName(_dpy, monitor[bestMatch].name);
+				mode.DisplayDevice = pname;
+				mode.Width = monitor[bestMatch].width;
+				mode.Height = monitor[bestMatch].height;
+				mode.Windowed = _CurrentMode.Windowed;
+				mode.OffScreen = false;
+				mode.Depth = (uint) DefaultDepth(_dpy, screen);
+				mode.Frequency = 0;
+				XFree(pname);
+			}
+
+			XRRFreeMonitors(monitor);
+		}
+	}
+	else
+	{
+		XRRScreenResources *resources = XRRGetScreenResourcesCurrent(_dpy, RootWindow(_dpy, screen));
+		if (!resources)
+			resources = XRRGetScreenResources(_dpy, RootWindow(_dpy, screen));
+
+		for(uint i = 0; i < resources->noutput; ++i)
+		{
+			XRROutputInfo *output = XRRGetOutputInfo(_dpy, resources, resources->outputs[i]);
+			if (!output)
+				continue;
+
+			if (output->crtc && output->connection == RR_Connected)
+			{
+				XRRCrtcInfo *crtc = XRRGetCrtcInfo(_dpy, resources, output->crtc);
+				if (crtc)
+				{
+					sint width, height;
+					bool match = false;
+
+					// TODO: test rotation
+					if (crtc->rotation == RR_Rotate_0 || crtc->rotation == RR_Rotate_180)
+					{
+						width = crtc->width;
+						height = crtc->height;
+					}
+					else
+					{
+						width = crtc->height;
+						height = crtc->width;
+					}
+
+					if (x >= crtc->x && y >= crtc->y && x < (crtc->x + width) && y < (crtc->y + height))
+					{
+						found = true;
+						mode.DisplayDevice = output->name;
+						mode.Width = width;
+						mode.Height = height;
+						mode.Windowed = _CurrentMode.Windowed;
+						mode.OffScreen = false;
+						mode.Depth = (uint) DefaultDepth(_dpy, screen);
+						mode.Frequency = 0;
+					}
+
+					XRRFreeCrtcInfo(crtc);
+				}
+			}
+
+			XRRFreeOutputInfo(output);
+
+			if (found)
+				break;
+		}
+
+		XRRFreeScreenResources(resources);
+	}
 
 	if (!found && _xrandr_version > 0)
 	{
@@ -2432,7 +2770,6 @@ void CDriverGL::setWindowPos(sint32 x, sint32 y)
 			_DecorationWidth = -1;
 			_DecorationHeight = -1;
 		}
-
 		XMoveWindow(_dpy, _win, x, y);
 	}
 
@@ -2771,6 +3108,9 @@ 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
+	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);
@@ -2778,6 +3118,14 @@ void CDriverGL::setWindowSize(uint32 width, uint32 height)
 		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 copyTextToClipboard(const std::string &text);
-	virtual bool pasteTextFromClipboard(ucstring &text);
+	virtual bool pasteTextFromClipboard(std::string &text);
 };
 
 }

nel/src/3d/driver_user.cpp

@@ -331,6 +331,7 @@ bool CDriverUser::getCurrentScreenMode(CMode &mode)
 	GfxMode		gfxMode;
 	bool		res= _Driver->getCurrentScreenMode(gfxMode);
 	mode.Windowed= gfxMode.Windowed;
+	mode.DisplayDevice= gfxMode.DisplayDevice;
 	mode.Width= gfxMode.Width;
 	mode.Height= gfxMode.Height;
 	mode.Depth= gfxMode.Depth;

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);
@@ -1053,6 +1058,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 +3092,7 @@ namespace NLGUI
 
 		paragraphChange ();
 
-		// clear the pointer to the current image download since all the button are deleted
+		releaseDataDownloads();
-		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();
-		}*/
 	}
 
 	// ***************************************************************************
@@ -6793,7 +6798,7 @@ namespace NLGUI
 
 		_TextAreaTemplate = !templateName.empty() ? templateName : DefaultFormTextAreaGroup;
 
-		std::string content = strFindReplaceAll(elm.serializeChilds(), std::string("\r"), std::string(""));
+		std::string content = strFindReplaceAll(elm.serializeChilds(false), std::string("\r"), std::string(""));
 
 		CInterfaceGroup *textArea = addTextArea (_TextAreaTemplate, _TextAreaName.c_str (), _TextAreaRow, _TextAreaCols, true, content, _TextAreaMaxLength);
 		if (textArea)
@@ -6826,7 +6831,7 @@ namespace NLGUI
 		// if (!_ReadingHeadTag) return;
 
 		// consume all child elements
-		_TitleString = strFindReplaceAll(elm.serializeChilds(), std::string("\t"), std::string(" "));
+		_TitleString = strFindReplaceAll(elm.serializeChilds(false), std::string("\t"), std::string(" "));
 		_TitleString = strFindReplaceAll(_TitleString, std::string("\n"), std::string(" "));
 		setTitle(_TitleString);
 	}

nel/src/gui/html_element.cpp

@@ -142,30 +142,33 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	std::string CHtmlElement::htmlEscape(std::string val, bool isAttribute) const
+	std::string CHtmlElement::htmlEscape(const std::string &val) const
 	{
-		static const std::string searchReplace[] = {
+		if (val.find_first_of("\"'&<>\xA0") == std::string::npos)
-			"&", "&amp;",
+			return val;
-			"<", "&lt;",
-			">", "&gt;",
-			"\xA0", "&nbsp;",
-		};
-		
-		for(uint i = 0; i < (sizeof(searchReplace) / sizeof(searchReplace[0])); i+=2)
-			val = strFindReplaceAll(val, searchReplace[i], searchReplace[i+1]);
 
-		if (isAttribute)
+		std::string ret;
+		// resize is quaranteed, make room for some free replacements
+		ret.reserve(val.size() + 24);
+		for(size_t pos = 0; pos != val.size(); pos++)
 		{
-			static const std::string q = "\"";
+			switch(val[pos])
-			static const std::string quot = "&quot;";
+			{
-			val = strFindReplaceAll(val, q, quot);
+				case '"': ret.append("&quot;"); break;
+				case '\'': ret.append("&#39;"); break;
+				case '&': ret.append("&amp;"); break;
+				case '<': ret.append("&lt;"); break;
+				case '>': ret.append("&gt;"); break;
+				case '\xA0': ret.append("&nbsp;"); break;
+				default : ret.append(&val[pos],1); break;
+			}
 		}
 
-		return val;
+		return ret;
 	}
 
 	// ***************************************************************************
-	std::string CHtmlElement::serializeAttributes() const
+	std::string CHtmlElement::serializeAttributes(bool escape) const
 	{
 		std::string result;
 		for(std::map<std::string, std::string>::const_iterator it = Attributes.begin(); it != Attributes.end(); ++it)
@@ -179,30 +182,30 @@ namespace NLGUI
 					{
 						result += " ";
 					}
-					result += htmlEscape(*it2, true);
+					result += (escape ? htmlEscape(*it2) : *it2);
 				}
 				result += "\"";
 			}
 			else
 			{
-				result += " " + it->first + "=\"" + htmlEscape(it->second, true) + "\"";
+				result += " " + it->first + "=\"" + (escape ? htmlEscape(it->second) : it->second) + "\"";
 			}
 		}
 		return result;
 	}
 
 	// ***************************************************************************
-	std::string CHtmlElement::serializeChilds() const
+	std::string CHtmlElement::serializeChilds(bool escape) const
 	{
 		std::string result;
 		for(std::list<CHtmlElement>::const_iterator it = Children.begin(); it != Children.end(); ++it)
-			result += it->serialize();
+			result += it->serialize(escape);
 
 		return result;
 	}
 
 	// ***************************************************************************
-	std::string CHtmlElement::serialize() const
+	std::string CHtmlElement::serialize(bool escape) const
 	{
 		if (Type == TEXT_NODE)
 		{
@@ -211,12 +214,14 @@ namespace NLGUI
 				parent->ID == HTML_NOSCRIPT))
 			{
 				return Value;
-			} else {
+			} else if (escape) {
 				return htmlEscape(Value);
+			} else {
+				return Value;
 			}
 		}
 
-		std::string result = "<" + Value + serializeAttributes() + ">";
+		std::string result = "<" + Value + serializeAttributes(escape) + ">";
 
 		if (ID == HTML_AREA || ID == HTML_BASE || ID == HTML_BR ||
 			ID == HTML_COL || ID == HTML_EMBED || ID == HTML_HR ||
@@ -231,7 +236,7 @@ namespace NLGUI
 			result += "\n";
 
 		if (!Children.empty())
-			result += serializeChilds();
+			result += serializeChilds(escape);
 
 		result += "</" + Value + ">";
 

nel/src/gui/lua_helper.cpp

@@ -42,6 +42,12 @@
 	#define assert(x)
 #endif
 
+// Always use unique_ptr with ValyriaTear/luabind on Ubuntu 20,
+// since the setting is not stored in build_information.hpp
+#ifndef LUABIND_USE_CXX11
+#define LUABIND_USE_CXX11
+#endif
+
 #include <luabind/luabind.hpp>
 #include <nel/misc/algo.h>
 #include <nel/misc/path.h>

nel/src/gui/lua_ihm.cpp

@@ -48,6 +48,12 @@
 #	define assert(x)
 #endif
 
+// Always use unique_ptr with ValyriaTear/luabind on Ubuntu 20,
+// since the setting is not stored in build_information.hpp
+#ifndef LUABIND_USE_CXX11
+#define LUABIND_USE_CXX11
+#endif
+
 #include <luabind/luabind.hpp>
 // in luabind > 0.6, LUABIND_MAX_ARITY is set to 10
 #if LUABIND_MAX_ARITY == 10
@@ -220,7 +226,9 @@ namespace NLGUI
 	void CLuaIHM::push(CLuaState &ls, const ucstring &value)
 	{
 		//H_AUTO(Lua_CLuaIHM_push)
-	#if LUABIND_VERSION > 600
+	#if defined(LUABIND_STACK_HPP_INCLUDED)
+		luabind::push(ls.getStatePointer(), value);
+	#elif (LUABIND_VERSION > 600)
 		luabind::detail::push(ls.getStatePointer(), value);
 	#else
 		luabind::object obj(ls.getStatePointer(), value);
@@ -1115,7 +1123,6 @@ namespace NLGUI
 		if(!pIE)
 		{
 			ls.pushNil();
-			nlerror("getCurrentWindowUnder(): No UICaller found. return Nil");
 		}
 		else
 		{
@@ -1156,7 +1163,9 @@ namespace NLGUI
 			case CInterfaceExprValue::RGBA:
 				{
 					CRGBA color = value.getRGBA();
-	#if LUABIND_VERSION > 600
+	#if defined(LUABIND_STACK_HPP_INCLUDED)
+					luabind::push(ls.getStatePointer(), color);
+	#elif (LUABIND_VERSION > 600)
 					luabind::detail::push(ls.getStatePointer(), color);
 	#else
 					luabind::object obj(ls.getStatePointer(), color);
@@ -1416,7 +1425,9 @@ namespace NLGUI
 			case CReflectedProperty::UCString:
 			{
 				ucstring str = (reflectedObject.*(property.GetMethod.GetUCString))();
-	#if LUABIND_VERSION > 600
+	#if defined(LUABIND_STACK_HPP_INCLUDED)
+				luabind::push(ls.getStatePointer(), str);
+	#elif (LUABIND_VERSION > 600)
 				luabind::detail::push(ls.getStatePointer(), str);
 	#else
 				luabind::object obj(ls.getStatePointer(), str);
@@ -1427,7 +1438,9 @@ namespace NLGUI
 			case CReflectedProperty::UCStringRef:
 			{
 				ucstring str = (reflectedObject.*(property.GetMethod.GetUCStringRef))();
-	#if LUABIND_VERSION > 600
+	#if defined(LUABIND_STACK_HPP_INCLUDED)
+				luabind::push(ls.getStatePointer(), str);
+	#elif (LUABIND_VERSION > 600)
 				luabind::detail::push(ls.getStatePointer(), str);
 	#else
 				luabind::object obj(ls.getStatePointer(), str);
@@ -1442,7 +1455,9 @@ namespace NLGUI
 			case CReflectedProperty::RGBA:
 			{
 				CRGBA color = (reflectedObject.*(property.GetMethod.GetRGBA))();
-	#if LUABIND_VERSION > 600
+	#if defined(LUABIND_STACK_HPP_INCLUDED)
+				luabind::push(ls.getStatePointer(), color);
+	#elif (LUABIND_VERSION > 600)
 				luabind::detail::push(ls.getStatePointer(), color);
 	#else
 				luabind::object obj(ls.getStatePointer(), color);

nel/src/gui/lua_manager.cpp

@@ -70,7 +70,17 @@ namespace NLGUI
 		}
 		catch( const ELuaError &e )
 		{
-			nlwarning( e.luaWhat().c_str() );
+			#if !FINAL_VERSION
+			nlwarning("--- LUA ERROR ---");
+			nlwarning(e.luaWhat().c_str());
+			std::vector<std::string> res;
+			NLMISC::explode(luaScript, std::string("\n"), res);
+			for(uint k = 0; k < res.size(); ++k)
+			{
+				nlwarning("%.05u %s", k, res[k].c_str());
+			}
+			nlwarning("--- ********* ---");
+			#endif
 			return false;
 		}
 

nel/src/gui/view_bitmap.cpp

@@ -481,7 +481,13 @@ namespace NLGUI
 		}
 		else
 		{
+			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

@@ -95,6 +95,7 @@ namespace NLGUI
 		_FontWidth= 0;
 		_FontHeight = 0;
 		_FontLegHeight = 0;
+		_TabWidth= 0;
 
 		_TextSelection= false;
 		_TextSelectionStart= 0;
@@ -1284,7 +1285,7 @@ namespace NLGUI
 					px += firstSpace;
 					// skip tabulation before current word
 					if(currWord.Format.TabX)
-						px= max(px, (float)(_XReal * _Scale + currWord.Format.TabX*_FontWidth));
+						px= max(px, (float)(_XReal * _Scale + currWord.Format.TabX*_TabWidth));
 
 					// draw. We take floorf px to avoid filtering of letters that are not located on a pixel boundary
 					float fx = px / _Scale;
@@ -1468,7 +1469,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())));
 	}
 
 	// ***************************************************************************
@@ -1767,7 +1768,7 @@ namespace NLGUI
 				getFormatTagChange(i, formatTagIndex, wordFormat);
 
 				// Ensure the line witdh count the tab
-				rWidthCurrentLine= max(rWidthCurrentLine, (float)wordFormat.TabX*_FontWidth);
+				rWidthCurrentLine= max(rWidthCurrentLine, (float)wordFormat.TabX*_TabWidth);
 			}
 
 			NL3D::UTextContext *TextContext = CViewRenderer::getTextContext(_FontName);
@@ -1951,7 +1952,7 @@ namespace NLGUI
 
 				// compute size of spaces/Tab + word
 				newLineWidth = lineWidth + numSpaces * _SpaceWidth;
-				newLineWidth = max(newLineWidth, (float)wordFormat.TabX*_FontWidth);
+				newLineWidth = max(newLineWidth, (float)wordFormat.TabX*_TabWidth);
 				newLineWidth+= si.StringWidth;
 			}
 			//
@@ -3113,8 +3114,6 @@ namespace NLGUI
 		TextContext->setEmbolden (_Embolden);
 		TextContext->setOblique (_Oblique);
 
-#if 1
-
 		UTextContext::CStringInfo si = TextContext->getStringInfo("XO");
 		float xoHeight = si.StringHeight;
 
@@ -3145,34 +3144,14 @@ namespace NLGUI
 		si = TextContext->getStringInfo(" ");
 		_SpaceWidth = si.StringWidth;
 
-		// Font Width (used for <tab>)
+		// Font Width
 		si = TextContext->getStringInfo("O");
 		_FontWidth = si.StringWidth;
 
-#else
+		//  Tab Width (used for {Txx})
-
+		// if not set to "_", breaks item help window
-		// Letter size
-		UTextContext::CStringInfo si = TextContext->getStringInfo(_FontSizingChars);
-
-		// font generator changes unknown glyphs to dot '.'. use fallback if it looks odd
-		if (_FontSize > (si.StringHeight + si.StringLine))
-		{
-			si = TextContext->getStringInfo(_FontSizingFallback);
-		}
-
-		// add a padding of 1 pixel else the top will be truncated
-		_FontHeight = si.StringHeight + 1;
-		_FontLegHeight = si.StringLine;
-
-		// Space width
-		si = TextContext->getStringInfo(" ");
-		_SpaceWidth = si.StringWidth;
-
-		// Font Width (used for <tab>)
 		si = TextContext->getStringInfo("_");
-		_FontWidth = si.StringWidth;
+		_TabWidth = si.StringWidth;
-
-#endif
 	}
 
 
@@ -3641,6 +3620,7 @@ namespace NLGUI
 		f.serial(_Localized);
 		SERIAL_SINT(_FontSize);
 		SERIAL_UINT(_FontWidth);
+		SERIAL_UINT(_TabWidth);
 		SERIAL_UINT(_FontHeight);
 		SERIAL_UINT(_FontLegHeight);
 		f.serial(_SpaceWidth);

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

@@ -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);
 
@@ -141,6 +153,13 @@ void CCDBNodeLeaf::readDelta(TGameCycle gc, CBitMemStream & f )
 	{
 		// Read the Property Value according to the Property Type.
 		uint64 recvd = 0;
+
+		uint64 isNull = 0;
+		if (m_Nullable)
+		{
+			f.serial(isNull, 1);
+		}
+
 		uint bits;
 		if (_Type == TEXT)
 			bits = 32;

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/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/web/http_client_curl.cpp

@@ -75,8 +75,9 @@ static const std::string CAFilename = "cacert.pem"; // https://curl.haxx.se/docs
 // ***************************************************************************
 bool CCurlHttpClient::verifyServer(bool verify)
 {
-	curl_easy_setopt(_Curl, CURLOPT_SSL_VERIFYHOST, verify ? 2 : 0);
+	m_Verify = verify;
 	curl_easy_setopt(_Curl, CURLOPT_SSL_VERIFYPEER, verify ? 1 : 0);
+	curl_easy_setopt(_Curl, CURLOPT_SSL_VERIFYHOST, verify ? 2 : 0);
 
 	// specify custom CA certs
 	CCurlCertificates::addCertificateFile(CAFilename);
@@ -97,8 +98,8 @@ bool CCurlHttpClient::sendRequest(const std::string& methodWB, const std::string
 	curl_easy_setopt(_Curl, CURLOPT_URL, url.c_str());
 	if (url.length() > 8 && (url[4] == 's' || url[4] == 'S')) // 01234 https
 	{
-		curl_easy_setopt(_Curl, CURLOPT_SSL_VERIFYPEER, 1L);
+		curl_easy_setopt(_Curl, CURLOPT_SSL_VERIFYPEER, m_Verify ? 1L : 0);
-		curl_easy_setopt(_Curl, CURLOPT_SSL_VERIFYHOST, 2L);
+		curl_easy_setopt(_Curl, CURLOPT_SSL_VERIFYHOST, m_Verify ? 2L : 0);
 	}
 
 	// Authentication
@@ -124,15 +125,17 @@ bool CCurlHttpClient::sendRequest(const std::string& methodWB, const std::string
 	curl_easy_setopt(_Curl, CURLOPT_WRITEFUNCTION, CCurlHttpClient::writeDataFromCurl);
 	curl_easy_setopt(_Curl, CURLOPT_WRITEDATA, this);
 
-	char errorbuf [CURL_ERROR_SIZE+1];
+	if (!m_ErrorBuf.size())
-	curl_easy_setopt(_Curl, CURLOPT_ERRORBUFFER, errorbuf);
+		m_ErrorBuf.resize(CURL_ERROR_SIZE + 1);
+	m_ErrorBuf[0] = '\0';
+	curl_easy_setopt(_Curl, CURLOPT_ERRORBUFFER, &m_ErrorBuf[0]);
 
 	// Send
 	CURLcode res = curl_easy_perform(_Curl);
 	if (res != 0)
 	{
 		if (verbose)
-			nlwarning(errorbuf);
+			nlwarning(&m_ErrorBuf[0]);
 		return false;
 	}
 

nelns/admin_service/admin_service.cpp

@@ -629,7 +629,11 @@ void sqlInit ()
 		nlerror ("mysql_init() failed");
 	}
 
+#if LIBMYSQL_VERSION_ID < 80000
 	my_bool opt = true;
+#else
+	bool opt = true;
+#endif
 	if (mysql_options (db, MYSQL_OPT_RECONNECT, &opt))
 	{
 		mysql_close(db);

ryzom/client/src/character_cl.cpp

@@ -4553,13 +4553,20 @@ void CCharacterCL::applyBehaviourFlyingHPs(const CBehaviourContext &bc, const MB
 {
 	nlassert(targetHitDates.size()==bc.Targets.Targets.size());
 
-	if(!bc.Targets.Targets.empty())
+	if (behaviour.DeltaHP == 0 || bc.Targets.Targets.empty())
+		return;
+
+	CRGBA deltaHPColor(0, 0, 0);
+	for (size_t i=0; i<bc.Targets.Targets.size(); ++i)
 	{
-		if(behaviour.DeltaHP != 0)
+		if(bc.Targets.Targets[i].DeltaHP == 0)
+			continue;
+
+		CEntityCL *target2 = EntitiesMngr.entity(bc.Targets.Targets[i].TargetSlot);
+		if(target2)
 		{
-			CRGBA deltaHPColor(0, 0, 0);
 			// if it's a hit
-			if( behaviour.DeltaHP < 0 )
+			if(bc.Targets.Targets[i].DeltaHP < 0)
 			{
 				// if the behaviour is casted by the user
 				if( slot() == 0 )
@@ -4590,13 +4597,7 @@ void CCharacterCL::applyBehaviourFlyingHPs(const CBehaviourContext &bc, const MB
 				deltaHPColor = CRGBA(0,220,0);
 			}
 
-			// Set the delta HP
+			target2->addHPOutput(bc.Targets.Targets[i].DeltaHP, deltaHPColor, float(targetHitDates[i]-TimeInSec));
-			for (size_t i=0; i<bc.Targets.Targets.size(); ++i)
-			{
-				CEntityCL *target2 = EntitiesMngr.entity(bc.Targets.Targets[i].TargetSlot);
-				if(target2)
-					target2->addHPOutput(behaviour.DeltaHP, deltaHPColor, float(targetHitDates[i]-TimeInSec));
-			}
 		}
 	}
 }
@@ -6273,6 +6274,11 @@ void CCharacterCL::updateVisiblePostPos(const NLMISC::TTime &currentTimeInMs, CE
 					pos = (box().getMin() + box().getMax())/2;
 					pos.z = box().getMax().z;
 				}
+
+				CRaceStatsSheet *sheet = const_cast<CRaceStatsSheet*>(UserEntity->playerSheet());
+				float namePosZ = sheet->GenderInfos[UserEntity->getGender()].NamePosZNormal;
+				if (pos.z > box().getMin().z + namePosZ)
+					pos.z = box().getMin().z + namePosZ;
 				nlassert(isValidDouble(pos.x) && isValidDouble(pos.y) && isValidDouble(pos.z));
 				_CurrentBubble->Position = pos;
 			}
@@ -9705,7 +9711,7 @@ NLMISC_COMMAND(projectile, "Cast a projectile on another entity", "<spellID> <st
 		double dist = (target->pos() - ch->pos()).norm();
 		bool resist = false;
 		if (args.size() > 4) fromString(args[4], resist);
-		bc.Targets.Targets.push_back(CMultiTarget::CTarget(targetSlot, resist, (uint8) ceilf((float) (dist /  MULTI_TARGET_DISTANCE_UNIT))));
+		bc.Targets.Targets.push_back(CMultiTarget::CTarget(targetSlot, resist, (uint8) ceilf((float) (dist /  MULTI_TARGET_DISTANCE_UNIT)), -11));
 	}
 	bc.BehavTime = TimeInSec;
 	ch->applyBehaviour(bc);
@@ -9743,7 +9749,7 @@ NLMISC_COMMAND(mtProjectile, "Cast a projectile on one or several entities", "<c
 			if (mainTarget)
 			{
 				double dist = (mainTarget->pos() - ch->pos()).norm();
-				bc.Targets.Targets.push_back(CMultiTarget::CTarget(mainTargetSlot, false, (uint8) ceilf((float) (dist /  MULTI_TARGET_DISTANCE_UNIT))));
+				bc.Targets.Targets.push_back(CMultiTarget::CTarget(mainTargetSlot, false, (uint8) ceilf((float) (dist /  MULTI_TARGET_DISTANCE_UNIT)), 1));
 				for(sint k = 1; k < (sint) (args.size() - 4); ++k)
 				{
 					uint secondaryTargetSlot;
@@ -9753,7 +9759,7 @@ NLMISC_COMMAND(mtProjectile, "Cast a projectile on one or several entities", "<c
 					if (secondaryTarget)
 					{
 						dist = (secondaryTarget->pos() - mainTarget->pos()).norm();
-						bc.Targets.Targets.push_back(CMultiTarget::CTarget(secondaryTargetSlot, false, (uint8) ceilf((float) (dist /  MULTI_TARGET_DISTANCE_UNIT))));
+						bc.Targets.Targets.push_back(CMultiTarget::CTarget(secondaryTargetSlot, false, (uint8) ceilf((float) (dist /  MULTI_TARGET_DISTANCE_UNIT)), k+1));
 					}
 				}
 			}
@@ -9770,7 +9776,7 @@ NLMISC_COMMAND(mtProjectile, "Cast a projectile on one or several entities", "<c
 				if (target)
 				{
 					double dist = (target->pos() - ch->pos()).norm();
-					bc.Targets.Targets.push_back(CMultiTarget::CTarget(targetSlot, false, (uint8) ceilf((float) (dist /  MULTI_TARGET_DISTANCE_UNIT))));
+					bc.Targets.Targets.push_back(CMultiTarget::CTarget(targetSlot, false, (uint8) ceilf((float) (dist /  MULTI_TARGET_DISTANCE_UNIT)), k+1));
 				}
 			}
 		}
@@ -9787,7 +9793,7 @@ NLMISC_COMMAND(mtProjectile, "Cast a projectile on one or several entities", "<c
 				if (target)
 				{
 					double dist = (target->pos() - startSlot->pos()).norm();
-					bc.Targets.Targets.push_back(CMultiTarget::CTarget(targetSlot, false, (uint8) ceilf((float) (dist /  MULTI_TARGET_DISTANCE_UNIT))));
+					bc.Targets.Targets.push_back(CMultiTarget::CTarget(targetSlot, false, (uint8) ceilf((float) (dist /  MULTI_TARGET_DISTANCE_UNIT)), k+1));
 					startSlot = target;
 				}
 			}
@@ -10100,6 +10106,7 @@ NLMISC_COMMAND(attack, "simulate an attack", "<slot> <intensity> <hit_type> <loc
 	CMultiTarget::CTarget target;
 	target.TargetSlot = UserEntity->selection();
 	target.Info = dsPower | (dsType << 3);
+	target.DeltaHP = -20;
 	bc.Targets.Targets.push_back(target);
 	bc.BehavTime = TimeInSec;
 	bc.Behav.DeltaHP = -20;
@@ -10154,7 +10161,7 @@ NLMISC_COMMAND(rangeAttack, "simulate a range attack", "<slot> [intensity] [loca
 	CEntityCL *target = EntitiesMngr.entity(targetSlot);
 	if (!target) return false;
 	double dist = (target->pos() - entity->pos()).norm();
-	bc.Targets.Targets.push_back(CMultiTarget::CTarget(targetSlot, false, (uint8) ceilf((float) (dist /  MULTI_TARGET_DISTANCE_UNIT))));
+	bc.Targets.Targets.push_back(CMultiTarget::CTarget(targetSlot, false, (uint8) ceilf((float) (dist /  MULTI_TARGET_DISTANCE_UNIT)), -10));
 	bc.Behav.DeltaHP = -10;
 	entity->applyBehaviour(bc);
 	return true;
@@ -10188,7 +10195,7 @@ NLMISC_COMMAND(creatureAttack, "simulate a creature attack (2 attaques per creat
 	{
 		fromString(args[8], resist);
 	}
-	bc.Targets.Targets.push_back(CMultiTarget::CTarget(targetSlot, false, (uint8) ceilf((float) (dist /  MULTI_TARGET_DISTANCE_UNIT))));
+	bc.Targets.Targets.push_back(CMultiTarget::CTarget(targetSlot, false, (uint8) ceilf((float) (dist /  MULTI_TARGET_DISTANCE_UNIT)), -15));
 	bc.Behav.CreatureAttack.ActionDuration = 0;
 	uint magicImpactIntensity = 1;
 	if (args.size() > 3)

ryzom/client/src/client_cfg.cpp

@@ -302,6 +302,7 @@ CClientConfig::CClientConfig()
 	SelectedSlot		= 0;						// Default is slot 0
 
 	Windowed			= false;					// Default is windowed mode.
+	MonitorName			= "";
 	Width				= 0;						// Default Width for the window (0 = current screen resolution).
 	Height				= 0;						// Default Height for the window (0 = current screen resolution).
 	Depth				= 32;						// Default Bit per Pixel.
@@ -412,6 +413,7 @@ CClientConfig::CClientConfig()
 	CameraRecorderPrefix = "cam_rec";
 	CameraRecorderBlend  = true;
 
+	ScreenShotDirectory = "screenshots";
 	ScreenShotWidth		= 0;
 	ScreenShotHeight	= 0;
 	ScreenShotFullDetail = true;
@@ -847,6 +849,8 @@ void CClientConfig::setValues()
 	}
 	else
 		cfgWarning("Default value used for 'Fullscreen'");
+
+	READ_STRING_FV(MonitorName);
 	// Width
 	READ_INT_FV(Width)
 	// Height
@@ -1139,6 +1143,7 @@ void CClientConfig::setValues()
 	READ_BOOL_FV(CameraRecorderBlend)
 
 	// Screenshot
+	READ_STRING_FV(ScreenShotDirectory)
 	READ_INT_FV(ScreenShotWidth)
 	READ_INT_FV(ScreenShotHeight)
 	READ_BOOL_FV(ScreenShotFullDetail)
@@ -1294,7 +1299,6 @@ void CClientConfig::setValues()
 	if (varPtr)
 	{
 		if (nlstricmp(varPtr->asString(), "Auto") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvAuto;
-		else if (nlstricmp(varPtr->asString(), "FMod") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvFMod;
 		else if (nlstricmp(varPtr->asString(), "OpenAL") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvOpenAL;
 		else if (nlstricmp(varPtr->asString(), "DirectSound") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvDirectSound;
 		else if (nlstricmp(varPtr->asString(), "XAudio2") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvXAudio2;
@@ -1993,6 +1997,11 @@ void CClientConfig::serial(NLMISC::IStream &f)
 		f.serial(Light);
 		f.xmlPop();
 
+		f.xmlPushBegin("MonitorName");
+		f.xmlPushEnd();
+		f.serial(MonitorName);
+		f.xmlPop();
+
 		f.xmlPushBegin("Windowed");
 		f.xmlPushEnd();
 		f.serial(Windowed);

ryzom/client/src/client_cfg.h

@@ -58,7 +58,7 @@ using std::string;
 struct CClientConfig
 {
 	enum TDriver3D { DrvAuto = 0, OpenGL, Direct3D, OpenGLES };
-	enum TDriverSound { SoundDrvAuto = 0, SoundDrvFMod, SoundDrvOpenAL, SoundDrvDirectSound, SoundDrvXAudio2 };
+	enum TDriverSound { SoundDrvAuto = 0, SoundDrvOpenAL, SoundDrvDirectSound, SoundDrvXAudio2 };
 	enum TStageLCTUsage { StageUseNoLCT = 0, StageUseAllLCT, StageUsePosOnlyLCT };
 
 	// the config file must be always be available
@@ -137,6 +137,8 @@ struct CClientConfig
 	TDriver3D		Driver3D;
 	/// Application start in a window or in fullscreen.
 	bool			Windowed;
+	/// Monitor to use for fullscreen
+	std::string		MonitorName;
 	/// Width for the Application.
 	uint16			Width;
 	/// Height for the Application.
@@ -304,6 +306,7 @@ struct CClientConfig
 	bool			CameraRecorderBlend;
 
 	/// Screen shot
+	string			ScreenShotDirectory;
 	uint			ScreenShotWidth;	// If 0 : normal screen shot, else custom screen shot without interface
 	uint			ScreenShotHeight;
 	bool			ScreenShotFullDetail; // If set to true, then load balancing will be disabled for the duration of the screenshot

ryzom/client/src/commands.cpp

@@ -408,6 +408,18 @@ NLMISC_COMMAND(afk, "Set the player as 'away from keyboard'","[<custom text>]")
 	return true;
 }
 
+NLMISC_COMMAND(selfkill, "Kill the player ","")
+{
+	CBitMemStream out;
+	if(!GenericMsgHeaderMngr.pushNameToStream("COMMAND:SELFKILL", out))
+	{
+		nlwarning("Unknown message name COMMAND:SELFKILL");
+		return false;
+	}
+	NetMngr.push(out);
+	return true;
+}
+
 bool randomCheckCharset(std::string const& str)
 {
 	std::string::const_iterator it, itEnd = str.end();

ryzom/client/src/connection.cpp

@@ -198,38 +198,9 @@ bool hasPrivilegeTESTER() { return (UserPrivileges.find(":TESTER:") != std::stri
 // Restore the video mode (fullscreen for example) after the connection (done in a window)
 void connectionRestoreVideoMode ()
 {
-	// Setup full screen if we have to
-	UDriver::CMode mode;
-	Driver->getCurrentScreenMode(mode);
-
-	if (mode.Windowed)
-	{
-		uint32 width, height;
-		Driver->getWindowSize(width, height);
-		mode.Width = width;
-		mode.Height = height;
-	}
-
-	// don't allow sizes smaller than 1024x768
-	if (ClientCfg.Width < 1024) ClientCfg.Width = 1024;
-	if (ClientCfg.Height < 768) ClientCfg.Height = 768;
-
 	if (StereoDisplay)
 		StereoDisplayAttached = StereoDisplay->attachToDisplay();
 
-	if (!StereoDisplayAttached && (
-		(ClientCfg.Windowed != mode.Windowed) ||
-		(ClientCfg.Width != mode.Width) ||
-		(ClientCfg.Height != mode.Height)))
-	{
-		mode.Windowed	= ClientCfg.Windowed;
-		mode.Depth		= uint8(ClientCfg.Depth);
-		mode.Width		= ClientCfg.Width;
-		mode.Height		= ClientCfg.Height;
-		mode.Frequency	= ClientCfg.Frequency;
-		setVideoMode(mode);
-	}
-
 	// And setup hardware mouse if we have to
 	InitMouseWithCursor (ClientCfg.HardwareCursor && !StereoDisplayAttached);
 	SetMouseFreeLook ();
@@ -1293,19 +1264,7 @@ TInterfaceState globalMenu()
 
 	// Restore video mode
 	if (ClientCfg.SelectCharacter == -1)
-	{
-		if (ClientCfg.Windowed)
-		{
-			// if used changed window resolution in char select
-			// if we don't update ClientCfg, then UI from icfg is restored wrong
-			uint32 width, height;
-			Driver->getWindowSize(width, height);
-			ClientCfg.Width = width;
-			ClientCfg.Height = height;
-		}
-
 		connectionRestoreVideoMode ();
-	}
 
 	// Skip intro next time
 	ClientCfg.writeBool("SkipIntro", true);

ryzom/client/src/far_tp.cpp

@@ -466,7 +466,7 @@ void CLoginStateMachine::run()
 			/// check the data to check if patch needed
 			CLoginProgressPostThread::getInstance().step(CLoginStep(LoginStep_PostLogin, "login_step_post_login"));
 
-			if (!ClientCfg.PatchWanted || (Args.haveArg("n") && Args.getLongArg("nopatch").front() == "1"))
+			if (!ClientCfg.PatchWanted || Args.haveLongArg("nopatch"))
 			{
 				// client don't want to be patched !
 				_CurrentState = st_display_eula;

ryzom/client/src/init.cpp

@@ -1061,43 +1061,48 @@ void prelogInit()
 			return;
 		}
 
-		// used to determine screen default resolution
-		if (ClientCfg.Width < 800 || ClientCfg.Height < 600)
-		{
 		UDriver::CMode mode;
-
+		// first run (no client.cfg)
-			CConfigFile::CVar *varPtr = NULL;
+		if (ClientCfg.Width == 0  || ClientCfg.Height == 0)
-
+		{
-			if (!ClientCfg.Windowed && Driver->getCurrentScreenMode(mode))
+			if (Driver->getCurrentScreenMode(mode))
 			{
+				// fullscreen, using monitor resolution
+				mode.Windowed = false;
+
+				ClientCfg.MonitorName = mode.DisplayDevice;
+				ClientCfg.Windowed = mode.Windowed;
 				ClientCfg.Width = mode.Width;
 				ClientCfg.Height = mode.Height;
 				ClientCfg.Depth = mode.Depth;
 				ClientCfg.Frequency = mode.Frequency;
-
-				// update client.cfg with detected depth and frequency
-				varPtr = ClientCfg.ConfigFile.getVarPtr("Depth");
-				if(varPtr)
-					varPtr->forceAsInt(ClientCfg.Depth);
-
-				varPtr = ClientCfg.ConfigFile.getVarPtr("Frequency");
-				if(varPtr)
-					varPtr->forceAsInt(ClientCfg.Frequency);
 			}
 			else
 			{
+				// fallback
+				ClientCfg.Windowed = true;
 				ClientCfg.Width = 1024;
 				ClientCfg.Height = 768;
 			}
 
 			// update client.cfg with detected resolution
-			varPtr = ClientCfg.ConfigFile.getVarPtr("Width");
+			ClientCfg.writeBool("FullScreen", !ClientCfg.Windowed, true);
-			if(varPtr)
+			ClientCfg.writeString("MonitorName", ClientCfg.MonitorName, true);
-				varPtr->forceAsInt(ClientCfg.Width);
+			ClientCfg.writeInt("Width", ClientCfg.Width, true);
+			ClientCfg.writeInt("Height", ClientCfg.Height, true);
+			ClientCfg.writeInt("Depth", ClientCfg.Depth, true);
+			ClientCfg.writeInt("Frequency", ClientCfg.Frequency, true);
 
-			varPtr = ClientCfg.ConfigFile.getVarPtr("Height");
+			ClientCfg.ConfigFile.save();
-			if(varPtr)
+		}
-				varPtr->forceAsInt(ClientCfg.Height);
+		else
+		{
+			mode.DisplayDevice = ClientCfg.MonitorName;
+			mode.Windowed = ClientCfg.Windowed;
+			mode.Width = ClientCfg.Width;
+			mode.Height = ClientCfg.Height;
+			mode.Depth = ClientCfg.Depth;
+			mode.Frequency = ClientCfg.Frequency;
 		}
 
 		CLoginProgressPostThread::getInstance().step(CLoginStep(LoginStep_VideoModeSetup, "login_step_video_mode_setup"));
@@ -1107,25 +1112,6 @@ void prelogInit()
 		// Check the driver is not is 16 bits
 		checkDriverDepth ();
 
-		UDriver::CMode mode;
-
-		if (Driver->getCurrentScreenMode(mode))
-		{
-			// use current mode if its smaller than 1024x768
-			// mode should be windowed already, but incase its not, use the mode as is
-			if (mode.Windowed && (mode.Width > 1024 && mode.Height > 768))
-			{
-				mode.Width		= 1024;
-				mode.Height		= 768;
-			}
-		}
-		else
-		{
-			mode.Width = 1024;
-			mode.Height = 768;
-			mode.Windowed = true;
-		}
-
 		// Disable Hardware Vertex Program.
 		if(ClientCfg.DisableVtxProgram)
 			Driver->disableHardwareVertexProgram();
@@ -1260,10 +1246,11 @@ void prelogInit()
 		else
 		{
 			// position is not saved in config so center the window
-			if (Driver->getCurrentScreenMode(mode))
+			UDriver::CMode tmp;
+			if (Driver->getCurrentScreenMode(tmp))
 			{
-				posX = (mode.Width - Driver->getWindowWidth())/2;
+				posX = (tmp.Width - Driver->getWindowWidth())/2;
-				posY = (mode.Height - Driver->getWindowHeight())/2;
+				posY = (tmp.Height - Driver->getWindowHeight())/2;
 			}
 		}
 
@@ -1456,6 +1443,15 @@ void prelogInit()
 	}
 }
 
+void stopSoundMngr()
+{
+	if (SoundMngr)
+	{
+		delete SoundMngr;
+		SoundMngr = NULL;
+	}
+}
+
 
 // ***************************************************************************
 void	initBotObjectSelection()
@@ -1588,6 +1584,39 @@ void postlogInit()
 		// set the primitive context
 		CPrimitiveContext::instance().CurrentLigoConfig = &LigoConfig;
 
+		{
+			H_AUTO(InitRZSound)
+
+			if (!SoundMngr)
+			{
+				// Init the sound manager
+				nmsg = "Initializing sound manager...";
+				ProgressBar.newMessage(ClientCfg.buildLoadingString(nmsg));
+				if (ClientCfg.SoundOn)
+				{
+					SoundMngr = new CSoundManager(&ProgressBar);
+					try
+					{
+						SoundMngr->init(&ProgressBar);
+					}
+					catch (const Exception &e)
+					{
+						nlwarning("init : Error when creating 'SoundMngr' : %s", e.what());
+						delete SoundMngr;
+						SoundMngr = NULL;
+					}
+
+					if (SoundMngr)
+					{
+						// init the SoundMngr with backuped volume
+						SoundMngr->setSFXVolume(ClientCfg.SoundSFXVolume);
+						SoundMngr->setGameMusicVolume(ClientCfg.SoundGameMusicVolume);
+					}
+				}
+
+			}
+		}
+
 		{
 			H_AUTO(InitRZShIdI)
 

ryzom/client/src/interface_v3/action_handler_game.cpp

@@ -1095,6 +1095,20 @@ public:
 REGISTER_ACTION_HANDLER( CHandlerContextWebPage, "context_web_page");
 
 
+// ***************************************************************************
+class CHandlerFullMap : public IActionHandler
+{
+public:
+	void execute (CCtrlBase * /* pCaller */, const std::string &/* sParams */)
+	{
+		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
+
+		CLuaManager::getInstance().executeLuaScript("game:openFullMap()", true);
+	}
+};
+REGISTER_ACTION_HANDLER( CHandlerFullMap, "fullmap");
+
+
 
 
 // ***************************************************************************
@@ -3458,6 +3472,7 @@ class CHandlerGameConfigApply : public IActionHandler
 			{
 				// Get W, H
 				sint w = 1024, h = 768;
+				string name;
 				{
 					CDBGroupComboBox *pCB = dynamic_cast<CDBGroupComboBox*>(CWidgetManager::getInstance()->getElementFromId( GAME_CONFIG_VIDEO_MODES_COMBO ));
 					if( pCB != NULL )
@@ -3467,6 +3482,11 @@ class CHandlerGameConfigApply : public IActionHandler
 						fromString(tmp, w);
 						tmp = vidModeStr.substr(vidModeStr.find('x')+2,vidModeStr.size());
 						fromString(tmp, h);
+
+						// extract monitor "1024x768 (VGA-1)"
+						string::size_type pos = vidModeStr.find('(');
+						if (pos != std::string::npos)
+							name = vidModeStr.substr(pos + 1, vidModeStr.find(")") - pos - 1);
 					}
 				}
 
@@ -3509,6 +3529,7 @@ class CHandlerGameConfigApply : public IActionHandler
 
 				ClientCfg.Width = w;
 				ClientCfg.Height = h;
+				ClientCfg.MonitorName = name;
 
 				// Write the modified client.cfg
 				ClientCfg.writeBool("FullScreen", bFullscreen);
@@ -3517,6 +3538,7 @@ class CHandlerGameConfigApply : public IActionHandler
 
 				if (bFullscreen)
 				{
+					ClientCfg.writeString("MonitorName", name, true);
 					ClientCfg.writeInt("Depth", screenMode.Depth);
 					ClientCfg.writeInt("Frequency", freq);
 				}

ryzom/client/src/interface_v3/action_handler_item.cpp

@@ -747,6 +747,10 @@ public:
 		CInterfaceElement *pElt = CWidgetManager::getInstance()->getElementFromId(src);
 		CDBCtrlSheet *pCSSrc = dynamic_cast<CDBCtrlSheet*>(pElt);
 		CDBCtrlSheet *pCSDst = dynamic_cast<CDBCtrlSheet*>(pCaller);
+
+		// end drag
+		getInventory().endDrag();
+
 		if ((pCSSrc == NULL) || (pCSDst == NULL)) return;
 
 		if (pCSSrc->getType() == CCtrlSheetInfo::SheetType_Item)
@@ -1881,7 +1885,7 @@ class CHandlerItemMenuCheck : public IActionHandler
 			}
 			if (pItemTextDisplay && pIS->Family == ITEMFAMILY::SCROLL)
 			{
-				if (pCS->getInventoryIndex()==INVENTORIES::bag)
+				if (pCS->getInventoryIndex()==INVENTORIES::bag && pIS->Scroll.Label.empty())
 					pItemTextDisplay->setActive(true);
 				pItemInfos->setActive(false);
 			}
@@ -1973,16 +1977,15 @@ class CHandlerItemMenuCheck : public IActionHandler
 			for(i=0;i<MAX_INVENTORY_ANIMAL;i++)
 			{
 				if (pMoveToPa[i])
-					pMoveToPa[i]->setActive(invId!=INVENTORIES::guild &&
+					pMoveToPa[i]->setActive((uint)invId!=INVENTORIES::pet_animal+i &&
-											(uint)invId!=INVENTORIES::pet_animal+i &&
 											 invMngr.isInventoryPresent((INVENTORIES::TInventory)(INVENTORIES::pet_animal+i)) );
 			}
 
 			if (pMoveToGuild)
-				pMoveToGuild->setActive(invId==INVENTORIES::bag && invMngr.isInventoryPresent(INVENTORIES::guild));
+				pMoveToGuild->setActive(invId!=INVENTORIES::guild && invMngr.isInventoryPresent(INVENTORIES::guild));
 
 			if (pMoveToRoom)
-				pMoveToRoom->setActive(invId==INVENTORIES::bag && invMngr.isInventoryPresent(INVENTORIES::player_room));
+				pMoveToRoom->setActive(invId!=INVENTORIES::player_room && invMngr.isInventoryPresent(INVENTORIES::player_room));
 
 			// std case: can drop / destroy
 			if(pDrop)		pDrop->setActive(invId!=INVENTORIES::guild);
@@ -2063,6 +2066,7 @@ class CHandlerItemMenuCheck : public IActionHandler
 		}
 
 		// Only show lock menu item if inventory contains the info
+		if (invId!=INVENTORIES::guild)
 			if (pLockUnlock) pLockUnlock->setActive(pCS->canOwnerLock());
 
 

ryzom/client/src/interface_v3/action_handler_misc.cpp

@@ -62,9 +62,6 @@ extern NLMISC::CLog				g_log;
 ////////////
 //static CCDBNodeLeaf *MenuColorWidgetValue = NULL; // db entry for the color menu widget (Red)
 
-
-static const string ScreenshotsDirectory("screenshots/");	// don't forget the final /
-
 void preRenderNewSky ();
 
 // ***************************************************************************
@@ -602,11 +599,6 @@ void displayScreenShotSavedInfo(const string &filename)
 	pIM->displaySystemInfo(msg);
 }
 
-void initScreenshot()
-{
-	if (!CFile::isExists(ScreenshotsDirectory)) CFile::createDirectory(ScreenshotsDirectory);
-}
-
 bool screenshotZBuffer(const std::string &filename)
 {
 	std::string::size_type pos = filename.find(".");
@@ -672,6 +664,11 @@ bool screenshotZBuffer(const std::string &filename)
 
 static std::string findNewScreenShotFileName(std::string filename)
 {
+	// make screenshot directory if it does not exist
+	if (!CFile::isExists(ClientCfg.ScreenShotDirectory))
+		CFile::createDirectory(ClientCfg.ScreenShotDirectory);
+
+	filename = CPath::standardizePath(ClientCfg.ScreenShotDirectory) + filename;
 	static char cstime[25];
 	time_t dtime;
 	time(&dtime);
@@ -698,7 +695,7 @@ void screenShotTGA()
 	CBitmap btm;
 	getBuffer (btm);
 
-	string filename = findNewScreenShotFileName(ScreenshotsDirectory+"screenshot.tga");
+	string filename = findNewScreenShotFileName("screenshot.tga");
 	COFile fs(filename);
 
 	if (!btm.writeTGA(fs, 24, false))
@@ -720,7 +717,7 @@ void screenShotPNG()
 	CBitmap btm;
 	getBuffer (btm);
 
-	string filename = findNewScreenShotFileName(ScreenshotsDirectory+"screenshot.png");
+	string filename = findNewScreenShotFileName("screenshot.png");
 	COFile fs(filename);
 
 	if (!btm.writePNG(fs, 24))
@@ -742,7 +739,7 @@ void screenShotJPG()
 	CBitmap btm;
 	getBuffer (btm);
 
-	string filename = findNewScreenShotFileName(ScreenshotsDirectory+"screenshot.jpg");
+	string filename = findNewScreenShotFileName("screenshot.jpg");
 	COFile fs(filename);
 
 	if (!btm.writeJPG(fs))

ryzom/client/src/interface_v3/action_handler_misc.h

@@ -181,7 +181,6 @@ public:
 /** Capture current content of framebuffer and save the result. If a custom size is asked in ClientCfg, then the scene is rendered again
   * instead (possibly multiple time)
   */
-void initScreenshot();
 void screenShotTGA();
 void screenShotPNG();
 void screenShotJPG();

ryzom/client/src/interface_v3/action_phrase_faber.cpp

@@ -50,6 +50,10 @@ using namespace NLMISC;
 
 // ***************************************************************************
 const std::string	FaberPlanDB= "UI:PHRASE:FABER:FABER_PLAN:SHEET";
+const std::string	FaberPlanHpBuffDB= "UI:PHRASE:FABER:FABER_PLAN:HP_BUFF";
+const std::string	FaberPlanSapBuffDB= "UI:PHRASE:FABER:FABER_PLAN:SAP_BUFF";
+const std::string	FaberPlanStaBuffDB= "UI:PHRASE:FABER:FABER_PLAN:STA_BUFF";
+const std::string	FaberPlanFocusBuffDB= "UI:PHRASE:FABER:FABER_PLAN:FOCUS_BUFF";
 const std::string	MPFaberDB= "UI:PHRASE:FABER:MP_BUILD";
 const std::string	MPSelectionDB= "UI:PHRASE:FABER:MP_SELECT";
 const std::string	MPQuantityDb= "UI:PHRASE:FABER:MP_QUANTITY";
@@ -170,6 +174,16 @@ void		CActionPhraseFaber::launchFaberCastWindow(sint32 memoryLine, uint memoryIn
 	if(node)
 		node->setValue32(0);
 
+	// Reset buff values
+	node = NLGUI::CDBManager::getInstance()->getDbProp(FaberPlanHpBuffDB, false);
+	if (node) node->setValue32(0);
+	node = NLGUI::CDBManager::getInstance()->getDbProp(FaberPlanSapBuffDB, false);
+	if (node) node->setValue32(0);
+	node = NLGUI::CDBManager::getInstance()->getDbProp(FaberPlanStaBuffDB, false);
+	if (node) node->setValue32(0);
+	node = NLGUI::CDBManager::getInstance()->getDbProp(FaberPlanFocusBuffDB, false);
+	if (node) node->setValue32(0);
+
 	// Reset the result item
 	node= NLGUI::CDBManager::getInstance()->getDbProp(ItemResultSheetDB, false);
 	if(node)
@@ -1565,6 +1579,14 @@ void	CActionPhraseFaber::updateItemResult()
 	uint		phraseSlot= pPM->getMemorizedPhrase(_ExecuteFromMemoryLine, _ExecuteFromMemoryIndex);
 	const CSPhraseCom	&phrase= pPM->getPhrase(phraseSlot);
 	uint32		recommendedPropId= pBM->getBrickPropId("cr_recommended");
+	uint32 crHp = pBM->getBrickPropId("cr_hp");
+	uint32 crSap = pBM->getBrickPropId("cr_sap");
+	uint32 crSta = pBM->getBrickPropId("cr_sta");
+	uint32 crFocus = pBM->getBrickPropId("cr_focus");
+	sint32 hpBuff = 0;
+	sint32 sapBuff = 0;
+	sint32 staBuff = 0;
+	sint32 focusBuff = 0;
 	for(i=0;i<phrase.Bricks.size();i++)
 	{
 		CSBrickSheet	*brick= pBM->getBrick(phrase.Bricks[i]);
@@ -1578,10 +1600,30 @@ void	CActionPhraseFaber::updateItemResult()
 					// minimze the level
 					minLevel= min(minLevel, sint32(brick->Properties[j].Value));
 				}
+
+				if (brick->Properties[j].PropId == crHp)
+					hpBuff = sint32(brick->Properties[j].Value);
+				if (brick->Properties[j].PropId == crSap)
+					sapBuff = sint32(brick->Properties[j].Value);
+				if (brick->Properties[j].PropId == crSta)
+					staBuff = sint32(brick->Properties[j].Value);
+				if (brick->Properties[j].PropId == crFocus)
+					focusBuff = sint32(brick->Properties[j].Value);
 			}
 		}
 	}
 
+	{
+		NLGUI::CDBManager *cdb = NLGUI::CDBManager::getInstance();
+		NLMISC::CCDBNodeLeaf *node = cdb->getDbProp(FaberPlanHpBuffDB, false);
+		if (node) node->setValue32(hpBuff);
+		node = cdb->getDbProp(FaberPlanSapBuffDB, false);
+		if (node) node->setValue32(sapBuff);
+		node = cdb->getDbProp(FaberPlanStaBuffDB, false);
+		if (node) node->setValue32(staBuff);
+		node = cdb->getDbProp(FaberPlanFocusBuffDB, false);
+		if (node) node->setValue32(focusBuff);
+	}
 
 	// **** Parse all MPs setuped, to compute level and stats
 	uint	totalItemPartMPReq= 0;

ryzom/client/src/interface_v3/chat_window.cpp

@@ -1026,6 +1026,8 @@ void CChatGroupWindow::loadFreeTeller(NLMISC::IStream &f)
 			f.serial(sTitle);
 			title = sTitle.toUtf8();
 		}
+		else
+			f.serial(title);
 
 		CGroupContainer *pGC = createFreeTeller(title, "");
 

ryzom/client/src/interface_v3/dbctrl_sheet.cpp

@@ -309,7 +309,6 @@ CCtrlSheetInfo::CCtrlSheetInfo()
 	_InterfaceColor= true;
 	_SheetSelectionGroup = -1;
 	_UseQuality = true;
-	_DisplayItemQuality = true;
 	_UseQuantity = true;
 	_DuplicateOnDrag = false;
 	_ItemSlot= SLOTTYPE::UNDEFINED;
@@ -1277,6 +1276,9 @@ void CDBCtrlSheet::setupItem ()
 
 	sint32 sheet = _SheetId.getSInt32();
 
+	_DispQuality = -1;
+	_DispQuantity = -1;
+
 	// If this is the same sheet, need to resetup
 	if (_LastSheetId != sheet || _NeedSetup)
 	{
@@ -1290,13 +1292,6 @@ void CDBCtrlSheet::setupItem ()
 		{
 			_ItemSheet = (CItemSheet*)pES;
 
-			// Display the item quality?
-			_DisplayItemQuality= _UseQuality &&
-				_ItemSheet->Family != ITEMFAMILY::COSMETIC &&
-				_ItemSheet->Family != ITEMFAMILY::TELEPORT &&
-				_ItemSheet->Family != ITEMFAMILY::SERVICE
-				;
-
 			_DispSheetBmpId = rVR.getTextureIdFromName (_ItemSheet->getIconMain());
 			// if file not found or empty, replace by default icon
 			if( _DispSheetBmpId == -1)
@@ -1350,21 +1345,11 @@ void CDBCtrlSheet::setupItem ()
 						_DispQuantity = _Quantity.getSInt32();
 					}
 				}
-				else
-					// do not display any number
-					_DispQuantity = -1;
 			}
-			else _DispQuantity = -1;
 
 			// Setup quality
-			if(_DisplayItemQuality)
+			if(_UseQuality)
-			{
 				_DispQuality= _Quality.getSInt32();
-			}
-			else
-			{
-				_DispQuality= -1;
-			}
 
 			// special icon text
 			if( _NeedSetup || _ItemSheet->getIconText() != _OptString )
@@ -1403,7 +1388,7 @@ void CDBCtrlSheet::setupItem ()
 		}
 
 		// update quality. NB: if quality change, the must updateItemCharacRequirement
-		if(_DisplayItemQuality)
+		if(_UseQuality)
 		{
 			sint32	newQuality= _Quality.getSInt32();
 			if(newQuality!=_DispQuality)
@@ -1412,10 +1397,6 @@ void CDBCtrlSheet::setupItem ()
 				updateItemCharacRequirement(_LastSheetId);
 			}
 		}
-		else
-		{
-			_DispQuality= -1;
-		}
 
 		// update armour color (if USER_COLOR db change comes after SHEET change)
 		if(_ArmourColorFromDB && _UserColor)
@@ -1428,6 +1409,31 @@ void CDBCtrlSheet::setupItem ()
 		}
 	}
 
+	if (_ItemSheet != NULL)
+	{
+		switch(_ItemSheet->Family)
+		{
+			case ITEMFAMILY::ARMOR:
+			case ITEMFAMILY::MELEE_WEAPON:
+			case ITEMFAMILY::RANGE_WEAPON:
+			case ITEMFAMILY::SHIELD:
+			case ITEMFAMILY::JEWELRY:
+			case ITEMFAMILY::CRAFTING_TOOL:
+			case ITEMFAMILY::HARVEST_TOOL:
+			case ITEMFAMILY::TAMING_TOOL:
+			case ITEMFAMILY::TRAINING_TOOL:
+				// hide 'x0' and 'x1' stack count for equipable items
+				if (_DispQuantity < 2)
+					_DispQuantity = -1;
+				break;
+			default:
+				// hide 'q0'and 'q1' quality for every other item
+				if (_DispQuality < 2)
+					_DispQuality = -1;
+				break;
+		}
+	}
+
 	// at each frame, must test for grayed.
 	if(_AutoGrayed)
 	{
@@ -1893,8 +1899,6 @@ void CDBCtrlSheet::setupOutpostBuilding()
 		{
 			COutpostBuildingSheet *pOBSheet = (COutpostBuildingSheet*)pES;
 
-			_DisplayItemQuality = false;
-
 			_DispSheetBmpId = rVR.getTextureIdFromName (pOBSheet->getIconMain());
 			// if file not found or empty, replace by default icon
 			if( _DispSheetBmpId == -1)
@@ -2534,7 +2538,8 @@ void CDBCtrlSheet::drawSheet (sint32 x, sint32 y, bool draging, bool showSelecti
 					// there is max 4 icons
 					sint32 hArea = (hSheet / 4);
 					sint32 xIcon = x;
-					sint32 yIcon = y;
+					// move buff icons up a row, quantity text is displayed on bottom-left corner
+					sint32 yIcon = y + (_DispQuantity > 0 ? hArea : 0);
 					for (uint i = 0; i < _BuffIcons.size(); ++i)
 					{
 						sint32 wIcon = _BuffIcons[i].IconW;

ryzom/client/src/interface_v3/dbctrl_sheet.h

@@ -164,7 +164,6 @@ public:
 	bool				_UseQuantity	       : 1; // is the quantity read and displayed ?
 	bool				_ReadQuantityFromSheet : 1; // Read quantity from sheet rather than from database
 	bool				_UseQuality            : 1; // is the quality read and displayed ?
-	bool				_DisplayItemQuality    : 1; // Do we have to display the quality for the item (false for Cosmetics and Teleport and if _UseQuality==fasle)?
 	bool                _DuplicateOnDrag       : 1; // when dragged, the item is shown twice : one version at the mouse position.
 	                                             // and another in the source slot. Useful for items to buy that are in infinite quantity.
 	bool				_AutoGrayed            : 1; // if true then gray the ctrlSheeet if: 1/ Items: Is the Item Locked. 2/ Bricks: is the brick Latent.

ryzom/client/src/interface_v3/interface_3d_scene.cpp

@@ -1437,6 +1437,34 @@ void CInterface3DShape::setName (const std::string &ht)
 	}
 }
 
+std::string CInterface3DShape::getTextures() const
+{
+	return _Textures;
+}
+
+
+void CInterface3DShape::setTextures(const std::string &textures)
+{
+	if (textures.empty())
+		return;
+
+	_Textures = textures;
+	vector<string> texList;
+	splitString(textures, " ", texList);
+
+	for(uint j=0;j<_Instance.getNumMaterials();j++)
+	{
+		sint numStages = _Instance.getMaterial(j).getLastTextureStage() + 1;
+		for(sint l = 0; l < numStages; l++)
+		{
+			if (_Instance.getMaterial(j).isTextureFile((uint) l))
+			{
+				_Instance.getMaterial(j).setTextureFileName(texList[std::min((int)j, (int)texList.size()-1)], (uint) l);
+			}
+		}
+	}
+}
+
 // ----------------------------------------------------------------------------
 // CInterface3DCamera
 // ----------------------------------------------------------------------------

ryzom/client/src/interface_v3/interface_3d_scene.h

@@ -265,11 +265,15 @@ public:
 	std::string getName() const;
 	void        setName (const std::string &ht);
 
+	std::string getTextures() const;
+	void        setTextures (const std::string &textures);
+
 	float getBBoxSizeX () const;
 	float getBBoxSizeY () const;
 	float getBBoxSizeZ () const;
 
 
+
 	REFLECT_EXPORT_START(CInterface3DShape, CInterfaceElement)
 		REFLECT_FLOAT("getBBoxSizeX", getBBoxSizeX, setPosX);
 		REFLECT_FLOAT("getBBoxSizeY", getBBoxSizeY, setPosX);
@@ -281,6 +285,7 @@ public:
 		REFLECT_FLOAT ("roty", getRotY, setRotY);
 		REFLECT_FLOAT ("rotz", getRotZ, setRotZ);
 		REFLECT_STRING ("name", getName, setName);
+		REFLECT_STRING("textures", getTextures, setTextures);
 	REFLECT_EXPORT_END
 
 protected:
@@ -289,6 +294,7 @@ protected:
 	NLMISC::CVector _Pos;
 	NLMISC::CVector _Rot;
 	std::string _Name;
+	std::string _Textures;
 };
 
 /**
@@ -397,6 +403,15 @@ public:
 	float getTgtY()	const	{ return _Target.y; }
 	float getTgtZ()	const	{ return _Target.z; }
 
+	float getRotZ()	const	{ return _Rot.z; }
+	void setRotZ(float f)	{ _Rot.z = f; }
+
+	float getRotY()	const	{ return _Rot.y; }
+	void setRotY(float f)	{ _Rot.y = f; }
+
+	float getDist()	const	{ return _Dist; }
+	void setDist(float f)	{ _Dist = f; }
+
 	REFLECT_EXPORT_START(CInterface3DCamera, CInterfaceElement)
 		REFLECT_FLOAT ("posx", getPosX, setPosX);
 		REFLECT_FLOAT ("posy", getPosY, setPosY);
@@ -404,19 +419,13 @@ public:
 		REFLECT_FLOAT ("tgtx", getTgtX, setTgtX);
 		REFLECT_FLOAT ("tgty", getTgtY, setTgtY);
 		REFLECT_FLOAT ("tgtz", getTgtZ, setTgtZ);
+		REFLECT_FLOAT ("rotz", getRotZ, setRotZ);
+		REFLECT_FLOAT ("roty", getRotY, setRotY);
+		REFLECT_FLOAT ("dist", getDist, setDist);
 		REFLECT_FLOAT ("fov", getFOV, setFOV);
 		REFLECT_FLOAT ("roll", getRoll, setRoll);
 	REFLECT_EXPORT_END
 
-	float getRotZ()	const	{ return _Rot.z; }
-	void setRotZ(float f)	{ _Rot.z = f; }
-
-	float getRotY()	const	{ return _Rot.y; }
-	void setRotY(float f)	{ _Rot.y = f; }
-
-	float getDist()	const	{ return _Dist; }
-	void setDist(float f)	{ _Dist = f; }
-
 	void reset(); // Reset user interaction
 
 protected:

ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp

@@ -799,7 +799,11 @@ static DECLARE_INTERFACE_USER_FCT(getAnimalInventoryStateText)
 
 	// According to server status, change the inventory text
 	uint	status= (uint)args[0].getInteger();
-	if(ANIMAL_STATUS::isInStable((ANIMAL_STATUS::EAnimalStatus)status))
+	if(ANIMAL_STATUS::isInBag((ANIMAL_STATUS::EAnimalStatus)status))
+	{
+		result.setString("uiAnimalInBag");
+	}
+	else if(ANIMAL_STATUS::isInStable((ANIMAL_STATUS::EAnimalStatus)status))
 	{
 		result.setString("uiAnimalInStable");
 	}

ryzom/client/src/interface_v3/interface_manager.cpp

@@ -1899,9 +1899,12 @@ bool CInterfaceManager::loadConfig (const string &filename)
 		// NB: we are typically InGame here (even though the _InGame flag is not yet set)
 		// Use the screen size of the config file. Don't update current UI, just _Modes
 		//
-		// ClientCfg has W/H set to screen size, but interface expects scaled size
+		uint32 width, height;
-		sint32 scaledW = ClientCfg.Width / ClientCfg.InterfaceScale;
+		// get non-scaled width/height
-		sint32 scaledH = ClientCfg.Height / ClientCfg.InterfaceScale;
+		Driver->getWindowSize(width, height);
+		// convert to scaled width/height for ui
+		sint32 scaledW = width / ClientCfg.InterfaceScale;
+		sint32 scaledH = height / ClientCfg.InterfaceScale;
 		CWidgetManager::getInstance()->moveAllWindowsToNewScreenSize(scaledW, scaledH, false);
 		updateDesktops(scaledW, scaledH);
 	}

ryzom/client/src/interface_v3/inventory_manager.cpp

@@ -2903,32 +2903,6 @@ class CHandlerInvCanDropTo : public IActionHandler
 		if ((pListDstText != NULL) || (pListDstIcon != NULL))
 		{
 			bool bCanDrop = true;
-			// WE CANT DND if we want to dnd from other bag than BAG to guild bag
-			if (pListDstIcon != NULL)
-			{
-				if (pListDstIcon->getInvType() == CInventoryManager::InvGuild)
-					if (strnicmp(pCSSrc->getSheet().c_str(),"LOCAL:INVENTORY:BAG", 19) != 0)
-						bCanDrop = false;
-			}
-			if (pListDstText != NULL)
-			{
-				if (pListDstText->getInvType() == CInventoryManager::InvGuild)
-					if (strnicmp(pCSSrc->getSheet().c_str(),"LOCAL:INVENTORY:BAG", 19) != 0)
-						bCanDrop = false;
-			}
-			// WE CANT DND if we want to dnd from guild bag to other bag than BAG
-			if (pListDstIcon != NULL)
-			{
-				if (pListDstIcon->getInvType() != CInventoryManager::InvBag)
-					if (strnicmp(pCSSrc->getSheet().c_str(),"SERVER:GUILD:INVENTORY", 19) == 0)
-						bCanDrop = false;
-			}
-			if (pListDstText != NULL)
-			{
-				if (pListDstText->getInvType() != CInventoryManager::InvBag)
-					if (strnicmp(pCSSrc->getSheet().c_str(),"SERVER:GUILD:INVENTORY", 19) == 0)
-						bCanDrop = false;
-			}
 
 			// WE CANT DND when packer/mount is too far
 			if (pListDstIcon != NULL)
@@ -3100,7 +3074,6 @@ class CHandlerInvDropTo : public IActionHandler
 					else if (((pListDstText != NULL) && (pListDstText->getInvType() == CInventoryManager::InvGuild)) ||
 							 ((pListDstIcon != NULL) && (pListDstIcon->getInvType() == CInventoryManager::InvGuild)))
 					{
-						if (strnicmp(pCSSrc->getSheet().c_str(), "LOCAL:INVENTORY:BAG", 19) == 0)
 							CAHManager::getInstance()->runActionHandler("proc", pCSSrc, "move_to_guild");
 					}
 					else if (((pListDstText != NULL) && (pListDstText->getInvType() == CInventoryManager::InvRoom)) ||

ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp

@@ -41,6 +41,12 @@
 #	define assert(x)
 #endif
 
+// Always use unique_ptr with ValyriaTear/luabind on Ubuntu 20,
+// since the setting is not stored in build_information.hpp
+#ifndef LUABIND_USE_CXX11
+#define LUABIND_USE_CXX11
+#endif
+
 #include <luabind/luabind.hpp>
 // in luabind > 0.6, LUABIND_MAX_ARITY is set to 10
 #if LUABIND_MAX_ARITY == 10
@@ -2414,15 +2420,13 @@ int CLuaIHMRyzom::addShape(CLuaState &ls)
 			texture = "";
 		}
 
+		std::vector<string>texList;
+		if (!texture.empty())
+			splitString(texture, " ", texList);
+
 		for(uint j=0;j<instance.getNumMaterials();j++)
 		{
-			if (!highlight)
+			if (highlight)
-			{
-				/*instance.getMaterial(j).setAmbient(CRGBA(0,0,0,255));
-				instance.getMaterial(j).setEmissive(CRGBA(255,255,255,255));
-				instance.getMaterial(j).setShininess(10.0f);*/
-			}
-			else
 			{
 				instance.getMaterial(j).setAmbient(CRGBA(0,0,0,255));
 				instance.getMaterial(j).setEmissive(CRGBA(255,0,0,255));
@@ -2435,9 +2439,7 @@ int CLuaIHMRyzom::addShape(CLuaState &ls)
 				for(sint l = 0; l < numStages; l++)
 				{
 					if (instance.getMaterial(j).isTextureFile((uint) l))
-					{
+						instance.getMaterial(j).setTextureFileName(texList[std::min((int)j, (int)texList.size()-1)], (uint) l);
-						instance.getMaterial(j).setTextureFileName(texture, (uint) l);
-					}
 				}
 			}
 		}

ryzom/client/src/interface_v3/sphrase_manager.cpp

@@ -798,7 +798,7 @@ void				CSPhraseManager::buildPhraseFromSheet(CSPhraseCom &phrase, sint32 sheetI
 	if(phraseSheet)
 	{
 		// get localized Name
-		phrase.Name= STRING_MANAGER::CStringManagerClient::getSPhraseLocalizedName(CSheetId(sheetId));
+		phrase.Name.fromUtf8(STRING_MANAGER::CStringManagerClient::getSPhraseLocalizedName(CSheetId(sheetId)));
 		// Build bricks
 		phrase.Bricks.clear();
 		for(uint i=0;i<phraseSheet->Bricks.size();i++)

ryzom/client/src/login.cpp

@@ -2218,6 +2218,7 @@ class CAHLessLod : public IActionHandler
 REGISTER_ACTION_HANDLER (CAHLessLod, "less_lod");
 
 // ***************************************************************************
+// TODO: remove resolution change from login screen
 class CAHUninitResLod : public IActionHandler
 {
 	virtual void execute (CCtrlBase * /* pCaller */, const string &/* sParams */)
@@ -2842,7 +2843,7 @@ string checkLogin(const string &login, const string &password, const string &cli
 	{
 		// ask server for salt
 		if(!HttpClient.sendGet(url + "?cmd=ask&cp=2&login=" + login + "&lg=" + ClientCfg.LanguageCode, "", pPM->isVerboseLog()))
-			return "Can't send (error code 60)";
+			return std::string("Can't send (error code 60) ") + HttpClient.lastError();
 
 		if(pPM->isVerboseLog()) nlinfo("Sent request for password salt");
 
@@ -2916,13 +2917,13 @@ string checkLogin(const string &login, const string &password, const string &cli
 			std::string	cryptedPassword = CCrypt::crypt(password, Salt);
 
 			if(!HttpClient.sendGet(url + "?cmd=login&login=" + login + "&password=" + cryptedPassword + "&clientApplication=" + clientApp + "&cp=2" + "&lg=" + ClientCfg.LanguageCode + customParameters))
-				return "Can't send (error code 2)";
+				return std::string("Can't send (error code 2) ") + HttpClient.lastError();
 		}
 		else
 		{
 			// don't send login and password if empty
 			if(!HttpClient.sendGet(url + "?cmd=login&clientApplication=" + clientApp + "&cp=2" + "&lg=" + ClientCfg.LanguageCode + customParameters))
-				return "Can't send (error code 2)";
+				return std::string("Can't send (error code 2) ") + HttpClient.lastError();
 		}
 
 		// the response should contains the result code and the cookie value
@@ -3032,7 +3033,7 @@ string checkLogin(const string &login, const string &password, const string &cli
 		std::string	cryptedPassword = CCrypt::crypt(password, Salt);
 
 		if(!HttpClient.sendGet(url + "?login=" + login + "&password=" + cryptedPassword + "&clientApplication=" + clientApp + "&cp=2"))
-			return "Can't send (error code 2)";
+			return std::string("Can't send (error code 2) ") + HttpClient.lastError();
 	/*
 		if(!send(ClientCfg.ConfigFile.getVar("StartupPage").asString()+"?login="+login+"&password="+password+"&clientApplication="+clientApp))
 			return "Can't send (error code 2)";

ryzom/client/src/login_patch.cpp

@@ -2605,7 +2605,7 @@ public:
 	}
 };
 
-
+void stopSoundMngr();
 
 // ****************************************************************************
 void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
@@ -2618,6 +2618,12 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 	// Destination File Name (in writable directory)
 	string DestinationName;
 
+	if (NLMISC::startsWith(rFTP.FileName, "sound"))
+	{
+		// Stop sound playback
+		stopSoundMngr();
+	}
+
 	if (rFTP.ExtractPath.empty())
 	{
 		DestinationName = pPM->WritableClientDataPath + rFTP.FileName;

ryzom/client/src/main_loop.cpp

@@ -1000,9 +1000,6 @@ bool mainLoop()
 	// initialize the structure for the ping.
 	Ping.init();
 
-	// initialize screenshots directory
-	initScreenshot();
-
 	// Call a function for a demo to init.
 
 	if (ClientCfg.Local)

ryzom/client/src/main_loop_utilities.cpp

@@ -76,7 +76,7 @@ void updateFromClientCfg()
 		// set latest config display mode if not attached
 		if (!StereoDisplayAttached)
 			setVideoMode(UDriver::CMode(ClientCfg.Width, ClientCfg.Height, (uint8)ClientCfg.Depth,
-				ClientCfg.Windowed, ClientCfg.Frequency));
+				ClientCfg.Windowed, ClientCfg.Frequency, -1, ClientCfg.MonitorName));
 		// force software cursor when attached
 		InitMouseWithCursor(ClientCfg.HardwareCursor && !StereoDisplayAttached);
 	}
@@ -87,12 +87,13 @@ void updateFromClientCfg()
 		(ClientCfg.Width != LastClientCfg.Width)		||
 		(ClientCfg.Height != LastClientCfg.Height)		||
 		(ClientCfg.Depth != LastClientCfg.Depth)		||
-		(ClientCfg.Frequency != LastClientCfg.Frequency))
+		(ClientCfg.Frequency != LastClientCfg.Frequency)||
+		(ClientCfg.MonitorName != LastClientCfg.MonitorName))
 	{
 		if (!StereoDisplayAttached)
 		{
 			setVideoMode(UDriver::CMode(ClientCfg.Width, ClientCfg.Height, (uint8)ClientCfg.Depth,
-				ClientCfg.Windowed, ClientCfg.Frequency));
+				ClientCfg.Windowed, ClientCfg.Frequency, -1, ClientCfg.MonitorName));
 		}
 	}
 

ryzom/client/src/misc.cpp

@@ -1408,6 +1408,7 @@ bool getRyzomModes(std::vector<NL3D::UDriver::CMode> &videoModes, std::vector<st
 	// **** Init Video Modes
 	Driver->getModes(videoModes);
 
+	// TODO: for resolutions below 1024x768, could use automatic UI scaling like in login/outgame
 	// Remove modes under 1024x768 (outgame ui limitation) and get the unique strings
 	sint i, j;
 	for (i = 0; i < (sint)videoModes.size(); ++i)
@@ -1424,6 +1425,9 @@ bool getRyzomModes(std::vector<NL3D::UDriver::CMode> &videoModes, std::vector<st
 			// create string format with width and height
 			string res = toString(videoModes[i].Width)+" x "+toString(videoModes[i].Height);
 
+			if (!videoModes[i].DisplayDevice.empty())
+				res += toString(" (%s)", videoModes[i].DisplayDevice.c_str());
+
 			// check if video mode already found in list
 			for (j = 0; j < (sint)stringModeList.size(); ++j)
 			{

ryzom/client/src/sound_manager.cpp

@@ -468,9 +468,7 @@ void CSoundManager::init(IProgressCallback *progressCallBack)
 			_AudioMixer->setPackedSheetOption("", false);
 
 		UAudioMixer::TDriver	driverType= UAudioMixer::DriverAuto;
-		if(ClientCfg.DriverSound==CClientConfig::SoundDrvFMod)
+		if(ClientCfg.DriverSound==CClientConfig::SoundDrvOpenAL)
-			driverType= UAudioMixer::DriverFMod;
-		else if(ClientCfg.DriverSound==CClientConfig::SoundDrvOpenAL)
 			driverType= UAudioMixer::DriverOpenAl;
 		else if(ClientCfg.DriverSound==CClientConfig::SoundDrvDirectSound)
 			driverType= UAudioMixer::DriverDSound;

ryzom/client/src/string_manager_client.cpp

@@ -1681,6 +1681,18 @@ vector<string> CStringManagerClient::getTitleInfos(const string &titleId, bool w
 	{
 		if (titleId[0] != '#')
 		{
+			// Check special case like SON_OF|jane|joe (with SON_OF = "Son of {1} and {2}")
+			vector<string> titleReps;
+			splitString(listInfos[0], string("|"), titleReps);
+			if (titleReps.size() > 1)
+			{
+				listInfos[0] = getSpecialWord(titleReps[0], women);
+				for(uint i=1; i < titleReps.size(); ++i )
+				{
+					while(strFindReplace(listInfos[0], toString("{%d}", i), titleReps[i]));
+				}
+			}
+			else
 				listInfos[0] = getSpecialWord(listInfos[0], women);
 		}
 	}

ryzom/client/src/user_entity.cpp

@@ -186,7 +186,7 @@ CUserEntity::CUserEntity()
 	_MoveToAction= CUserEntity::None;
 	_MoveToDist= 0.0;
 	_MoveToColStartTime= 0;
-
+	_HeadPitch = Pi/2;
 	_FollowForceHeadPitch= false;
 
 	_ForceLookSlot= CLFECOMMON::INVALID_SLOT;
@@ -491,8 +491,8 @@ void CUserEntity::updateVisualPropertyBehaviour(const NLMISC::TGameCycle &/* gam
 	}
 	CCDBNodeLeaf *targetList0 = dynamic_cast<CCDBNodeLeaf *>(_DBEntry->getNode(CLFECOMMON::PROPERTY_TARGET_LIST_0));
 	CCDBNodeLeaf *targetList1 = dynamic_cast<CCDBNodeLeaf *>(_DBEntry->getNode(CLFECOMMON::PROPERTY_TARGET_LIST_1));
-	CCDBNodeLeaf *targetList2 = dynamic_cast<CCDBNodeLeaf *>(_DBEntry->getNode(CLFECOMMON::PROPERTY_TARGET_LIST_1));
+	CCDBNodeLeaf *targetList2 = dynamic_cast<CCDBNodeLeaf *>(_DBEntry->getNode(CLFECOMMON::PROPERTY_TARGET_LIST_2));
-	CCDBNodeLeaf *targetList3 = dynamic_cast<CCDBNodeLeaf *>(_DBEntry->getNode(CLFECOMMON::PROPERTY_TARGET_LIST_1));
+	CCDBNodeLeaf *targetList3 = dynamic_cast<CCDBNodeLeaf *>(_DBEntry->getNode(CLFECOMMON::PROPERTY_TARGET_LIST_3));
 	if (targetList0 && targetList1 && targetList2 && targetList3)
 	{
 		uint64 vp[4] =
@@ -1402,18 +1402,6 @@ void CUserEntity::moveToCheckStartDist(CLFECOMMON::TCLEntityId slot, double dist
 
 		// disable afk mode
 		setAFK(false);
-
-		// if sufficiently near, launch the action
-		CEntityCL *target = EntitiesMngr.entity(slot);
-		if(target)
-		{
-			CVectorD dir2targ = target->pos() - pos();
-			dir2targ.z = 0.0;
-			if((dir2targ==CVectorD::Null) || (dir2targ.norm() < dist))
-			{
-				moveToAction(target);
-			}
-		}
 	}
 }// moveToCheckStartDist //
 
@@ -2564,9 +2552,9 @@ void CUserEntity::rotHeadVertically(float ang)
 //-----------------------------------------------
 void CUserEntity::setHeadPitch(double hp)
 {
-	_HeadPitch= hp;
+	_HeadPitch = hp;
-	const double bound= Pi/2 - 0.01;	//  epsilon to avoid gimbal lock
+	//  epsilon to avoid gimbal lock
-	clamp(_HeadPitch, -bound, bound);
+	clamp(_HeadPitch, -Pi/2 + 0.01, Pi/2 - 0.5);
 }
 
 //---------------------------------------------------

ryzom/common/src/game_share/generate_module_interface.xslt

@@ -19,7 +19,22 @@
 	<!-- #####         Root template matcher               ####### -->
 	<!-- ######################################################### -->
 	<xsl:template match="generator">
-<xsl:if test="$output != 'php'">
+<xsl:if test="$output != 'php'">// Ryzom - MMORPG Framework &lt;http://dev.ryzom.com/projects/ryzom/&gt;
+// Copyright (C) 2010-2021  Winch Gate Property Limited
+//
+// 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 &lt;http://www.gnu.org/licenses/&gt;.
+
 /////////////////////////////////////////////////////////////////
 // WARNING : this is a generated file, don't change it !
 /////////////////////////////////////////////////////////////////
@@ -1676,13 +1691,14 @@ namespace <xsl:value-of select="@name"/>
 <xsl:for-each select="child_class[@on-delete = 'cascade' and @cont='vector']">
 				{
 					// cascading deletion for vector child <xsl:value-of select="@name"/>
-					nlassert(load<xsl:value-of select="@name"/>(connection, __FILE__, __LINE__));
+					if (load<xsl:value-of select="@name"/>(connection, __FILE__, __LINE__))
-
+					{
 						const std::vector &lt; <xsl:value-of select="@type"/>Ptr &gt; &amp; childs = get<xsl:value-of select="@name"/>();
 
 						while (!childs.empty())
 						{
-						get<xsl:value-of select="@name"/>ByIndex(childs.size()-1)->remove(connection);
+							get<xsl:value-of select="@name"/>ByIndex((uint32)childs.size()-1)->remove(connection);
+						}
 					}
 				}
 
@@ -1690,8 +1706,8 @@ namespace <xsl:value-of select="@name"/>
 <xsl:for-each select="child_class[@on-delete = 'cascade' and @cont='map']">
 				{
 					// cascading deletion for map child <xsl:value-of select="@name"/>
-					nlassert(load<xsl:value-of select="@name"/>(connection, __FILE__, __LINE__));
+					if (load<xsl:value-of select="@name"/>(connection, __FILE__, __LINE__))
-
+					{
 						const std::map &lt; uint32, <xsl:value-of select="@type"/>Ptr &gt; &amp; childs = get<xsl:value-of select="@name"/>();
 
 						while (!childs.empty())
@@ -1699,21 +1715,23 @@ namespace <xsl:value-of select="@name"/>
 							get<xsl:value-of select="@name"/>ById(childs.begin()->first)->remove(connection);
 						}
 					}
+				}
 </xsl:for-each>
 <xsl:for-each select="child_class[@on-delete = 'cascade' and @relation='one-to-one']">
 				{
 					// cascading deletion for single child <xsl:value-of select="@name"/>
-					nlassert(load<xsl:value-of select="@name"/>(connection, __FILE__, __LINE__));
+					if (load<xsl:value-of select="@name"/>(connection, __FILE__, __LINE__))
-
+					{
 						if (get<xsl:value-of select="@name"/>() != NULL)
 							get<xsl:value-of select="@name"/>()->remove(connection);
 					}
+				}
 </xsl:for-each>
 <xsl:for-each select="child_class[@on-delete = 'update' and @cont='vector']">
 				{
 					// unreference (and update) for vector child <xsl:value-of select="@name"/>
-					nlassert(load<xsl:value-of select="@name"/>(connection, __FILE__, __LINE__));
+					if (load<xsl:value-of select="@name"/>(connection, __FILE__, __LINE__))
-
+					{
 						const std::vector &lt; <xsl:value-of select="@type"/>Ptr &gt; &amp; childs = get<xsl:value-of select="@name"/>();
 
 						for (uint i=0; i &lt; childs.size(); ++i)
@@ -1725,11 +1743,12 @@ namespace <xsl:value-of select="@name"/>
 							get<xsl:value-of select="@name"/>ByIndex(i)->update(connection);
 						}
 					}
+				}
 </xsl:for-each>
 <xsl:for-each select="child_class[@on-delete = 'update' and @cont='map']">
 				{
 					// unreference (and update) for map child <xsl:value-of select="@name"/>
-					nlassert(load<xsl:value-of select="@name"/>(connection, __FILE__, __LINE__));
+					if (load<xsl:value-of select="@name"/>(connection, __FILE__, __LINE__)) {
 
 						const std::map &lt; uint32, <xsl:value-of select="@type"/>Ptr &gt; &amp; childs = get<xsl:value-of select="@name"/>();
 						std::map&lt; uint32, <xsl:value-of select="@type"/>Ptr &gt;::const_iterator first(childs.begin()), last(childs.end());
@@ -1743,12 +1762,13 @@ namespace <xsl:value-of select="@name"/>
 							get<xsl:value-of select="@name"/>ById(it->first)->update(connection);
 						}
 					}
+				}
 </xsl:for-each>
 <xsl:for-each select="child_class[@on-delete = 'update' and @relation='one-to-one']">
 				{
 					// unreference (and update) for single child <xsl:value-of select="@name"/>
-					nlassert(load<xsl:value-of select="@name"/>(connection, __FILE__, __LINE__));
+					if (load<xsl:value-of select="@name"/>(connection, __FILE__, __LINE__))
-
+					{
 						<xsl:variable name="type" select="@type"/>
 						<xsl:variable name="child_name" select="@name"/>
 						<xsl:variable name="parent_prop" select="//class[@name = $type]/property[@db_col = //class[@name = $type]/parent[@class = $className]/@db_col]/@name"/>
@@ -1758,6 +1778,7 @@ namespace <xsl:value-of select="@name"/>
 							get<xsl:value-of select="@name"/>()->update(connection);
 						}
 					}
+				}
 </xsl:for-each>
 
 				// change the persistant state to 'removed'.
@@ -1886,7 +1907,7 @@ namespace <xsl:value-of select="@name"/>
 		}
 		else if (cmd == NOPE::cc_instance_count)
 		{
-			return _ObjectCache.size();
+			return (uint32)_ObjectCache.size();
 		}
 
 		// default return value
@@ -1904,7 +1925,7 @@ namespace <xsl:value-of select="@name"/>
 		TReleasedObject::iterator first(_ReleasedObject.begin()), last(_ReleasedObject.end());
 		for (; first != last; ++first)
 		{
-			nbReleased += first->second.size();
+			nbReleased += (uint32)first->second.size();
 		}
 
 		nlinfo("	There are %u object instances in cache not referenced (waiting deletion or re-use))", nbReleased);
@@ -2117,7 +2138,7 @@ ERROR : parent/child relation support only 'map' or 'vector' cont specification
 			return false;
 		}
 
-		std::auto_ptr&lt;MSW::CStoreResult&gt; result = connection.storeResult();
+		CUniquePtr&lt;MSW::CStoreResult&gt; result(connection.storeResult());
 
 		for (uint i=0; i&lt;result->getNumRows(); ++i)
 		{
@@ -2195,7 +2216,7 @@ ERROR : parent/child relation support only 'map' or 'vector' cont specification
 			return false;
 		}
 
-		std::auto_ptr&lt;MSW::CStoreResult&gt; result = connection.storeResult();
+		CUniquePtr&lt;MSW::CStoreResult&gt; result(connection.storeResult());
 
 		// check that the data description is consistent with database content
 		nlassert(result->getNumRows() &lt;= 1);
@@ -2300,9 +2321,9 @@ ERROR : parent/child relation support only 'map' or 'vector' cont specification
 		}
 
 		// no object with this id, return a null pointer
-		static <xsl:value-of select="@type"/>Ptr nil;
+		static <xsl:value-of select="@type"/>Ptr nilPtr;
 
-		return nil;
+		return nilPtr;
 	}
 
 	</xsl:when>
@@ -2321,8 +2342,8 @@ ERROR : parent/child relation support only 'map' or 'vector' cont specification
 		if (it == _<xsl:value-of select="@name"/>->end())
 		{
 			// no object with this id, return a null pointer
-			static <xsl:value-of select="@type"/>Ptr nil;
+			static <xsl:value-of select="@type"/>Ptr nilPtr;
-			return nil;
+			return nilPtr;
 		}
 
 		return const_cast&lt; <xsl:value-of select="@type"/>Ptr &amp; &gt;(it->second);

ryzom/common/src/game_share/multi_target.cpp

@@ -22,18 +22,16 @@
 // ***********************************************************************
 void CMultiTarget::pack(uint64 *destVP, uint numVP)
 {
-	nlassert(numVP * 4 >= Targets.size()); // not enough room to stores visual properties!
+	nlassert(numVP * 2 >= Targets.size()); // not enough room to stores visual properties!
 	CTarget  invalidTarget;
 	uint index = 0;
 	for(uint k = 0; k < numVP; ++k)
 	{
-		uint16 parts[4];
+		destVP[k] = index < Targets.size() ? Targets[index].getPacked() : invalidTarget.getPacked();
-		for(uint l = 0; l < 4; ++l)
+		++index;
-		{
+
-			parts[l] = index < Targets.size() ? Targets[index].getPacked() : invalidTarget.getPacked();
+		destVP[k] |= uint64(index < Targets.size() ? Targets[index].getPacked() : invalidTarget.getPacked()) << 32;
-			++ index;
+		++index;
-		}
-		destVP[k] = (uint64) parts[0] |  ((uint64) parts[1] << 16) | ((uint64) parts[2] << 32) | ((uint64) parts[3] << 48);
 	}
 }
 
@@ -42,19 +40,16 @@ void CMultiTarget::unpack(const uint64 *srcVP, uint numVP)
 {
 	Targets.clear();
 	for(uint k = 0; k < numVP; ++k)
-	{
-		for(uint l = 0; l < 4; ++l)
 	{
 		CTarget t;
-			t.setPacked((uint16) ((srcVP[k] >> (16 * l)) & 0xffff));
+		t.setPacked(uint32(srcVP[k]));
-			if (t.TargetSlot != CLFECOMMON::INVALID_SLOT)
+		if(t.TargetSlot == CLFECOMMON::INVALID_SLOT)
-			{
+			return;
 		Targets.push_back(t);
-			}
+
-			else
+		t.setPacked(uint32(srcVP[k] >> 32));
-			{
+		if(t.TargetSlot == CLFECOMMON::INVALID_SLOT)
 			return;
-			}
+		Targets.push_back(t);
-		}
 	}
 }

ryzom/common/src/game_share/multi_target.h

@@ -39,20 +39,21 @@ public:
 			uint8 TargetSlot;	// the slot that is targetted
 			uint8 Info;         // Damage shield for melee  5:3 format (damage shield io : power )
 			                    // Distance for range attacks (that do not have damage shield) format is 7:1
+			sint16 DeltaHP;     //
 		public:
-			CTarget(uint8 slot = CLFECOMMON::INVALID_SLOT, bool resist = false, uint8 dist = 0) : TargetSlot(slot)
+			CTarget(uint8 slot = CLFECOMMON::INVALID_SLOT, bool resist = false, uint8 dist = 0, sint16 deltaHp = 0) : TargetSlot(slot), DeltaHP(deltaHp)
 			{
 				Info = (resist == 0 ? 0 : 0x80) | (dist & 0x7f);
 			}
-			uint16 getPacked() const;
+			uint32 getPacked() const;
-			void   setPacked(uint16 value);
+			void   setPacked(uint32 value);
 	};
 	typedef std::vector<CTarget> TTargetVect;
 	// the list of targets
 	TTargetVect Targets;
 public:
 	/** create packed version of targets (to store in visual properties)
-	  * each VP encodes 4 targets
+	  * each VP encodes 2 targets
 	  * caller must provide enough room to store the result (assertion is raised otherwise)
 	  */
 	void pack(uint64 *destVP, uint numVP);
@@ -65,19 +66,18 @@ public:
 ////////////
 
 // *******************************************************************************************
-inline uint16 CMultiTarget::CTarget::getPacked() const
+inline uint32 CMultiTarget::CTarget::getPacked() const
 {
 	//return (uint16) TargetSlot | ((uint16) (Resist ? 1 : 0) << 15) | ((uint16) Distance << 8);
-	return (uint16) TargetSlot | (uint16(Info) << 8);
+	return	((uint32) TargetSlot) | ((uint32) Info << 8) | ((uint32) DeltaHP << 16);
 }
 
 // *******************************************************************************************
-inline void   CMultiTarget::CTarget::setPacked(uint16 value)
+inline void   CMultiTarget::CTarget::setPacked(uint32 value)
 {
-	TargetSlot = uint8(value & 0xff);
+	TargetSlot = uint8(value);
-	/*Distance = (uint8) ((value >> 8) & 0x7f);
+	Info       = uint8(value >> 8);
-	Resist = (value & 0x8000) != 0;*/
+	DeltaHP    = sint16(value >> 16);
-	Info = value >> 8;
 }
 
 #endif

ryzom/common/src/game_share/ryzom_version.h

@@ -18,6 +18,7 @@
 #define RYZOM_VERSION_H
 
 #define RYZOM_VERSION "3.0.0"
+#define RYZOM_PRODUCT_VERSION "3.0.0"
 
 #endif // RYZOM_VERSION_H
 

ryzom/tools/client/client_patcher/main.cpp

@@ -37,6 +37,10 @@ void quitCrashReport()
 {
 }
 
+void stopSoundMngr()
+{
+}
+
 /// domain server version for patch
 string	R2ServerVersion;
 /// name of the version (used to alias many version under the same name),

ryzom/tools/leveldesign/variable_parser/lua_helper.cpp

@@ -30,6 +30,13 @@ extern "C"
 #include <cassert>
 #undef assert
 #define assert nlassert
+
+// Always use unique_ptr with ValyriaTear/luabind on Ubuntu 20,
+// since the setting is not stored in build_information.hpp
+#ifndef LUABIND_USE_CXX11
+#define LUABIND_USE_CXX11
+#endif
+
 #include <luabind/luabind.hpp>
 
 using namespace std;