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
Resolve "Add rotz roty and dist reflect lua to 3DCamera of a scene"
5876 changed files with 424190 additions and 1059234 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,18 +0,0 @@
-*.cpp ident
-*.h ident
-
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
-
-# Explicitly declare text files you want to always be normalized and converted
-# to native line endings on checkout.
-*.c text
-*.h text
-*.cs text
-*.jade text
-*.json text
-*.js text
-*.css text
-*.htm text
-*.txt text
-*.sh text eol=lf
--- a/.gitignore
+++ b/.gitignore
@ -90,6 +90,7 @@ ylwrap
 *.mk

 # Visual Studio garbage
+.vscode/
 *.opensdf
 UpgradeLog*.XML
 _UpgradeReport_Files
@ -162,6 +163,7 @@ build/*
 build-2010/*
 build/*
 install/*
+win-build/
 build_*
 install_*
 nel/tools/build_gamedata/configuration/buildsite.py
@ -265,7 +267,6 @@ web/public_php/db_version_tool
 web/public_php/db_version_web
 web/public_php/role_service
 web/public_php/role_support
-web/public_php/role_admin
 web/public_php/role_domain
 web/public_php/db_version_ring
 web/public_php/config_user.php
--- a/.hgtags
+++ b/.hgtags
@ -1,27 +1,28 @@
-4eddbaff0c5e5d685db96ee3e8427aa0fd96ac83 v0.8.0
-00d9b6e29e95f56785fbf85abe60afd34674f402 v0.9.0
-79776c337176dd5b02e1a74fe5dfb703b91747aa v0.9.1
-fedf2aa443d09707beed814b0f499c6a5519cc84 v0.10.0
-edaa3624a56420b02ccc64c26059801a389927ee v0.11.0
-e3fe4855f22c3e75722e015dc33c091c340b3ad7 v0.11.1
-9e583b717fd63be0be9fd60b99087abf1691ea49 v0.11.2
-bfe5628e14a024ba7ea32e4b326ae433a07856b9 v0.11.3
-9a6120735daa97c96ac5d85ca35c7f21f607bd87 v0.12.0
-3e92c7104c20d6bc6c2147b4b5fc289e8621d322 v1.0.0
-8eb94c3549be898fdc4a7c6d791d2477bdc11a18 v1.0.1
-3e17907af67e8d66d80e6b714707bbf912607f2a ryzom/3.0.0
-153e0b605c9e0c83ba05b6428c62838b49cc84b2 ryzom/3.0.1
-9d41f2994d44b9aad92b83f945f114e4b6bed44a ryzom/3.0.2
-4300cc14aad098b1f86ea4c55577b7fa4a4cb5d2 ryzom/3.1.0
-d4060f217f4f834cc62a33f2f1ccdf3c28298066 ryzom/3.1.0-hotfix
-043aaeb3d8a2a54177581b57bda87a9deaad510e ryzom/3.1.0-april_patch
-4036ecf59e83960f03acebc2089eb2ff5eeaed0a ryzom/3.2.0
-18403bb9485da3d9742c6f007a16d5619ebfb196 ryzom/3.2.1
-822ff8f8917ad66e09e2c21c983282f6f693b9f6 ryzom/3.3.0
-00dde390a394fce9da06c2f3264140282158d39f ryzom/3.3.0
-dcd4c4d161ef775136e18c7e8f5072b75dede27e ryzom/3.3.1
-fc4be8ebec5ca754ef4453bc6a9faef90837c674 ryzom/3.4.0
-70eba02e8eab6920586dbabf74e9e8180c729980 ryzom/3.4.0-steam_fix
-3941482843f9cd130cfc16634efc08d34a98ed35 ryzom/3.4.0-atysmas
-ecae9feb4cceb78103e5d7236caccaf450796cdb ryzom/3.5.0
-95783afa226f241062134eb62f4323295d29ac84 ryzom/3.5.0.9637
+4eddbaff0c5e5d685db96ee3e8427aa0fd96ac83 ryzomcore/v0.8.0
+00d9b6e29e95f56785fbf85abe60afd34674f402 ryzomcore/v0.9.0
+79776c337176dd5b02e1a74fe5dfb703b91747aa ryzomcore/v0.9.1
+fedf2aa443d09707beed814b0f499c6a5519cc84 ryzomcore/v0.10.0
+edaa3624a56420b02ccc64c26059801a389927ee ryzomcore/v0.11.0
+e3fe4855f22c3e75722e015dc33c091c340b3ad7 ryzomcore/v0.11.1
+9e583b717fd63be0be9fd60b99087abf1691ea49 ryzomcore/v0.11.2
+bfe5628e14a024ba7ea32e4b326ae433a07856b9 ryzomcore/v0.11.3
+9a6120735daa97c96ac5d85ca35c7f21f607bd87 ryzomcore/v0.12.0
+3e17907af67e8d66d80e6b714707bbf912607f2a ryzom-patch-3.0.0
+153e0b605c9e0c83ba05b6428c62838b49cc84b2 ryzom-patch-3.0.1
+9d41f2994d44b9aad92b83f945f114e4b6bed44a ryzom-patch-3.0.2
+4300cc14aad098b1f86ea4c55577b7fa4a4cb5d2 ryzom-patch-3.1.0
+d4060f217f4f834cc62a33f2f1ccdf3c28298066 ryzom-patch-3.1.0-hotfix
+043aaeb3d8a2a54177581b57bda87a9deaad510e ryzom-patch-3.1.0-april_patch
+4036ecf59e83960f03acebc2089eb2ff5eeaed0a ryzom-patch-3.2.0
+18403bb9485da3d9742c6f007a16d5619ebfb196 ryzom-patch-3.2.1
+822ff8f8917ad66e09e2c21c983282f6f693b9f6 ryzom-patch-3.3.0
+00dde390a394fce9da06c2f3264140282158d39f ryzom-patch-3.3.0
+dcd4c4d161ef775136e18c7e8f5072b75dede27e ryzom-patch-3.3.1
+fc4be8ebec5ca754ef4453bc6a9faef90837c674 ryzom-patch-3.4.0
+70eba02e8eab6920586dbabf74e9e8180c729980 ryzom-patch-3.4.0 Steam Fix
+3941482843f9cd130cfc16634efc08d34a98ed35 ryzom-patch-3.4.0 Atysmas
+ecae9feb4cceb78103e5d7236caccaf450796cdb ryzom-patch-3.5.0
+95783afa226f241062134eb62f4323295d29ac84 ryzom-patch-3.5.0.9637
+2102fb276eb69d49ed4923042215312a63c47c08 Live-746
+8eb94c3549be898fdc4a7c6d791d2477bdc11a18 ryzomcore/v1.0.1
+3e92c7104c20d6bc6c2147b4b5fc289e8621d322 ryzomcore/v1.0.0
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -41,8 +41,8 @@ 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.317.tar.gz"
-    SHA1 "fbdd94b1966d351384e27b02c8d134915b1131d6"
+    URL "https://github.com/cpp-pm/hunter/archive/v0.23.321.tar.gz"
+    SHA1 "5e53cbb0429037ea8e2592bfd92704b8ff3ab492"
    FILEPATH "${CMAKE_CURRENT_LIST_DIR}/CMakeModules/HunterConfig.cmake"
  )

@ -79,12 +79,16 @@ ENDIF()

 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(RyzomCore CXX C)
-SET(NL_VERSION_MAJOR 4)
-SET(NL_VERSION_MINOR 0)
+SET(NL_VERSION_MAJOR 1)
+SET(NL_VERSION_MINOR 1)
 SET(NL_VERSION_PATCH 0 CACHE STRING "Patch version")
 SET(YEAR "2001-${CURRENT_YEAR}")
 SET(AUTHOR "Winch Gate and The Ryzom Core Community")

+SET(RYZOM_VERSION_MAJOR 3)
+SET(RYZOM_VERSION_MINOR 6)
+SET(RYZOM_VERSION_PATCH 0)
+
 #-----------------------------------------------------------------------------
 # Redirect output files
 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
@ -120,27 +124,27 @@ RYZOM_SETUP_PREFIX_PATHS()

 #-----------------------------------------------------------------------------
 # Default values for URL's
-SET(RYZOM_CLIENT_CREATE_ACCOUNT_URL     "https://core.ryzom.dev/ams/" CACHE STRING "Ryzom Client Create Account URL")
-SET(RYZOM_CLIENT_EDIT_ACCOUNT_URL       "https://core.ryzom.dev/ams/" CACHE STRING "Ryzom Client Edit Account URL")
-SET(RYZOM_CLIENT_FORGET_PASSWORD_URL    "https://core.ryzom.dev/ams/" CACHE STRING "Ryzom Client Forget Password URL")
-SET(RYZOM_CLIENT_PATCH_URL              "https://cdn.ryzom.dev/core4/patch/" CACHE STRING "Ryzom Client Patch URL")
-SET(RYZOM_CLIENT_APP_NAME               "core4")
+SET(RYZOM_CLIENT_CREATE_ACCOUNT_URL  "https://open.ryzom.dev/ams/" CACHE STRING "Ryzom Client Create Account URL")
+SET(RYZOM_CLIENT_EDIT_ACCOUNT_URL    "https://open.ryzom.dev/ams/" CACHE STRING "Ryzom Client Edit Account URL")
+SET(RYZOM_CLIENT_FORGET_PASSWORD_URL "https://open.ryzom.dev/ams/" CACHE STRING "Ryzom Client Forget Password URL")
+SET(RYZOM_CLIENT_PATCH_URL           "https://cdn.ryzom.dev/open/patch/" CACHE STRING "Ryzom Client Patch URL")
+SET(RYZOM_CLIENT_APP_NAME            "default")

-SET(RYZOM_CLIENT_RELEASENOTES_URL       "https://core4.ryzom.dev/releasenotes/index.php" CACHE STRING "Ryzom Client Release Notes URL")
-SET(RYZOM_CLIENT_RELEASENOTES_RING_URL  "https://core4.ryzom.dev/releasenotes_ring/index.php" CACHE STRING "Ryzom Client Release Notes URL")
+SET(RYZOM_WEBIG_MAIN_URL             "https://open.ryzom.dev/" CACHE STRING "Ryzom Client WebIG Main URL")
+SET(RYZOM_WEBIG_TRUSTED_DOMAIN       "open.ryzom.dev" CACHE STRING "Ryzom Client WebIG Trusted Domain")

 #-----------------------------------------------------------------------------
 # urls when compiling ryzom live client
 IF(WITH_RYZOM_LIVE)
  MESSAGE("Using RYZOM_LIVE urls")
-  SET(RYZOM_CLIENT_CREATE_ACCOUNT_URL   "https://account.ryzom.com/signup/from_client.php")
-  SET(RYZOM_CLIENT_EDIT_ACCOUNT_URL     "https://account.ryzom.com/payment_profile/index.php")
-  SET(RYZOM_CLIENT_FORGET_PASSWORD_URL  "https://account.ryzom.com/payment_profile/lost_secure_password.php")
+  SET(RYZOM_CLIENT_CREATE_ACCOUNT_URL  "https://me.ryzom.com")
+  SET(RYZOM_CLIENT_EDIT_ACCOUNT_URL    "https://me.ryzom.com")
+  SET(RYZOM_CLIENT_FORGET_PASSWORD_URL "https://me.ryzom.com/?forget_password=1")
  SET(RYZOM_CLIENT_PATCH_URL           "http://dl.ryzom.com/patch_live")
  SET(RYZOM_CLIENT_APP_NAME            "ryzom_live")

-SET(RYZOM_CLIENT_RELEASENOTES_URL       "https://app.ryzom.com/releasenotes/index.php")
-SET(RYZOM_CLIENT_RELEASENOTES_RING_URL  "https://app.ryzom.com/releasenotes_ring/index.php")
+  SET(RYZOM_WEBIG_MAIN_URL             "https://app.ryzom.com/")
+  SET(RYZOM_WEBIG_TRUSTED_DOMAIN       "app.ryzom.com")
 ENDIF()

 #-----------------------------------------------------------------------------
--- a/CMakeModules/FindIconv.cmake
+++ b/CMakeModules/FindIconv.cmake
@ -16,14 +16,7 @@ ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)

 FIND_PATH(ICONV_INCLUDE_DIR iconv.h HINTS /sw/include/ PATHS /opt/local) 
 
-FIND_LIBRARY(ICONV_LIBRARIES_RELEASE NAMES iconv libiconv c PATHS /opt/local)
-FIND_LIBRARY(ICONV_LIBRARIES_DEBUG NAMES iconvd libiconvd c PATHS /opt/local)
-
-IF (ICONV_LIBRARIES_RELEASE AND ICONV_LIBRARIES_DEBUG)
-  SET(ICONV_LIBRARIES optimized ${ICONV_LIBRARIES_RELEASE} debug ${ICONV_LIBRARIES_DEBUG})
-ELSE()
-  SET(ICONV_LIBRARIES ${ICONV_LIBRARIES_RELEASE})
-ENDIF()
+FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c PATHS /opt/local)
 
 IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
   SET(ICONV_FOUND TRUE) 
@ -67,6 +60,5 @@ ENDIF()
 MARK_AS_ADVANCED(
  ICONV_INCLUDE_DIR
  ICONV_LIBRARIES
-  ICONV_LIBRARIES_DEBUG
  ICONV_SECOND_ARGUMENT_IS_CONST
 )
--- a/CMakeModules/FindLua53.cmake
+++ b/CMakeModules/FindLua53.cmake
@ -38,25 +38,11 @@ find_path(LUA_INCLUDE_DIR lua.h
  /opt
 )

-FIND_LIBRARY(LUA_LIBRARY
+find_library(LUA_LIBRARY
  NAMES lua53 lua5.3 lua-5.3 lua
  HINTS
-    $ENV{LUA_DIR}
-  PATH_SUFFIXES lib64 lib
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-)
-
-FIND_LIBRARY(LUA_LIBRARY_DEBUG
-  NAMES lua53-d lua5.3-d lua-5.3-d lua-d lua53d lua5.3d lua-5.3d luad
-  HINTS
-    $ENV{LUA_DIR}
-  PATH_SUFFIXES lib64 lib
+    ENV LUA_DIR
+  PATH_SUFFIXES lib
  PATHS
  ~/Library/Frameworks
  /Library/Frameworks
@ -72,14 +58,10 @@ if(LUA_LIBRARY)
    find_library(LUA_MATH_LIBRARY m)
    set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
  # For Windows and Mac, don't need to explicitly include the math library
-  else()
-    if (LUA_LIBRARY_DEBUG)
-      set( LUA_LIBRARIES optimized ${LUA_LIBRARY} debug ${LUA_LIBRARY_DEBUG} CACHE STRING "Lua Libraries")
  else()
    set( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
  endif()
 endif()
-endif()

 if(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
  file(STRINGS "${LUA_INCLUDE_DIR}/lua.h" lua_version_str REGEX "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua .+\"")
@ -95,5 +77,5 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua53
                                  REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
                                  VERSION_VAR LUA_VERSION_STRING)

-mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_LIBRARY_DEBUG LUA_MATH_LIBRARY)
+mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY)

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

-    # check for Lua 5.4
-    SET(LUA54_LIBRARIES liblua5.4 liblua-5.4 liblua.so.5.4)
-
-    FOREACH(_LIB ${LUA54_LIBRARIES})
-      CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE _LIB LUALIB_FOUND)
-      IF(LUALIB_FOUND)
-        MESSAGE(STATUS "Luabind is using Lua 5.4")
-        FIND_PACKAGE(Lua54 REQUIRED)
-        BREAK()
-      ENDIF()
-    ENDFOREACH()
-
-    IF(NOT LUALIB_FOUND)
    # check for Lua 5.3
    SET(LUA53_LIBRARIES liblua5.3 liblua-5.3 liblua.so.5.3)

@ -34,7 +21,6 @@ MACRO(FIND_CORRECT_LUA_VERSION)
        BREAK()
      ENDIF()
    ENDFOREACH()
-    ENDIF()

    IF(NOT LUALIB_FOUND)
      # check for Lua 5.2
--- a/CMakeModules/nel.cmake
+++ b/CMakeModules/nel.cmake
@ -321,7 +321,7 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
  OPTION(WITH_SNOWBALLS           "Build Snowballs."                              OFF)
  OPTION(WITH_TOOLS               "Build Tools"                                   OFF)

-  OPTION(WITH_RYZOM_LIVE          "Use ryzom.com urls"                            OFF)
+  OPTION(WITH_RYZOM_LIVE          "Use ryzom.com urls"                            ON)
 ENDMACRO(NL_SETUP_DEFAULT_OPTIONS)

 MACRO(NL_SETUP_NEL_DEFAULT_OPTIONS)
@ -393,7 +393,6 @@ MACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS)
  OPTION(WITH_LUA51               "Build Ryzom Core using Lua 5.1"                ON )
  OPTION(WITH_LUA52               "Build Ryzom Core using Lua 5.2"                OFF)
  OPTION(WITH_LUA53               "Build Ryzom Core using Lua 5.3"                OFF)
-  OPTION(WITH_LUA54               "Build Ryzom Core using Lua 5.4"                OFF)
  OPTION(WITH_RYZOM_CLIENT_UAC    "Ask to run as Administrator"                   OFF)
  OPTION(WITH_RYZOM_PATCH         "Enable Ryzom in-game patch support"            OFF)
  OPTION(WITH_RYZOM_CUSTOM_PATCH_SERVER "Only use patch server from CFG file"     OFF)
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -104,3 +104,61 @@ jobs:
        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
--- a/config.h.cmake
+++ b/config.h.cmake
@ -39,8 +39,8 @@
 #cmakedefine RYZOM_CLIENT_PATCH_URL "${RYZOM_CLIENT_PATCH_URL}"
 #cmakedefine RYZOM_CLIENT_APP_NAME "${RYZOM_CLIENT_APP_NAME}"

-#cmakedefine RYZOM_CLIENT_RELEASENOTES_RING_URL "${RYZOM_CLIENT_RELEASENOTES_RING_URL}"
-#cmakedefine RYZOM_CLIENT_RELEASENOTES_URL "${RYZOM_CLIENT_RELEASENOTES_URL}"
+#cmakedefine RYZOM_WEBIG_MAIN_URL "${RYZOM_WEBIG_MAIN_URL}"
+#cmakedefine RYZOM_WEBIG_TRUSTED_DOMAIN "${RYZOM_WEBIG_TRUSTED_DOMAIN}"

 #cmakedefine AUTHOR "${AUTHOR}"
 #cmakedefine YEAR "${YEAR}"
--- a/dist/debian/ryzomcore_version.sh
+++ b/dist/debian/ryzomcore_version.sh
@ -32,9 +32,9 @@ parse_version()
  export $VAR=$V
 }

-parse_version NL $VERSION_FILE VERSION_MAJOR
-parse_version NL $VERSION_FILE VERSION_MINOR
-parse_version NL $VERSION_FILE VERSION_PATCH
+parse_version RYZOM $VERSION_FILE VERSION_MAJOR
+parse_version RYZOM $VERSION_FILE VERSION_MINOR
+parse_version RYZOM $VERSION_FILE VERSION_PATCH

 VERSION=$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH

--- a/nel/include/nel/gui/ctrl_text_button.h
+++ b/nel/include/nel/gui/ctrl_text_button.h
@ -134,6 +134,16 @@ namespace NLGUI
 		void setTexturePushed(const std::string &l, const std::string &m, const std::string &r);
 		void setTextureOver(const std::string &l, const std::string &m, const std::string &r);

+		// lua
+		void setTextureLua (const std::string &name);
+		void setTexturePushedLua (const std::string &name);
+		void setTextureOverLua (const std::string &name);
+
+		// return texture _l.tga
+		std::string getTexture () const;
+		std::string getTexturePushed () const;
+		std::string getTextureOver() const;
+
 		int luaGetViewText(CLuaState &ls);

 		REFLECT_EXPORT_START(CCtrlTextButton, CCtrlBaseButton)
@ -148,6 +158,9 @@ namespace NLGUI
 			REFLECT_SINT32("wmin", getWMin, setWMin)
 			REFLECT_SINT32("hmin", getHMin, setHMin)
 			REFLECT_LUA_METHOD("getViewText", luaGetViewText)
+			REFLECT_STRING("texture", getTexture, setTextureLua);
+			REFLECT_STRING("texture_pushed", getTexturePushed, setTexturePushedLua);
+			REFLECT_STRING("texture_over", getTextureOver, setTextureOverLua);
 		REFLECT_EXPORT_END

 		void onRemoved();
--- a/nel/include/nel/gui/group_html.h
+++ b/nel/include/nel/gui/group_html.h
@ -86,9 +86,6 @@ namespace NLGUI
 			std::string languageCode;
 			/// List of domains the widget can consider secure.
 			std::vector< std::string > trustedDomains;
-			/// Web server
-			std::string webServer;
-			std::string webServerDomain;
 			/// Maximum concurrent MultiCurl connections per CGroupHTML instance
 			sint32 curlMaxConnections;

@ -972,6 +969,7 @@ namespace NLGUI

 		// stop all curl downalods (html and data)
 		void releaseDownloads();
+		void releaseDataDownloads();
 		void checkDownloads();

 		// _CurlWWW download finished
--- a/nel/include/nel/gui/interface_element.h
+++ b/nel/include/nel/gui/interface_element.h
@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
@ -383,6 +383,7 @@ namespace NLGUI
 		void dummySet(const std::string &value);

 	public:
+
 		// export some properties
 		REFLECT_EXPORT_START(CInterfaceElement, CReflectable)
 			REFLECT_BOOL ("active", getActive, setActive);
@ -397,7 +398,6 @@ namespace NLGUI
 			REFLECT_SINT32 ("h_real", getHReal, dummySet);
 			REFLECT_STRING ("id", getIdByValue, dummySet);
 			REFLECT_STRING ("sizeref", getSizeRefAsString, setSizeRef);
-			REFLECT_STRING ("posparent", getPosParent, setPosParent);
 			REFLECT_LUA_METHOD("updateCoords", luaUpdateCoords);
 			REFLECT_LUA_METHOD("invalidateCoords", luaInvalidateCoords);
 			REFLECT_LUA_METHOD("invalidateContent", luaInvalidateContent);
@ -525,8 +525,6 @@ namespace NLGUI
 		void setSizeParent( const std::string &id );
 		void getSizeParent( std::string &id ) const;
 		
-		std::string getPosParent() const;
-		
 		void setSerializable( bool b ){ serializable = b; }
 		bool IsSerializable() const{ return serializable; }

--- a/nel/include/nel/gui/view_text.h
+++ b/nel/include/nel/gui/view_text.h
@ -119,8 +119,8 @@ namespace NLGUI
 		void enableStringSelection(uint start, uint end);
 		void disableStringSelection();

-		/// Get
-		std::string		getText() const { return _HardText.empty() ? _Text : _HardText; }
+		/// Get displayed text
+		std::string		getText() const { return _Text; }
 #ifdef RYZOM_LUA_UCSTRING
 		ucstring		getTextAsUtf16() const; // Compatibility
 		ucstring		getHardTextAsUtf16() const; // Compatibility
@ -188,6 +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;
--- a/nel/include/nel/gui/widget_manager.h
+++ b/nel/include/nel/gui/widget_manager.h
@ -654,8 +654,6 @@ namespace NLGUI
 		bool _GroupSelection;
 		bool multiSelection;
 		uint32 _WidgetCount;
-
-		std::set<std::string> m_LoggedMissingElement;
 	};

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


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

 	/// nullable
-	bool				_Nullable;
+	bool				m_Nullable;

 	/// true if this value has changed
 	bool				_Changed;
--- a/nel/include/nel/misc/debug.h
+++ b/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)
--- a/nel/include/nel/misc/entity_id.h
+++ b/nel/include/nel/misc/entity_id.h
@ -25,7 +25,6 @@
 #include "debug.h"
 #include "common.h"
 #include "stream.h"
-#include "wang_hash.h"

 namespace NLMISC {

@ -578,7 +577,6 @@ public:
 };*/

 // Traits for hash_map using CEntityId
-#if 0
 struct CEntityIdHashMapTraits
 {
 	enum { bucket_size = 4, min_buckets = 8 };
@ -598,27 +596,7 @@ struct CEntityIdHashMapTraits
 		return id1.getShortId() < id2.getShortId();
 	}
 };
-#else
-struct CEntityIdHashMapTraits
-{
-	enum { bucket_size = 4, min_buckets = 8 };
-	CEntityIdHashMapTraits() { }
-	size_t operator() (const NLMISC::CEntityId &id ) const
-	{
-		uint64 hash64 = id.getUniqueId();
-		if (sizeof(size_t) == 8)
-		{
-			return (size_t)NLMISC::wangHash64(hash64);
-		}
-		else
-		{
-			uint32 hash32a = NLMISC::wangHash((uint32)(hash64 & 0xFFFFFFFF));
-			uint32 hash32b = NLMISC::wangHash((uint32)(hash64 >> 32));
-			return hash32a ^ hash32b;
-		}
-	}
-};
-#endif
+

 /*inline std::stringstream &operator << (std::stringstream &__os, const CEntityId &__t)
 {
--- a/nel/include/nel/misc/factory.h
+++ b/nel/include/nel/misc/factory.h
@ -71,7 +71,10 @@ public:
 	 */
 	void registerClass(const KeyType &key, IFactoryRegister<BaseClass> *factoryRegister)
 	{
-		nlassert(_FactoryRegisters.find(key) == _FactoryRegisters.end());
+		// TODO: Removed assert because of crash of fes in 2019. We need found why... (ulukyn)
+		//nlassert(_FactoryRegisters.find(key) == _FactoryRegisters.end());
+		//_FactoryRegisters.insert(std::make_pair(key, factoryRegister));
+		if (_FactoryRegisters.find(key) == _FactoryRegisters.end())
 			_FactoryRegisters.insert(std::make_pair(key, factoryRegister));
 	}

--- a/nel/include/nel/misc/types_nl.h
+++ b/nel/include/nel/misc/types_nl.h
@ -274,7 +274,7 @@

 //#define NL_NO_DEBUG
 #undef NL_NO_DEBUG
-
+#define NL_NO_ASSERT

 // Standard types

--- a/nel/include/nel/misc/ucstring.h
+++ b/nel/include/nel/misc/ucstring.h
@ -20,6 +20,8 @@
 #ifndef NL_UCSTRING_H
 #define NL_UCSTRING_H

+#define RYZOM_LUA_UCSTRING
+
 #include "types_nl.h"
 #include "debug.h"

--- a/nel/include/nel/misc/xml_macros.h
+++ b/nel/include/nel/misc/xml_macros.h
@ -72,3 +72,4 @@

 #endif // XML_MACROS_H

+
--- a/nel/include/nel/net/message.h
+++ b/nel/include/nel/net/message.h
@ -1,9 +1,6 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
-// This source file has been modified by the following contributors:
-// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
-//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
@ -95,11 +92,6 @@ public:
 	/// exchange memory data
 	void swap(CMessage &other);

-#ifdef NL_CPP14
-	/// Move operator
-	CMessage &operator=(CMessage &&other) noexcept { swap(other); return *this; }
-#endif
-
 	/// Sets the message type as a string and put it in the buffer if we are in writing mode
 	void setType (const std::string &name, TMessageType type=OneWay);

--- a/nel/include/nel/sound/audio_mixer_user.h
+++ b/nel/include/nel/sound/audio_mixer_user.h
@ -42,7 +42,7 @@

 // Current version is 2, Ryzom Live uses 1
 // Provided to allow compatibility with old binary files
-#define NLSOUND_SHEET_VERSION_BUILT 2
+#define NLSOUND_SHEET_VERSION_BUILT 1

 namespace NLLIGO {
 	class CLigoConfig;
--- a/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
+++ b/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010-2017  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2010  Robert TIMM (rti) <mail@rtti.de>
--- a/nel/src/3d/driver/opengl/driver_opengl_window.cpp
+++ b/nel/src/3d/driver/opengl/driver_opengl_window.cpp
@ -2064,6 +2064,8 @@ bool CDriverGL::setMode(const GfxMode& amode)
 		// if window is visible, then also restore mouse relative position.
 		if (!mode.DisplayDevice.empty() && mode.DisplayDevice != current.DisplayDevice)
 		{
+			setWindowStyle(EWSWindowed);
+
 			int screen = DefaultScreen(_dpy);
 			Window root = RootWindow(_dpy, screen);
 			uint mouseX = mode.Width / 2;
@ -2090,6 +2092,7 @@ bool CDriverGL::setMode(const GfxMode& amode)
 			XMoveWindow(_dpy, _win, newX, newY);
 			_WindowX = newX;
 			_WindowY = newY;
+			setWindowStyle(EWSFullscreen);
 		}
 	}
 #endif
@ -3105,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);
@ -3112,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)

--- a/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp
+++ b/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;
 }
--- a/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.h
+++ b/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.h
@ -21,6 +21,7 @@
 #ifndef NL_COCOA_EVENT_EMITTER_H
 #define NL_COCOA_EVENT_EMITTER_H

+#include <string.h>
 #include "nel/misc/event_emitter.h"
 #include "nel/misc/event_server.h"
 #include "nel/misc/events.h"
@ -53,8 +54,8 @@ public:
 	virtual void submitEvents(CEventServer& server, bool allWindows);
 	bool         handleQuitRequest();

-	virtual bool copyTextToClipboard(const ucstring &text);
-	virtual bool pasteTextFromClipboard(ucstring &text);
+	virtual bool copyTextToClipboard(const std::string &text);
+	virtual bool pasteTextFromClipboard(std::string &text);
 };

 }
--- a/nel/src/3d/lod_character_manager.cpp
+++ b/nel/src/3d/lod_character_manager.cpp
@ -981,10 +981,11 @@ void			CLodCharacterManager::addTextureCompute(CLodCharacterInstance &instance,
 		return;

 	// get lookup ptr.
-	nlassert(lodTexture.Texture.size()==NL3D_CLOD_TEXT_SIZE);
 	if (lodTexture.Texture.size() < NL3D_CLOD_TEXT_SIZE)
 		return;
 	
+	nlassert(lodTexture.Texture.size()==NL3D_CLOD_TEXT_SIZE);
+
 	const CLodCharacterTexture::CTUVQ		*lookUpPtr= &lodTexture.Texture[0];

 	// apply the lodTexture, taking only better quality (ie nearer 0)
--- a/nel/src/3d/mesh_base.cpp
+++ b/nel/src/3d/mesh_base.cpp
@ -172,8 +172,6 @@ void	CMeshBase::serialMeshBase(NLMISC::IStream &f)
 	 * ***********************************************/

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

 	if (ver >= 2)
 	{
--- a/nel/src/3d/vegetable_manager.cpp
+++ b/nel/src/3d/vegetable_manager.cpp
@ -1,5 +1,5 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
@ -1751,7 +1751,7 @@ void			CVegetableManager::swapIgRdrPassHardMode(CVegetableInstanceGroup *ig, uin
 // ***************************************************************************
 void		CVegetableManager::setGlobalDensity(float density)
 {
-	clamp(density, 0.f, 1.f);
+	clamp(density, 0.f, 100.f);
 	_GlobalDensity= density;
 }

--- a/nel/src/3d/zone.cpp
+++ b/nel/src/3d/zone.cpp
@ -442,8 +442,6 @@ void			CZone::serial(NLMISC::IStream &f)
 	 *	It can be loaded/called through CAsyncFileManager for instance
 	 * ***********************************************/
 	/*
-	Version 5:
-		- Ryzom Core release check
 	Version 4:
 		- PointLights
 	Version 3:
@ -455,7 +453,7 @@ void			CZone::serial(NLMISC::IStream &f)
 	Version 0:
 		- base verison.
 	*/
-	uint	ver= f.serialVersion(5);
+	uint	ver= f.serialVersion(4);

 	// No more compatibility before version 3
 	if (ver<3)
--- a/nel/src/gui/css_background_renderer.cpp
+++ b/nel/src/gui/css_background_renderer.cpp
@ -428,7 +428,7 @@ namespace NLGUI

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

 		if (bg.repeatY == CSS_VALUE_ROUND)
 		{
-			sint numTiles = std::max(1, (sint)std::ceil(((float)areaH / texH) - 0.5f));
+			sint numTiles = std::max(1, (sint)std::round((float)areaH / texH));
 			texH = areaH / numTiles;
 			if (bg.width.isAuto() && bg.repeatX != CSS_VALUE_ROUND)
 			{
--- a/nel/src/gui/css_length.cpp
+++ b/nel/src/gui/css_length.cpp
@ -30,10 +30,9 @@ namespace NLGUI

 bool CSSLength::parseValue(const std::string &value, bool allowPercent, bool allowNegative)
 {
-	static const std::string knownUnitsArr[] = {
+	static const std::set<std::string> knownUnits = {
 		"%", "rem", "em", "px", "pt", "vw", "vh", "vi", "vb", "vmin", "vmax"
 	};
-	static const std::set<std::string> knownUnits(knownUnitsArr, &knownUnitsArr[sizeof(knownUnitsArr) / sizeof(knownUnitsArr[0])]);

 	std::string::size_type pos = 0;
 	std::string::size_type len = value.size();
--- a/nel/src/gui/css_style.cpp
+++ b/nel/src/gui/css_style.cpp
@ -1103,7 +1103,19 @@ namespace NLGUI
 						// first loop -> true
 						// second loop -> false && break
 						loop = !loop;
-						if (next < parts.size())
+
+						if (next >= parts.size())
+							break;
+
+						val = toLower(parts[next]);
+						if (val == "center")
+						{
+							if (bgPositionX.empty()) bgPositionX = "center";
+							if (bgPositionY.empty()) bgPositionY = "center";
+							// consume 'center'
+							next++;
+						}
+						else if (val == "left" || val == "right")
 						{
 							val = toLowerAscii(parts[next]);
 							if (val == "center")
--- a/nel/src/gui/ctrl_scroll.cpp
+++ b/nel/src/gui/ctrl_scroll.cpp
@ -872,6 +872,7 @@ namespace NLGUI
 		if (CCtrlBase::handleEvent(event)) return true;
 		if (!_Active || _Frozen)
 			return false;
+
 		if (event.getType() == NLGUI::CEventDescriptor::mouse)
 		{
 			const NLGUI::CEventDescriptorMouse &eventDesc = (const NLGUI::CEventDescriptorMouse &)event;
@ -1255,6 +1256,7 @@ namespace NLGUI
 		if(wReal <= maxWReal)
 			return;

+
 		// compute the new ofsX.
 		sint32	ofsX= _Target->getOfsX();
 		ofsX+= dx;
--- a/nel/src/gui/ctrl_text_button.cpp
+++ b/nel/src/gui/ctrl_text_button.cpp
@ -1105,6 +1105,69 @@ namespace NLGUI

 	// ***************************************************************************

+	void CCtrlTextButton::setTextureLua(const std::string &name)
+	{
+		_TextureIdNormal[0].setTexture(std::string(name + "_l.tga").c_str());
+		_TextureIdNormal[1].setTexture(std::string(name + "_m.tga").c_str());
+		_TextureIdNormal[2].setTexture(std::string(name + "_r.tga").c_str());
+	}
+
+	// ***************************************************************************
+
+	void CCtrlTextButton::setTexturePushedLua(const std::string &name)
+	{
+		_TextureIdPushed[0].setTexture(std::string(name + "_l.tga").c_str());
+		_TextureIdPushed[1].setTexture(std::string(name + "_m.tga").c_str());
+		_TextureIdPushed[2].setTexture(std::string(name + "_r.tga").c_str());
+	}
+
+	// ***************************************************************************
+
+	void CCtrlTextButton::setTextureOverLua(const std::string &name)
+	{
+		_TextureIdOver[0].setTexture(std::string(name + "_l.tga").c_str());
+		_TextureIdOver[1].setTexture(std::string(name + "_m.tga").c_str());
+		_TextureIdOver[2].setTexture(std::string(name + "_r.tga").c_str());
+	}
+
+	// ***************************************************************************
+
+	std::string CCtrlTextButton::getTexture() const
+	{
+		std::string tx = CViewRenderer::getInstance()->getTextureNameFromId(_TextureIdNormal[0]);
+		std::string::size_type i = tx.rfind("_l.tga");
+		if (i != std::string::npos)
+			tx = tx.substr(0, i);
+
+		return tx;
+	}
+
+	// ***************************************************************************
+
+	std::string CCtrlTextButton::getTexturePushed() const
+	{
+		std::string tx = CViewRenderer::getInstance()->getTextureNameFromId(_TextureIdOver[0]);
+		std::string::size_type i = tx.rfind("_l.tga");
+		if (i != std::string::npos)
+			tx = tx.substr(0, i);
+
+		return tx;
+	}
+
+	// ***************************************************************************
+
+	std::string CCtrlTextButton::getTextureOver() const
+	{
+		std::string tx = CViewRenderer::getInstance()->getTextureNameFromId(_TextureIdPushed[0]);
+		std::string::size_type i = tx.rfind("_l.tga");
+		if (i != std::string::npos)
+			tx = tx.substr(0, i);
+
+		return tx;
+	}
+
+	// ***************************************************************************
+
 	int CCtrlTextButton::luaGetViewText(CLuaState &ls)
 	{
 		const char *funcName = "getViewText";
--- a/nel/src/gui/group_html.cpp
+++ b/nel/src/gui/group_html.cpp
@ -299,6 +299,11 @@ namespace NLGUI

 	void CGroupHTML::ImageDownloadCB::finish()
 	{
+		// Image setTexture will remove itself from Images while iterating over it.
+		// Do the swap to keep iterator safe.
+		std::vector<SImageInfo> vec;
+		vec.swap(Images);
+
 		// tmpdest file does not exist if download skipped (ie cache was used)
 		if (CFile::fileExists(tmpdest) || CFile::getFileSize(tmpdest) == 0)
 		{
@ -322,7 +327,7 @@ namespace NLGUI
 			// to temp file temporarily. that forces driver to reload texture from disk
 			// ITexture::touch() seem not to do this.
 			// cache was updated, first set texture as temp file
-			for(std::vector<SImageInfo>::iterator it = Images.begin(); it != Images.end(); ++it)
+			for(std::vector<SImageInfo>::iterator it = vec.begin(); it != vec.end(); ++it)
 			{
 				SImageInfo &img = *it;
 				Parent->setImage(img.Image, tmpdest, img.Type);
@ -339,7 +344,7 @@ namespace NLGUI
 		}

 		// even if image was cached, incase there was 'http://' image set to CViewBitmap
-		for(std::vector<SImageInfo>::iterator it = Images.begin(); it != Images.end(); ++it)
+		for(std::vector<SImageInfo>::iterator it = vec.begin(); it != vec.end(); ++it)
 		{
 			SImageInfo &img = *it;
 			Parent->setImage(img.Image, dest, img.Type);
@ -403,9 +408,6 @@ namespace NLGUI
 	// Check if domain is on TrustedDomain
 	bool CGroupHTML::isTrustedDomain(const string &domain)
 	{
-		if (domain == options.webServerDomain)
-			return true;
-
 		vector<string>::iterator it;
 		it = find ( options.trustedDomains.begin(), options.trustedDomains.end(), domain);
 		return it != options.trustedDomains.end();
@ -1056,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)
 		{
@ -3083,14 +3092,7 @@ namespace NLGUI

 		paragraphChange ();

-		// clear the pointer to the current image download since all the button are deleted
-		LOG_DL("Clear pointers to %d curls", Curls.size());
-
-		// remove image refs from downloads
-		/*for(std::list<CDataDownload>::iterator it = Curls.begin(); it != Curls.end(); ++it)
-		{
-			it->imgs.clear();
-		}*/
+		releaseDataDownloads();
 	}

 	// ***************************************************************************
@ -3419,16 +3421,6 @@ namespace NLGUI
 			string finalUrl;
 			bool isLocal = lookupLocalFile (finalUrl, _URL.c_str(), true);

-			if (!isLocal && _URL.c_str()[0] == '/')
-			{
-				if (options.webServer.empty())
-				{
-					// Try again later
-					return;
-				}
-				finalUrl = options.webServer + finalUrl;
-			}
-
 			_URL = finalUrl;

 			CUrlParser uri (_URL);
@ -5326,7 +5318,7 @@ namespace NLGUI
 			string suri = elm.getAttribute("href");
 			if(suri.find("ah:") == 0)
 			{
-				if (_TrustedDomain)
+				if (_TrustedDomain || suri.find("ah:script:") == 0)
 					_Link.back() = suri;
 			}
 			else
@ -6191,11 +6183,13 @@ namespace NLGUI

 	void CGroupHTML::htmlOBJECTend(const CHtmlElement &elm)
 	{
-		if (!_TrustedDomain)
-			return;
+

 		if (_ObjectType=="application/ryzom-data")
 		{
+			if (!_TrustedDomain)
+				return;
+
 			if (!_ObjectData.empty())
 			{
 				if (addBnpDownload(_ObjectData, _ObjectAction, _ObjectScript, _ObjectMD5Sum))
@ -6205,6 +6199,20 @@ namespace NLGUI
 				_ObjectScript.clear();
 			}
 		}
+		else if (_ObjectType=="application/ryzom-tutorial")
+		{
+			while(strFindReplace(_ObjectScript, "[", "〈"));
+			while(strFindReplace(_ObjectScript, "]", "〉"));
+			CLuaManager::getInstance().executeLuaScript("\ngame:executeTutorial([["+_ObjectScript+"]])\n", true);
+			_ObjectScript.clear();
+		}
+		else if (_ObjectType=="application/ryzom-script")
+		{
+			while(strFindReplace(_ObjectScript, "[", "〈"));
+			while(strFindReplace(_ObjectScript, "]", "〉"));
+			CLuaManager::getInstance().executeLuaScript("\ngame:executeRyzomScript([["+_ObjectScript+"]])\n", true);
+			_ObjectScript.clear();
+		}
 		_Object = false;
 	}

--- a/nel/src/gui/group_menu.cpp
+++ b/nel/src/gui/group_menu.cpp
@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2019  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
@ -380,6 +380,23 @@ namespace NLGUI
 					if (pUG)
 						setUserGroupRight((uint)_Lines.size()-1, pUG, true);
 				}
+				// usergroup from simple icon
+				CXMLAutoPtr icon((const char*) xmlGetProp (cur, (xmlChar*)"icon"));
+				if (icon)
+				{
+					typedef std::pair<std::string, std::string> TTmplParams;
+					std::vector<TTmplParams> vparams;
+					uint lineIndex = _Lines.size()-1;
+					vparams.push_back(TTmplParams("id", toString("icon%d", lineIndex)));
+					vparams.push_back(TTmplParams("sizeref", ""));
+					vparams.push_back(TTmplParams("icon_texture", (const char*)icon));
+					//vparams.push_back(TTmplParams("icon_color", options.ColorNormal.toString()));
+					string lineId = toString("%s:icon", pV->getId().c_str());
+
+					CInterfaceGroup *pUG = CWidgetManager::getInstance()->getParser()->createGroupInstance("menu_row_icon", lineId, vparams);
+					if (pUG)
+						setUserGroupLeft((uint)_Lines.size()-1, pUG, true);
+				}
 			}
 			cur = cur->next;
 		}
@ -572,8 +589,6 @@ namespace NLGUI

 		CGroupFrame::updateCoords();

-		bool mustUpdate = false;
-
 		if (_MaxVisibleLine > 0 && sint32(_Lines.size())>_MaxVisibleLine)
 		{
 			for(k = 0; k < _Lines.size(); ++k)
@ -604,7 +619,6 @@ namespace NLGUI
 					_SelectionView->setW (-8-8-2);
 					_ScrollBar->setSerializable( false );
 					addCtrl(_ScrollBar);
-					mustUpdate = true;
 				}
 				break;
 			}
@ -653,13 +667,7 @@ namespace NLGUI
 			}
 		}

-
-
-		if (mustUpdate)
-		{
 		CGroupFrame::updateCoords();
-		}
-

 		// *** Setup SubMenus and CheckBoxes Positions
 		sint32 maxViewW = 0;
--- a/nel/src/gui/interface_element.cpp
+++ b/nel/src/gui/interface_element.cpp
@ -1,5 +1,5 @@
 // Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010-2018  Winch Gate Property Limited
+// Copyright (C) 2010-2020  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
@ -438,14 +438,6 @@ namespace NLGUI
 		parseSizeRef(sizeref.c_str());
 	}

-	// ------------------------------------------------------------------------------------------------
-	std::string CInterfaceElement::getPosParent() const
-	{
-		std::string id;
-		getPosParent(id);
-		return id;
-	}
-
 	// ------------------------------------------------------------------------------------------------
 	std::string CInterfaceElement::getSizeRefAsString() const
 	{
@ -1172,6 +1164,8 @@ namespace NLGUI
 		{
 			_Active = state;
 			invalidateCoords();
+			// force invalidate CViewText/CGroupTable inner elements
+			invalidateContent();
 		}
 	}

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

 		std::string::size_type pos = 0;
 		std::string::size_type len = str.size();
--- a/nel/src/gui/lua_ihm.cpp
+++ b/nel/src/gui/lua_ihm.cpp
@ -1123,7 +1123,6 @@ namespace NLGUI
 		if(!pIE)
 		{
 			ls.pushNil();
-			nlerror("getCurrentWindowUnder(): No UICaller found. return Nil");
 		}
 		else
 		{
--- a/nel/src/gui/lua_manager.cpp
+++ b/nel/src/gui/lua_manager.cpp
@ -70,7 +70,17 @@ namespace NLGUI
 		}
 		catch( const ELuaError &e )
 		{
+			#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;
 		}

--- a/nel/src/gui/view_bitmap.cpp
+++ b/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);
 		}
 	}
--- a/nel/src/gui/view_text.cpp
+++ b/nel/src/gui/view_text.cpp
@ -95,6 +95,7 @@ namespace NLGUI
 		_FontWidth= 0;
 		_FontHeight = 0;
 		_FontLegHeight = 0;
+		_TabWidth= 0;

 		_TextSelection= false;
 		_TextSelectionStart= 0;
@ -1029,6 +1030,9 @@ namespace NLGUI

 			if (_MultiLine)
 			{
+				if (NLMISC::startsWith(propPtr, "u:"))
+					setTextFormatTaged(std::string(propPtr).substr(2));
+				else
 					setTextFormatTaged(CI18N::get(propPtr));
 			}
 			else
@ -1281,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;
@ -1465,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())));
 	}

 	// ***************************************************************************
@ -1764,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);
@ -1948,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;
 			}
 			//
@ -3110,8 +3114,6 @@ namespace NLGUI
 		TextContext->setEmbolden (_Embolden);
 		TextContext->setOblique (_Oblique);

-#if 1
-
 		UTextContext::CStringInfo si = TextContext->getStringInfo("XO");
 		float xoHeight = si.StringHeight;

@ -3142,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
-
-		// 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>)
+		//  Tab Width (used for {Txx})
+		// if not set to "_", breaks item help window
 		si = TextContext->getStringInfo("_");
-		_FontWidth = si.StringWidth;
-
-#endif
+		_TabWidth = si.StringWidth;
 	}


@ -3638,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);
--- a/nel/src/gui/widget_manager.cpp
+++ b/nel/src/gui/widget_manager.cpp
@ -435,23 +435,8 @@ namespace NLGUI
 			CWidgetManager::SMasterGroup &rMG = _MasterGroups[nMasterGroup];
 			CInterfaceElement *pIEL = rMG.Group->getElement (sEltId);
 			if (pIEL != NULL)
-			{
-#if !FINAL_VERSION
-				if (m_LoggedMissingElement.find(sEltId) != m_LoggedMissingElement.end())
-				{
-					m_LoggedMissingElement.erase(sEltId);
-					nlwarning("Previously missing UI element with Id '%s' was now found!", sEltId.c_str());
-				}
-#endif
 				return pIEL;
 		}
-		}
-
-		if (m_LoggedMissingElement.find(sEltId) == m_LoggedMissingElement.end())
-		{
-			m_LoggedMissingElement.insert(sEltId);
-			nlwarning("Could not find UI element from Id '%s'...", sEltId.c_str());
-		}
 		return NULL;
 	}

--- a/nel/src/misc/bitmap.cpp
+++ b/nel/src/misc/bitmap.cpp
@ -3269,14 +3269,15 @@ CRGBAF CBitmap::getColor (float x, float y) const

 	uint32 i;

+	bool isValid = true;
 	for (i = 0; i < 4; ++i)
 	{
-		nlassert (nX[i] >= 0);
-		nlassert (nY[i] >= 0 );
-		nlassert (nX[i] < nWidth);
-		nlassert (nY[i] < nHeight);
+		if (nX[i] < 0 || nY[i] < 0 || nX[i] >= nWidth || nY[i] >= nHeight)
+			isValid = false;
 	}

+	if (isValid)
+	{
 		// Decimal part of (x,y)
 		x = x - (float)nX[0];
 		y = y - (float)nY[0];
@ -3341,6 +3342,7 @@ CRGBAF CBitmap::getColor (float x, float y) const
 			break;
 			default: break;
 		}
+	}

 	return CRGBAF (0.0f, 0.0f, 0.0f, 0.0f);
 }
--- a/nel/src/misc/cdb_leaf.cpp
+++ b/nel/src/misc/cdb_leaf.cpp
@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2014-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2016  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
@ -55,11 +55,11 @@ void CCDBNodeLeaf::init(  xmlNodePtr node, IProgressCallback &/* progressCallBac
 	CXMLAutoPtr nullable((const char*)xmlGetProp (node, (xmlChar*)"nullable"));
 	if ((const char *) nullable != NULL)
 	{
-		_Nullable = (nullable.getDatas()[0] == '1');
+		m_Nullable = (nullable.getDatas()[0] == '1');
 	}
 	else
 	{
-		_Nullable = false;
+		m_Nullable = false;
 	}

 	// Read type
@ -99,9 +99,6 @@ void CCDBNodeLeaf::init(  xmlNodePtr node, IProgressCallback &/* progressCallBac
 		// IF it is a TEXT.
 		if(!strcmp(type, "TEXT"))
 			_Type = ICDBNode::TEXT;
-		// IF it is a PACKED.
-		else if (!strcmp(type, "PACKED"))
-			_Type = ICDBNode::PACKED;
 		// ELSE type unknown.
 		else
 		{
@ -146,15 +143,6 @@ void CCDBNodeLeaf::write( CTextId& id, FILE * f)
 	fprintf(f,"%" NL_I64 "d\t%s\n",_Property,id.toString().c_str());
 } // write //

-inline uint readPackedBitCount(CBitMemStream & f)
-{
-	uint64 nibbleCount;
-	f.serial(nibbleCount, 4);
-	uint bits = (nibbleCount << 2) + 4;
-	// nlinfo("PACKED: %u bits", (uint32)(bits));
-	return bits;
-}
-
 //-----------------------------------------------
 //	readDelta
 //-----------------------------------------------
@ -167,24 +155,20 @@ void CCDBNodeLeaf::readDelta(TGameCycle gc, CBitMemStream & f )
 		uint64 recvd = 0;

 		uint64 isNull = 0;
-		if (_Nullable)
+		if (m_Nullable)
 		{
 			f.serial(isNull, 1);
 		}

 		uint bits;
-		if (!isNull)
-		{
 		if (_Type == TEXT)
 			bits = 32;
-			else if (_Type == PACKED)
-				bits = readPackedBitCount(f);
 		else if (_Type <= I64)
 			bits = _Type;
 		else
 			bits = _Type - 64;
 		f.serial(recvd, bits);
-		}
+

 		// if the DB update is older than last DB update, abort (but after the read!!)
 		if(gc<_LastChangeGC)
@ -197,9 +181,7 @@ void CCDBNodeLeaf::readDelta(TGameCycle gc, CBitMemStream & f )
 		_Property = (sint64)recvd;

 		// if signed
-		if (! ((_Type == TEXT) || (_Type == PACKED) || (_Type <= I64)))
-		{
-			if (!isNull)
+		if (! ((_Type == TEXT) || (_Type <= I64)))
 		{
 			// extend bit sign
 			sint64 mask = (((sint64)1)<<bits)-(sint64)1;
@ -208,13 +190,9 @@ void CCDBNodeLeaf::readDelta(TGameCycle gc, CBitMemStream & f )
 				_Property |= ~mask;
 			}
 		}
-		}
 		if ( verboseDatabase )
 		{
-			if (!isNull)
 			nlinfo( "CDB: Read value (%u bits) %" NL_I64 "d", bits, _Property );
-			else
-				nlinfo( "CDB: Read null value %" NL_I64 "d", _Property );
 		}

 		// bkup the date of change
--- a/nel/src/misc/command.cpp
+++ b/nel/src/misc/command.cpp
@ -52,8 +52,9 @@ ICommand::ICommand(const char *categoryName, const char *commandName, const char

 	if (comm != LocalCommands->end ())
 	{
+		nlinfo("command with same name: %s", commandName);
 		// 2 commands have the same name
-		nlstopex (("There are 2 commands that have the same name in the project (command name '%s'), skip the second definition", commandName));
+		// nlstopex (("There are 2 commands that have the same name in the project (command name '%s'), skip the second definition", commandName));
 	}
 	else
 	{
--- a/nel/src/misc/eid_translator.cpp
+++ b/nel/src/misc/eid_translator.cpp
@ -288,7 +288,7 @@ void CEntityIdTranslator::registerEntity (const CEntityId &eid, const ucstring &
 		return;
 	}

-	nlinfo ("EIT: Register EId %s EntityName '%s' UId %d UserName '%s'", reid.toString().c_str(), entityName.toString().c_str(), uid, userName.c_str());
+	//nlinfo ("EIT: Register EId %s EntityName '%s' UId %d UserName '%s'", reid.toString().c_str(), entityName.toString().c_str(), uid, userName.c_str());
 	RegisteredEntities.insert (make_pair(reid, CEntityIdTranslator::CEntity(entityName, uid, userName, entitySlot, shardId)));
 	NameIndex.insert(make_pair(toLower(entityName), reid));
 }
--- a/nel/src/misc/seven_zip.cpp
+++ b/nel/src/misc/seven_zip.cpp
@ -17,7 +17,6 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.

-#include "stdmisc.h"
 #include <nel/misc/seven_zip.h>

 #include <nel/misc/types_nl.h>
--- a/nel/src/misc/system_info.cpp
+++ b/nel/src/misc/system_info.cpp
@ -188,6 +188,7 @@
 #	endif // NL_CPU_INTEL
 #	ifdef NL_OS_MAC
 #		include <sys/mount.h>
+#		include <sys/sysctl.h>
 #	else
 #		include <sys/vfs.h>
 #	endif
--- a/nel/src/net/admin.cpp
+++ b/nel/src/net/admin.cpp
@ -612,7 +612,7 @@ void initAdmin (bool dontUseAES)
 	{
 		CUnifiedNetwork::getInstance()->setServiceUpCallback ("AES", cbAESConnection, NULL);
 		CUnifiedNetwork::getInstance()->setServiceDownCallback ("AES", cbAESDisconnection, NULL);
-		CUnifiedNetwork::getInstance()->addService ("AES", CInetAddress("localhost:43997"));
+		CUnifiedNetwork::getInstance()->addService ("AES", CInetAddress("localhost:49997"));
 	}
 	CUnifiedNetwork::getInstance()->addCallbackArray (CallbackArray, sizeof(CallbackArray)/sizeof(CallbackArray[0]));
 }
--- a/nel/src/net/login_client.cpp
+++ b/nel/src/net/login_client.cpp
@ -141,7 +141,7 @@ string CLoginClient::authenticateBegin(const string &loginServiceAddr, const ucs

 		string addr = loginServiceAddr;
 		if(addr.find(":") == string::npos)
-			addr += ":43997";
+			addr += ":49997";
 		if(_LSCallbackClient->connected())
 			_LSCallbackClient->disconnect();
 		_LSCallbackClient->connect (CInetAddress(addr));
--- a/nel/src/net/unified_network.cpp
+++ b/nel/src/net/unified_network.cpp
@ -268,12 +268,7 @@ void	uncbServiceIdentification(CMessage &msgin, TSockId from, CCallbackNetBase &

 	if(isExternal)
 	{
-
-#ifdef NL_OS_WINDOWS
-		pos = 0;
-#else
 		nlassert (pos == 0);
-#endif
 	}

 	if (inSid.get() == 0)
--- a/nel/src/pacs/move_container.cpp
+++ b/nel/src/pacs/move_container.cpp
@ -2,7 +2,7 @@
 // Copyright (C) 2010-2019  Winch Gate Property Limited
 //
 // This source file has been modified by the following contributors:
-// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
@ -418,8 +418,7 @@ void CMoveContainer::updateCells (CMovePrimitive *primitive, uint8 worldImage)
 	CPrimitiveWorldImage *wI=primitive->getWorldImage (worldImage);

 #if !FINAL_VERSION
-#ifndef RYZOM_FORGE
-	// Check BB width not too large
+/*	// Check BB width not too large
 	if (wI->getBBXMax() - wI->getBBXMin() > _CellWidth)
 	{
 		nlwarning ("Primitives have moved more than a cell, width: %f.", (float)(wI->getBBXMax() - wI->getBBXMin()));
@ -430,7 +429,7 @@ void CMoveContainer::updateCells (CMovePrimitive *primitive, uint8 worldImage)
 	{
 		nlwarning ("Primitives have moved more than a cell, height: %f.", (float)(wI->getBBYMax() - wI->getBBYMin()));
 	}
-#endif
+*/
 #endif

 	// Get coordinate in the cell array
--- a/nel/src/sound/sound.cpp
+++ b/nel/src/sound/sound.cpp
@ -262,7 +262,7 @@ void				CSound::importForm(const std::string& filename, NLGEORGES::UFormElm& roo
 	_GroupController = CGroupControllerRoot::getInstance()->getGroupController(NLSOUND_SHEET_V1_DEFAULT_SOUND_GROUP_CONTROLLER);
 #else
 	std::string groupControllerPath;
-	root.getValueByName(groupControllerPath, ".GroupController");
+	root.getValueByName(groupControllerPath, ".GroupControllerPath");
 	_GroupController = CGroupControllerRoot::getInstance()->getGroupController(groupControllerPath);
 #endif

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

 sys.path.append(WorkspaceDirectory)
 from projects import *
@ -529,7 +448,6 @@ printLog(log, "")
 # Additional directories
 printLog(log, ">>> Setup additional directories <<<")
 mkPath(log, ClientDevDirectory)
-mkPath(log, ClientDevLiveDirectory)
 mkPath(log, ClientPatchDirectory)
 mkPath(log, ClientInstallDirectory)

@ -585,7 +503,6 @@ if not args.noverify:
 	findTool(log, ToolDirectories, TranslationToolsTool, ToolSuffix)
 	findTool(log, ToolDirectories, BuildWorldPackedColTool, ToolSuffix)
 	findTool(log, ToolDirectories, R2IslandsTexturesTool, ToolSuffix)
-	findTool(log, ToolDirectories, PatchmanServiceTool, ToolSuffix)

 log.close()
 if os.path.isfile("0_setup.log"):
--- a/nel/tools/build_gamedata/1_export.py
+++ b/nel/tools/build_gamedata/1_export.py
--- a/nel/tools/build_gamedata/2_build.py
+++ b/nel/tools/build_gamedata/2_build.py
--- a/nel/tools/build_gamedata/3_install.py
+++ b/nel/tools/build_gamedata/3_install.py
--- a/nel/tools/build_gamedata/9_upload.py
+++ b/nel/tools/build_gamedata/9_upload.py
--- a/nel/tools/build_gamedata/a1_worldedit_data.py
+++ b/nel/tools/build_gamedata/a1_worldedit_data.py
--- a/nel/tools/build_gamedata/all_dev.bat
+++ b/nel/tools/build_gamedata/all_dev.bat
@ -1,17 +1,15 @@
 title Ryzom Core: 0_setup.py --noconf
-python 0_setup.py --noconf
+0_setup.py --noconf
 title Ryzom Core: 1_export.py
-python 1_export.py
+1_export.py
 title Ryzom Core: 2_build.py
-python 2_build.py
+2_build.py
 title Ryzom Core: 3_install.py
-python 3_install.py
+3_install.py
 title Ryzom Core: a1_worldedit_data.py
-python a1_worldedit_data.py
+a1_worldedit_data.py
 title Ryzom Core: b1_client_dev.py
-python b1_client_dev.py
+b1_client_dev.py
 title Ryzom Core: b2_shard_data.py
-python b2_shard_data.py
-title Ryzom Core: b3_shard_dev.py
-python b3_shard_dev.py
+b2_shard_data.py
 title Ryzom Core: Ready
--- a/nel/tools/build_gamedata/all_install_dev.bat
+++ b/nel/tools/build_gamedata/all_install_dev.bat
@ -1,11 +1,9 @@
 title Ryzom Core: 3_install.py
-python 3_install.py
+3_install.py
 title Ryzom Core: a1_worldedit_data.py
-python a1_worldedit_data.py
+a1_worldedit_data.py
 title Ryzom Core: b1_client_dev.py
-python b1_client_dev.py
+b1_client_dev.py
 title Ryzom Core: b2_shard_data.py
-python b2_shard_data.py
-title Ryzom Core: b3_shard_dev.py
-python b3_shard_dev.py
+b2_shard_data.py
 title Ryzom Core: Ready
--- a/nel/tools/build_gamedata/b1_client_dev.py
+++ b/nel/tools/build_gamedata/b1_client_dev.py
@ -24,14 +24,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # 

-import time, sys, os, shutil, subprocess, distutils.dir_util, socket
+import time, sys, os, shutil, subprocess, distutils.dir_util
 sys.path.append("configuration")

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

 sys.path.append(WorkspaceDirectory)
@ -45,10 +45,9 @@ printLog(log, "-------")
 printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
 printLog(log, "")

-mkPath(log, ClientDevLiveDirectory)
-if not os.path.isfile(ClientDevLiveDirectory + "/client.cfg"):
-	printLog(log, ">>> Generate live dev client.cfg <<<")
-	cfg = open(ClientDevLiveDirectory + "/client.cfg", "w")
+if not os.path.isfile(ClientDevDirectory + "/client.cfg"):
+	printLog(log, ">>> Generate client.cfg <<<")
+	cfg = open(ClientDevDirectory + "/client.cfg", "w")
 	cfg.write("RootConfigFilename   = \"client_default.cfg\";\n")
 	cfg.write("PreDataPath          = {\n")
 	cfg.write("\t\"user\", \"patch\", \"" + DataCommonDirectory + "\", \"" + GamedevDirectory + "\", \"" + LeveldesignDirectory + "/translation/translated\", \"" + InstallDirectory + "\", \"data\", \"examples\" \n")
@ -58,24 +57,6 @@ if not os.path.isfile(ClientDevLiveDirectory + "/client.cfg"):
 	cfg.write("DisplayLuaDebugInfo  = 1;\n")
 	cfg.write("AllowDebugLua        = 1;\n")
 	cfg.write("FullScreen           = 0;\n")
-	cfg.flush()
-	cfg.close()
-	printLog(log, "")
-
-mkPath(log, ClientDevDirectory)
-if not os.path.isfile(ClientDevDirectory + "/client.cfg"):
-	printLog(log, ">>> Generate local dev client.cfg <<<")
-	cfg = open(ClientDevDirectory + "/client.cfg", "w")
-	cfgr = open(ClientDevLiveDirectory + "/client.cfg", "r")
-	for l in cfgr:
-		cfg.write(l)
-	cfgr.close()
-	cfg.write("StartupHost          = \"http://" + socket.gethostname() + ":9042\";\n")
-	cfg.write("Application          = {\n")
-	cfg.write("	\"dev\", \"./client_ryzom_r.exe\", \"./\" \n")
-	cfg.write("};\n")
-	cfg.flush()
-	cfg.close()
 	printLog(log, "")

 printLog(log, ">>> Install data <<<")
@ -83,22 +64,13 @@ for category in InstallClientData:
 	if (category["UnpackTo"] != None):
 		printLog(log, "CATEGORY " + category["Name"])
 		targetPath = ClientDevDirectory
-		targetPathLive = ClientDevLiveDirectory
 		if (category["UnpackTo"] != ""):
 			targetPath += "/" + category["UnpackTo"]
-			targetPathLive += "/" + category["UnpackTo"]
 		mkPath(log, targetPath)
-		mkPath(log, targetPathLive)
 		for package in category["Packages"]:
 			printLog(log, "PACKAGE " + package[0])
 			mkPath(log, InstallDirectory + "/" + package[0])
-			if "exedll" in package[0]:
-				if package[0] == "exedll": # or package[0] == platformExeDll # TODO: 64-bit and Linux separation of exedll, only include one
-					copyFileIfNeeded(log, InstallDirectory + "/" + package[0] + "/client_default.cfg", targetPath)
-					copyFileIfNeeded(log, InstallDirectory + "/" + package[0] + "/client_default.cfg", targetPathLive)
-			else:
 			copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPath)
-				copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPathLive)
 printLog(log, "")

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

 sys.path.append(WorkspaceDirectory)
--- a/nel/tools/build_gamedata/characters_dev.bat
+++ b/nel/tools/build_gamedata/characters_dev.bat
@ -1,11 +1,11 @@
 title Ryzom Core: 1_export.py (CHARACTERS)
-python 1_export.py -ipj common/characters common/characters_maps_hr
+1_export.py -ipj common/characters common/characters_maps_hr
 title Ryzom Core: 2_build.py (CHARACTERS)
-python 2_build.py -ipj common/characters common/characters_maps_hr
+2_build.py -ipj common/characters common/characters_maps_hr
 title Ryzom Core: 3_install.py (CHARACTERS)
-python 3_install.py -ipj common/characters common/characters_maps_hr
+3_install.py -ipj common/characters common/characters_maps_hr
 title Ryzom Core: b1_client_dev.py (CHARACTERS)
-python b1_client_dev.py
+b1_client_dev.py
 title Ryzom Core: b2_shard_data.py (CHARACTERS)
-python b2_shard_data.py
+b2_shard_data.py
 title Ryzom Core: Ready (CHARACTERS)
--- a/nel/tools/build_gamedata/configuration/scripts.py
+++ b/nel/tools/build_gamedata/configuration/scripts.py
@ -96,20 +96,6 @@ def needUpdateLogRemoveDest(log, source, dest):
 	printLog(log, "SKIP " + dest)
 	return 0

-def needUpdateLogRemoveDestSilentSkip(log, source, dest):
-	if (os.path.isfile(source)):
-		if (os.path.isfile(dest)):
-			if (os.stat(source).st_mtime > os.stat(dest).st_mtime):
-				os.remove(dest)
-				printLog(log, source + " -> " + dest)
-				return 1
-			else:
-				return 0
-		printLog(log, source + " -> " + dest)
-		return 1
-	printLog(log, "MISSING " + source)
-	return 0
-
 def copyFileList(log, dir_source, dir_target, files):
 	for fileName in files:
 		if fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*":
--- a/nel/tools/build_gamedata/configuration/tools.py
+++ b/nel/tools/build_gamedata/configuration/tools.py
@ -98,5 +98,4 @@ PatchGenTool = "patch_gen"
 TranslationToolsTool = "translation_tools"
 BuildWorldPackedColTool = "build_world_packed_col"
 R2IslandsTexturesTool = "r2_islands_textures"
-PatchmanServiceTool = "ryzom_patchman_service"
 SevenZipTool = "7za"
--- a/nel/tools/build_gamedata/d1_client_patch.py
+++ b/nel/tools/build_gamedata/d1_client_patch.py
@ -35,7 +35,7 @@ if os.path.isfile("log.log"):
 	os.remove("log.log")
 log = open("log.log", "w")
 from scripts import *
-from buildsite_local import *
+from buildsite import *
 from tools import *

 sys.path.append(WorkspaceDirectory)
--- a/nel/tools/build_gamedata/d2_client_install.py
+++ b/nel/tools/build_gamedata/d2_client_install.py
--- a/nel/tools/build_gamedata/executables_dev.bat
+++ b/nel/tools/build_gamedata/executables_dev.bat
@ -1,15 +1,13 @@
 title Ryzom Core: 0_setup.py (EXECUTABLES)
-python 0_setup.py --noconf -ipj common/gamedev common/exedll common/cfg common/data_common
+0_setup.py --noconf -ipj common/gamedev common/exedll common/cfg common/data_common
 title Ryzom Core: 1_export.py (EXECUTABLES)
-python 1_export.py -ipj common/gamedev common/exedll common/cfg common/data_common
+1_export.py -ipj common/gamedev common/exedll common/cfg common/data_common
 title Ryzom Core: 2_build.py (EXECUTABLES)
-python 2_build.py -ipj common/gamedev common/exedll common/cfg common/data_common
+2_build.py -ipj common/gamedev common/exedll common/cfg common/data_common
 title Ryzom Core: 3_install.py (EXECUTABLES)
-python 3_install.py -ipj common/gamedev common/exedll common/cfg common/data_common
+3_install.py -ipj common/gamedev common/exedll common/cfg common/data_common
 title Ryzom Core: b1_client_dev.py
-python b1_client_dev.py
+b1_client_dev.py
 title Ryzom Core: b2_shard_data.py
-python b2_shard_data.py
-title Ryzom Core: b3_shard_dev.py
-python b3_shard_dev.py
+b2_shard_data.py
 title Ryzom Core: Ready
--- a/nel/tools/build_gamedata/export_build_install.py
+++ b/nel/tools/build_gamedata/export_build_install.py
--- a/nel/tools/build_gamedata/fauna_dev.bat
+++ b/nel/tools/build_gamedata/fauna_dev.bat
@ -1,11 +0,0 @@
-title Ryzom Core: 1_export.py (FAUNA)
-python 1_export.py -ipj common/fauna
-title Ryzom Core: 2_build.py (FAUNA)
-python 2_build.py -ipj common/fauna
-title Ryzom Core: 3_install.py (FAUNA)
-python 3_install.py -ipj common/fauna
-title Ryzom Core: b1_client_dev.py (FAUNA)
-python b1_client_dev.py
-title Ryzom Core: b2_shard_data.py (FAUNA)
-python b2_shard_data.py
-title Ryzom Core: Ready (FAUNA)
--- a/nel/tools/build_gamedata/generators/ecosystem_project_template/directories.py
+++ b/nel/tools/build_gamedata/generators/ecosystem_project_template/directories.py
--- a/nel/tools/build_gamedata/generators/ecosystem_project_template/process.py
+++ b/nel/tools/build_gamedata/generators/ecosystem_project_template/process.py
--- a/nel/tools/build_gamedata/generators/generate_all.py
+++ b/nel/tools/build_gamedata/generators/generate_all.py
--- a/nel/tools/build_gamedata/generators/generate_ecosystem_projects.py
+++ b/nel/tools/build_gamedata/generators/generate_ecosystem_projects.py
--- a/nel/tools/build_gamedata/generators/generate_simple_max_exporters.py
+++ b/nel/tools/build_gamedata/generators/generate_simple_max_exporters.py
--- a/nel/tools/build_gamedata/generators/generate_tagged_max_exporters.py
+++ b/nel/tools/build_gamedata/generators/generate_tagged_max_exporters.py
--- a/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.py
+++ b/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.py
--- a/nel/tools/build_gamedata/generators/max_exporter_scripts/skel.py
+++ b/nel/tools/build_gamedata/generators/max_exporter_scripts/skel.py
--- a/nel/tools/build_gamedata/generators/max_exporter_scripts/zone.py
+++ b/nel/tools/build_gamedata/generators/max_exporter_scripts/zone.py
--- a/nel/tools/build_gamedata/generators/simple_max_exporter_template/0_setup.py
+++ b/nel/tools/build_gamedata/generators/simple_max_exporter_template/0_setup.py
--- a/nel/tools/build_gamedata/generators/simple_max_exporter_template/1_export_footer.py
+++ b/nel/tools/build_gamedata/generators/simple_max_exporter_template/1_export_footer.py
--- a/nel/tools/build_gamedata/generators/simple_max_exporter_template/1_export_header.py
+++ b/nel/tools/build_gamedata/generators/simple_max_exporter_template/1_export_header.py
--- a/nel/tools/build_gamedata/generators/simple_max_exporter_template/2_build.py
+++ b/nel/tools/build_gamedata/generators/simple_max_exporter_template/2_build.py
--- a/nel/tools/build_gamedata/generators/simple_max_exporter_template/3_install.py
+++ b/nel/tools/build_gamedata/generators/simple_max_exporter_template/3_install.py
--- a/nel/tools/build_gamedata/generators/tagged_max_exporter_template/0_setup.py
+++ b/nel/tools/build_gamedata/generators/tagged_max_exporter_template/0_setup.py
--- a/nel/tools/build_gamedata/generators/tagged_max_exporter_template/1_export_footer.py
+++ b/nel/tools/build_gamedata/generators/tagged_max_exporter_template/1_export_footer.py
--- a/nel/tools/build_gamedata/generators/tagged_max_exporter_template/1_export_header.py
+++ b/nel/tools/build_gamedata/generators/tagged_max_exporter_template/1_export_header.py
--- a/nel/tools/build_gamedata/generators/tagged_max_exporter_template/2_build.py
+++ b/nel/tools/build_gamedata/generators/tagged_max_exporter_template/2_build.py
--- a/nel/tools/build_gamedata/generators/tagged_max_exporter_template/3_install.py
+++ b/nel/tools/build_gamedata/generators/tagged_max_exporter_template/3_install.py
--- a/nel/tools/build_gamedata/interface_dev.bat
+++ b/nel/tools/build_gamedata/interface_dev.bat
@ -1,9 +1,9 @@
 title Ryzom Core: 1_export.py (INTERFACE)
-python 1_export.py -ipj common/gamedev common/data_common common/exedll common/cfg common/interface common/sfx common/fonts common/outgame
+1_export.py -ipj common/gamedev common/data_common common/exedll common/cfg common/interface common/sfx common/fonts common/outgame
 title Ryzom Core: 2_build.py (INTERFACE)
-python 2_build.py -ipj common/gamedev common/data_common common/exedll common/cfg common/interface common/sfx common/fonts common/outgame
+2_build.py -ipj common/gamedev common/data_common common/exedll common/cfg common/interface common/sfx common/fonts common/outgame
 title Ryzom Core: 3_install.py (INTERFACE)
-python 3_install.py -ipj common/gamedev common/data_common common/exedll common/cfg common/interface common/sfx common/fonts common/outgame
+3_install.py -ipj common/gamedev common/data_common common/exedll common/cfg common/interface common/sfx common/fonts common/outgame
 title Ryzom Core: b1_client_dev.py
-python b1_client_dev.py
+b1_client_dev.py
 title Ryzom Core: Ready
--- a/Show More
+++ b/Show More