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

.editorconfig

@@ -17,3 +17,7 @@ indent_size = 4
 [*.py]
 indent_style = tab
 indent_size = 4
+
+[*.cfg]
+indent_style = tab
+indent_size = 4

.gitignore

@@ -90,6 +90,7 @@ ylwrap
 *.mk
 
 # Visual Studio garbage
+.vscode/
 *.opensdf
 UpgradeLog*.XML
 _UpgradeReport_Files
@@ -127,6 +128,9 @@ aes_state.txt
 # intellij project folder
 .idea/
 
+# VSCode project folder
+.vscode/
+
 # Python cache
 *.pyd
 *.pyc
@@ -151,88 +155,90 @@ Thumbs.db
 .SyncArchive
 
 # build
-code/nel/build/*
-code/nelns/build/*
-code/snowballs/build/*
-code/ryzom/build/*
-code/build/*
-code/build-2010/*
+nel/build/*
+nelns/build/*
+snowballs/build/*
+ryzom/build/*
+build/*
+build-2010/*
 build/*
 install/*
+win-build/
 build_*
-code/nel/tools/build_gamedata/configuration/buildsite.py
+install_*
+nel/tools/build_gamedata/configuration/buildsite.py
 
 # Linux nel compile
-code/nel/build/nel-config
-code/nel/config.status
-code/nel/include/nelconfig.h
-code/nel/include/stamp-h1
-code/nel/libtool
-code/nel/nel-config
-code/nel/samples/3d/cluster_viewer/cluster_viewer
-code/nel/samples/3d/font/font
-code/nel/samples/georges/georges
-code/nel/samples/misc/command/command
-code/nel/samples/misc/configfile/configfile
-code/nel/samples/misc/debug/debug
-code/nel/samples/misc/i18n/i18n
-code/nel/samples/misc/log/log
-code/nel/samples/misc/strings/strings
-code/nel/samples/net/chat/chatclient
-code/nel/samples/net/chat/chatserver
-code/nel/samples/net/login_system/nls_frontend_service
-code/nel/samples/net/login_system/nls_login_client
-code/nel/samples/net/udp/udp_bench_client
-code/nel/samples/net/udp/udp_bench_service
-code/nel/samples/pacs/pacs_sample
-code/nel/tools/3d/build_coarse_mesh/build_coarse_mesh
-code/nel/tools/3d/build_far_bank/build_far_bank
-code/nel/tools/3d/build_smallbank/build_smallbank
-code/nel/tools/3d/ig_lighter/ig_lighter
-code/nel/tools/3d/zone_dependencies/zone_dependencies
-code/nel/tools/3d/zone_ig_lighter/zone_ig_lighter
-code/nel/tools/3d/zone_lighter/zone_lighter
-code/nel/tools/3d/zone_welder/zone_welder
-code/nel/tools/misc/bnp_make/bnp_make
-code/nel/tools/misc/disp_sheet_id/disp_sheet_id
-code/nel/tools/misc/make_sheet_id/make_sheet_id
-code/nel/tools/misc/xml_packer/xml_packer
-code/nel/tools/pacs/build_ig_boxes/build_ig_boxes
-code/nel/tools/pacs/build_indoor_rbank/build_indoor_rbank
-code/nel/tools/pacs/build_rbank/build_rbank
-code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/skills.skill_tree
-code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/xptable.xp_table
-code/ryzom/tools/server/sql/ryzom_admin_default_data.sql
+nel/build/nel-config
+nel/config.status
+nel/include/nelconfig.h
+nel/include/stamp-h1
+nel/libtool
+nel/nel-config
+nel/samples/3d/cluster_viewer/cluster_viewer
+nel/samples/3d/font/font
+nel/samples/georges/georges
+nel/samples/misc/command/command
+nel/samples/misc/configfile/configfile
+nel/samples/misc/debug/debug
+nel/samples/misc/i18n/i18n
+nel/samples/misc/log/log
+nel/samples/misc/strings/strings
+nel/samples/net/chat/chatclient
+nel/samples/net/chat/chatserver
+nel/samples/net/login_system/nls_frontend_service
+nel/samples/net/login_system/nls_login_client
+nel/samples/net/udp/udp_bench_client
+nel/samples/net/udp/udp_bench_service
+nel/samples/pacs/pacs_sample
+nel/tools/3d/build_coarse_mesh/build_coarse_mesh
+nel/tools/3d/build_far_bank/build_far_bank
+nel/tools/3d/build_smallbank/build_smallbank
+nel/tools/3d/ig_lighter/ig_lighter
+nel/tools/3d/zone_dependencies/zone_dependencies
+nel/tools/3d/zone_ig_lighter/zone_ig_lighter
+nel/tools/3d/zone_lighter/zone_lighter
+nel/tools/3d/zone_welder/zone_welder
+nel/tools/misc/bnp_make/bnp_make
+nel/tools/misc/disp_sheet_id/disp_sheet_id
+nel/tools/misc/make_sheet_id/make_sheet_id
+nel/tools/misc/xml_packer/xml_packer
+nel/tools/pacs/build_ig_boxes/build_ig_boxes
+nel/tools/pacs/build_indoor_rbank/build_indoor_rbank
+nel/tools/pacs/build_rbank/build_rbank
+ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/skills.skill_tree
+ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/xptable.xp_table
+ryzom/tools/server/sql/ryzom_admin_default_data.sql
 
 
 # Linux server compile
-code/ryzom/server/src/entities_game_service/entities_game_service
-code/ryzom/server/src/frontend_service/frontend_service
-code/ryzom/server/src/gpm_service/gpm_service
-code/ryzom/server/src/input_output_service/input_output_service
-code/ryzom/server/src/mirror_service/mirror_service
-code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service
-code/ryzom/server/src/ryzom_naming_service/ryzom_naming_service
-code/ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service
-code/ryzom/server/src/tick_service/tick_service
+ryzom/server/src/entities_game_service/entities_game_service
+ryzom/server/src/frontend_service/frontend_service
+ryzom/server/src/gpm_service/gpm_service
+ryzom/server/src/input_output_service/input_output_service
+ryzom/server/src/mirror_service/mirror_service
+ryzom/server/src/ryzom_admin_service/ryzom_admin_service
+ryzom/server/src/ryzom_naming_service/ryzom_naming_service
+ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service
+ryzom/server/src/tick_service/tick_service
 
 # WebTT temp dir
-code/ryzom/tools/server/www/webtt/app/tmp
+ryzom/tools/server/www/webtt/app/tmp
 
 # AMS ignore
-code/web/public_php/ams/is_installed
-code/web/docs/ams/html
-code/web/public_php/ams/templates_c
-code/ryzom/tools/server/ryzom_ams/drupal
-code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/autoload
-code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/configs
-code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/cron
-code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/img
-code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/plugins
-code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/smarty
-code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/translations
-code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/libinclude.php
-code/ryzom/tools/server/ryzom_ams/old
+web/public_php/ams/is_installed
+web/docs/ams/html
+web/public_php/ams/templates_c
+ryzom/tools/server/ryzom_ams/drupal
+ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/autoload
+ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/configs
+ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/cron
+ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/img
+ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/plugins
+ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/smarty
+ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/translations
+ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/libinclude.php
+ryzom/tools/server/ryzom_ams/old
 
 
 
@@ -242,24 +248,27 @@ external_stlport
 nel_tools*
 ryzom_tools*
 
+#personal projects
+personal/
+
 # Dumps
 *.dmp
 
-code/nel/tools/build_gamedata/processes/ai_wmap/ai_build_wmap.cfg
-code/nel/tools/build_gamedata/processes/sheets/sheets_packer.cfg
-code/nel/tools/build_gamedata/processes/rbank/build_rbank.cfg
-code/nel/tools/build_gamedata/processes/zone/debug_zone_dependencies.cfg
-code/web/public_php/config.php
-code/web/public_php/is_installed
-code/web/public_php/ams/files
-code/web/public_php/db_version_lib
-code/web/public_php/db_version_shard
-code/web/public_php/db_version_tool
-code/web/public_php/db_version_web
-code/web/public_php/role_service
-code/web/public_php/role_support
-code/web/public_php/role_domain
-code/web/public_php/db_version_ring
-code/web/public_php/config_user.php
-code/nel/tools/build_gamedata/processes/pz/build_world_packed_col.cfg
-code/nel/tools/build_gamedata/processes/cartographer/island_screenshots.cfg
+nel/tools/build_gamedata/processes/ai_wmap/ai_build_wmap.cfg
+nel/tools/build_gamedata/processes/sheets/sheets_packer.cfg
+nel/tools/build_gamedata/processes/rbank/build_rbank.cfg
+nel/tools/build_gamedata/processes/zone/debug_zone_dependencies.cfg
+web/public_php/config.php
+web/public_php/is_installed
+web/public_php/ams/files
+web/public_php/db_version_lib
+web/public_php/db_version_shard
+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_domain
+web/public_php/db_version_ring
+web/public_php/config_user.php
+nel/tools/build_gamedata/processes/pz/build_world_packed_col.cfg
+nel/tools/build_gamedata/processes/cartographer/island_screenshots.cfg

.hgignore

@@ -152,87 +152,87 @@ Thumbs.db
 .SyncArchive
 
 # build
-code/nel/build/*
-code/nelns/build/*
-code/snowballs/build/*
-code/ryzom/build/*
-code/build/*
-code/build-2010/*
+nel/build/*
+nelns/build/*
+snowballs/build/*
+ryzom/build/*
+build/*
+build-2010/*
 build/*
 install/*
 build_vc*
-code/nel/tools/build_gamedata/configuration/buildsite.py
+nel/tools/build_gamedata/configuration/buildsite.py
 
 # Linux nel compile
-code/nel/build/nel-config
-code/nel/config.status
-code/nel/include/nelconfig.h
-code/nel/include/stamp-h1
-code/nel/libtool
-code/nel/nel-config
-code/nel/samples/3d/cluster_viewer/cluster_viewer
-code/nel/samples/3d/font/font
-code/nel/samples/georges/georges
-code/nel/samples/misc/command/command
-code/nel/samples/misc/configfile/configfile
-code/nel/samples/misc/debug/debug
-code/nel/samples/misc/i18n/i18n
-code/nel/samples/misc/log/log
-code/nel/samples/misc/strings/strings
-code/nel/samples/net/chat/chatclient
-code/nel/samples/net/chat/chatserver
-code/nel/samples/net/login_system/nls_frontend_service
-code/nel/samples/net/login_system/nls_login_client
-code/nel/samples/net/udp/udp_bench_client
-code/nel/samples/net/udp/udp_bench_service
-code/nel/samples/pacs/pacs_sample
-code/nel/tools/3d/build_coarse_mesh/build_coarse_mesh
-code/nel/tools/3d/build_far_bank/build_far_bank
-code/nel/tools/3d/build_smallbank/build_smallbank
-code/nel/tools/3d/ig_lighter/ig_lighter
-code/nel/tools/3d/zone_dependencies/zone_dependencies
-code/nel/tools/3d/zone_ig_lighter/zone_ig_lighter
-code/nel/tools/3d/zone_lighter/zone_lighter
-code/nel/tools/3d/zone_welder/zone_welder
-code/nel/tools/misc/bnp_make/bnp_make
-code/nel/tools/misc/disp_sheet_id/disp_sheet_id
-code/nel/tools/misc/make_sheet_id/make_sheet_id
-code/nel/tools/misc/xml_packer/xml_packer
-code/nel/tools/pacs/build_ig_boxes/build_ig_boxes
-code/nel/tools/pacs/build_indoor_rbank/build_indoor_rbank
-code/nel/tools/pacs/build_rbank/build_rbank
-code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/skills.skill_tree
-code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/xptable.xp_table
-code/ryzom/tools/server/sql/ryzom_admin_default_data.sql
+nel/build/nel-config
+nel/config.status
+nel/include/nelconfig.h
+nel/include/stamp-h1
+nel/libtool
+nel/nel-config
+nel/samples/3d/cluster_viewer/cluster_viewer
+nel/samples/3d/font/font
+nel/samples/georges/georges
+nel/samples/misc/command/command
+nel/samples/misc/configfile/configfile
+nel/samples/misc/debug/debug
+nel/samples/misc/i18n/i18n
+nel/samples/misc/log/log
+nel/samples/misc/strings/strings
+nel/samples/net/chat/chatclient
+nel/samples/net/chat/chatserver
+nel/samples/net/login_system/nls_frontend_service
+nel/samples/net/login_system/nls_login_client
+nel/samples/net/udp/udp_bench_client
+nel/samples/net/udp/udp_bench_service
+nel/samples/pacs/pacs_sample
+nel/tools/3d/build_coarse_mesh/build_coarse_mesh
+nel/tools/3d/build_far_bank/build_far_bank
+nel/tools/3d/build_smallbank/build_smallbank
+nel/tools/3d/ig_lighter/ig_lighter
+nel/tools/3d/zone_dependencies/zone_dependencies
+nel/tools/3d/zone_ig_lighter/zone_ig_lighter
+nel/tools/3d/zone_lighter/zone_lighter
+nel/tools/3d/zone_welder/zone_welder
+nel/tools/misc/bnp_make/bnp_make
+nel/tools/misc/disp_sheet_id/disp_sheet_id
+nel/tools/misc/make_sheet_id/make_sheet_id
+nel/tools/misc/xml_packer/xml_packer
+nel/tools/pacs/build_ig_boxes/build_ig_boxes
+nel/tools/pacs/build_indoor_rbank/build_indoor_rbank
+nel/tools/pacs/build_rbank/build_rbank
+ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/skills.skill_tree
+ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/xptable.xp_table
+ryzom/tools/server/sql/ryzom_admin_default_data.sql
 
 
 # Linux server compile
-code/ryzom/server/src/entities_game_service/entities_game_service
-code/ryzom/server/src/frontend_service/frontend_service
-code/ryzom/server/src/gpm_service/gpm_service
-code/ryzom/server/src/input_output_service/input_output_service
-code/ryzom/server/src/mirror_service/mirror_service
-code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service
-code/ryzom/server/src/ryzom_naming_service/ryzom_naming_service
-code/ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service
-code/ryzom/server/src/tick_service/tick_service
+ryzom/server/src/entities_game_service/entities_game_service
+ryzom/server/src/frontend_service/frontend_service
+ryzom/server/src/gpm_service/gpm_service
+ryzom/server/src/input_output_service/input_output_service
+ryzom/server/src/mirror_service/mirror_service
+ryzom/server/src/ryzom_admin_service/ryzom_admin_service
+ryzom/server/src/ryzom_naming_service/ryzom_naming_service
+ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service
+ryzom/server/src/tick_service/tick_service
 # WebTT temp dir
-code/ryzom/tools/server/www/webtt/app/tmp
+ryzom/tools/server/www/webtt/app/tmp
 
 # AMS ignore
-code/web/public_php/ams/is_installed
-code/web/docs/ams/html
-code/web/public_php/ams/templates_c
-code/ryzom/tools/server/ryzom_ams/drupal
-code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/autoload
-code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/configs
-code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/cron
-code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/img
-code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/plugins
-code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/smarty
-code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/translations
-code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/libinclude.php
-code/ryzom/tools/server/ryzom_ams/old
+web/public_php/ams/is_installed
+web/docs/ams/html
+web/public_php/ams/templates_c
+ryzom/tools/server/ryzom_ams/drupal
+ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/autoload
+ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/configs
+ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/cron
+ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/img
+ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/plugins
+ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/smarty
+ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/translations
+ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/libinclude.php
+ryzom/tools/server/ryzom_ams/old
 
 
 
@@ -248,21 +248,21 @@ personal/
 #Dumps
 *.dmp
 
-code/nel/tools/build_gamedata/processes/ai_wmap/ai_build_wmap.cfg
-code/nel/tools/build_gamedata/processes/sheets/sheets_packer.cfg
-code/nel/tools/build_gamedata/processes/rbank/build_rbank.cfg
-code/nel/tools/build_gamedata/processes/zone/debug_zone_dependencies.cfg
-code/web/public_php/config.php
-code/web/public_php/is_installed
-code/web/public_php/ams/files
-code/web/public_php/db_version_lib
-code/web/public_php/db_version_shard
-code/web/public_php/db_version_tool
-code/web/public_php/db_version_web
-code/web/public_php/role_service
-code/web/public_php/role_support
-code/web/public_php/role_domain
-code/web/public_php/db_version_ring
-code/web/public_php/config_user.php
-code/nel/tools/build_gamedata/processes/pz/build_world_packed_col.cfg
-code/nel/tools/build_gamedata/processes/cartographer/island_screenshots.cfg
+nel/tools/build_gamedata/processes/ai_wmap/ai_build_wmap.cfg
+nel/tools/build_gamedata/processes/sheets/sheets_packer.cfg
+nel/tools/build_gamedata/processes/rbank/build_rbank.cfg
+nel/tools/build_gamedata/processes/zone/debug_zone_dependencies.cfg
+web/public_php/config.php
+web/public_php/is_installed
+web/public_php/ams/files
+web/public_php/db_version_lib
+web/public_php/db_version_shard
+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_domain
+web/public_php/db_version_ring
+web/public_php/config_user.php
+nel/tools/build_gamedata/processes/pz/build_world_packed_col.cfg
+nel/tools/build_gamedata/processes/cartographer/island_screenshots.cfg

.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

.travis.yml

@@ -30,7 +30,7 @@ addons:
 before_script:
     - mkdir build
     - cmake --version
-    - cmake -Hcode -Bbuild $CMAKE_CONFIGURE_OPTIONS
+    - cmake -H. -Bbuild $CMAKE_CONFIGURE_OPTIONS
     - cat build/CMakeCache.txt
 
 script:

CMakeLists.txt

@@ -34,11 +34,37 @@ IF(COMMAND cmake_policy)
   ENDIF()
 ENDIF()
 
+
+#-----------------------------------------------------------------------------
+# Downloads and install Hunger into HUNTER_ROOT directory.
+OPTION(HUNTER_ENABLED "Enable Hunter package manager" OFF)
+IF(HUNTER_ENABLED)
+  INCLUDE("CMakeModules/HunterGate.cmake")
+  HunterGate(
+    URL "https://github.com/cpp-pm/hunter/archive/v0.23.321.tar.gz"
+    SHA1 "5e53cbb0429037ea8e2592bfd92704b8ff3ab492"
+    FILEPATH "${CMAKE_CURRENT_LIST_DIR}/CMakeModules/HunterConfig.cmake"
+  )
+
+  # default options for hunterized build
+  SET(WITH_STATIC         ON CACHE BOOL "static" FORCE)
+  SET(WITH_STATIC_DRIVERS ON CACHE BOOL "static drivers" FORCE)
+  SET(WITH_STATIC_CURL    ON CACHE BOOL "static curl" FORCE)
+  SET(WITH_STATIC_LIBXML2 ON CACHE BOOL "static libxml2" FORCE)
+  SET(WITH_STATIC_EXTERNAL ON CACHE BOOL "static external" FORCE)
+  SET(WITH_EXTERNAL       OFF CACHE BOOL "external libs" FORCE)
+ENDIF()
+
+
+#-----------------------------------------------------------------------------
+
 INCLUDE(nel)
 INCLUDE(ConfigureChecks)
 INCLUDE(CheckDepends)
 INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL)
 
+MESSAGE("EXTERNAL ${WITH_EXTERNAL}")
+
 # Force out of source builds.
 CHECK_OUT_OF_SOURCE()
 
@@ -54,13 +80,13 @@ ENDIF()
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(RyzomCore CXX C)
 SET(NL_VERSION_MAJOR 1)
-SET(NL_VERSION_MINOR 0)
-SET(NL_VERSION_PATCH 2)
+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 5)
+SET(RYZOM_VERSION_MINOR 6)
 SET(RYZOM_VERSION_PATCH 0)
 
 #-----------------------------------------------------------------------------
@@ -102,6 +128,7 @@ SET(RYZOM_CLIENT_CREATE_ACCOUNT_URL  "https://open.ryzom.dev/ams/" CACHE STRING
 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_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")
@@ -110,10 +137,11 @@ SET(RYZOM_WEBIG_TRUSTED_DOMAIN       "open.ryzom.dev" CACHE STRING "Ryzom Client
 # 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_WEBIG_MAIN_URL             "https://app.ryzom.com/")
   SET(RYZOM_WEBIG_TRUSTED_DOMAIN       "app.ryzom.com")
@@ -132,6 +160,28 @@ IF(WIN32)
   ENDIF()
 ENDIF()
 
+IF(HUNTER_ENABLED)
+  ## TODO: hack for freetype hunter package
+  SET(ON 1)
+  ##
+  HUNTER_ADD_PACKAGE(ZLIB)
+
+  FIND_PACKAGE(ZLIB CONFIG REQUIRED)
+  SET(ZLIB_LIBRARY ZLIB::zlib)
+
+  HUNTER_ADD_PACKAGE(libxml2)
+  FIND_PACKAGE(libxml2 CONFIG REQUIRED)
+  SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} libxml2::libxml2)
+
+  HUNTER_ADD_PACKAGE(OpenSSL)
+  FIND_PACKAGE(OpenSSL REQUIRED)
+  # TODO: is OpenSSL::Crypto only needed for WIN32?
+  SET(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
+
+  # for precompiled headers, not needed if using TARGET_PRECOMPILE_HEADERS() from cmake 3.16+
+  SET(ZLIB_INCLUDE_DIR ZLIB_ROOT/include)
+  SET(LIBXML2_INCLUDE_DIR ${LIBXML2_ROOT}/include/libxml2)
+ELSE()
 FIND_PACKAGE(ZLIB REQUIRED)
 FIND_PACKAGE(LibXml2 REQUIRED)
 FIND_PACKAGE(PNG REQUIRED)
@@ -142,6 +192,7 @@ FIND_PACKAGE(Jpeg)
 IF(WIN32)
   SET(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} Crypt32.lib)
 ENDIF()
+ENDIF() #hunter
 
 IF(WITH_LIBOVR)
   FIND_PACKAGE(LibOVR)
@@ -175,6 +226,20 @@ IF(WITH_STATIC)
     IF(LIBLZMA_LIBRARIES)
       SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${LIBLZMA_LIBRARIES})
     ENDIF()
+
+    # under Linux and OS X, recent libxml2 versions are linked against libicu
+    # FIND_PACKAGE(Icu)
+    FIND_LIBRARY(ICU_LIBRARY icuuc)
+    IF(ICU_LIBRARY)
+       FIND_LIBRARY(ICU_DATA_LIBRARY icudata)
+       IF(ICU_LIBRARY)
+         MESSAGE(STATUS "ICU UC was found: ${ICU_LIBRARY}")
+       ELSE()
+         MESSAGE(STATUS "ICU UC was NOT found")
+       ENDIF()
+       SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${ICU_DATA_LIBRARY} ${ICU_LIBRARY})
+    ENDIF()
+
   ENDIF()
 ENDIF()
 
@@ -221,6 +286,7 @@ ENDIF()
 
 INCLUDE(FindHelpers)
 
+#TODO: hunter qt package
 IF(WITH_QT5)
   FIND_QT5()
 ENDIF()
@@ -232,6 +298,7 @@ IF(WITH_QT)
   FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtXml QtOpenGL REQUIRED)
 ENDIF()
 
+#TODO: hunter assimp package
 IF(WITH_ASSIMP)
   FIND_PACKAGE(assimp REQUIRED)
 ENDIF()
@@ -241,9 +308,20 @@ IF(WITH_NEL)
     FIND_PACKAGE(CppTest)
   ENDIF()
 
-  IF(WITH_GUI)
-    FIND_PACKAGE(Luabind REQUIRED)
-  ENDIF()
+  IF(HUNTER_ENABLED)
+    IF(WITH_GUI)
+      HUNTER_ADD_PACKAGE(luabind)
+      FIND_PACKAGE(Luabind REQUIRED)
+    ENDIF()
+
+    HUNTER_ADD_PACKAGE(CURL)
+    FIND_PACKAGE(CURL CONFIG REQUIRED)
+    # TODO: for nelgui
+    SET(CURL_LIBRARIES CURL::libcurl libxml2::libxml2)
+  ELSE()
+    IF(WITH_GUI)
+      FIND_PACKAGE(Luabind REQUIRED)
+    ENDIF()
 
     FIND_PACKAGE(CURL REQUIRED)
 
@@ -294,6 +372,7 @@ IF(WITH_NEL)
         ENDIF()
       ENDIF()
     ENDIF()
+  ENDIF() #hunter
 
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include)
   ADD_SUBDIRECTORY(nel)

CMakeModules/FindLuabind.cmake

@@ -69,7 +69,13 @@ MACRO(FIND_CORRECT_LUA_VERSION)
     ENDIF()
   ELSE()
     # TODO: find a way to detect Lua version
-    IF(WITH_LUA53)
+    IF(HUNTER_ENABLED)
+      HUNTER_ADD_PACKAGE(Lua)
+      FIND_PACKAGE(Lua CONFIG REQUIRED)
+      SET(LUA_LIBRARIES Lua::lua_lib)
+    ELSEIF(WITH_LUA54)
+      FIND_PACKAGE(Lua54 REQUIRED)
+    ELSEIF(WITH_LUA53)
       FIND_PACKAGE(Lua53 REQUIRED)
     ELSEIF(WITH_LUA52)
       FIND_PACKAGE(Lua52 REQUIRED)
@@ -89,6 +95,21 @@ ENDIF()
 SET(LIBRARY_NAME_RELEASE)
 SET(LIBRARY_NAME_DEBUG)
 
+IF(WITH_LUA54)
+  IF(WITH_STLPORT)
+    LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport_lua54)
+    LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlport_lua54d)
+  ENDIF()
+
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind_lua54)
+  LIST(APPEND LIBRARY_NAME_DEBUG luabind_lua54d)
+ENDIF()
+
+IF(HUNTER_ENABLED)
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind luabind09)
+  LIST(APPEND LIBRARY_NAME_DEBUG luabindd luabind09-d)
+ENDIF()
+
 IF(WITH_LUA53)
   IF(WITH_STLPORT)
     LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport_lua53)

CMakeModules/FindWindowsSDK.cmake

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

CMakeModules/HunterConfig.cmake

@@ -0,0 +1,8 @@
+# This file is parsed by HunterGate command
+
+hunter_config(luabind
+  VERSION 0.9.1
+  URL  "https://github.com/nimetu/luabind/tarball/2fa4606"
+  SHA1 "3b4646bab9f0b2362d7b8d71d78e40deaf3cc747"
+  )
+

CMakeModules/HunterGate.cmake

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

CMakeModules/nel.cmake

@@ -121,6 +121,22 @@ MACRO(NL_ADD_RUNTIME_FLAGS name)
 ENDMACRO(NL_ADD_RUNTIME_FLAGS)
 
 MACRO(NL_ADD_STATIC_VID_DRIVERS name)
+IF(HUNTER_ENABLED)
+  IF(WIN32)
+    SET(drv_suffix "_win")
+  ELSE()
+    SET(drv_suffix "")
+  ENDIF()
+  IF(WIN32 AND WITH_DRIVER_DIRECT3D)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_direct3d${drv_suffix})
+  ENDIF()
+  IF(WITH_DRIVER_OPENGL)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_opengl${drv_suffix})
+  ENDIF()
+  IF(WITH_DRIVER_OPENGLES)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_opengles${drv_suffix})
+  ENDIF()
+ELSE()
   IF(WITH_STATIC_DRIVERS)
     IF(WIN32)
       IF(WITH_DRIVER_DIRECT3D)
@@ -144,9 +160,29 @@ MACRO(NL_ADD_STATIC_VID_DRIVERS name)
       ENDIF()
     ENDIF()
   ENDIF()
+ENDIF()#hunter
 ENDMACRO(NL_ADD_STATIC_VID_DRIVERS)
 
 MACRO(NL_ADD_STATIC_SND_DRIVERS name)
+IF(HUNTER_ENABLED)
+  IF(WIN32)
+    SET(drv_suffix "_win")
+  ELSE()
+    SET(drv_suffix "")
+  ENDIF()
+  IF(WIN32 AND WITH_DRIVER_DSOUND)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_dsound${drv_suffix})
+  ENDIF()
+  IF(WIN32 AND WITH_DRIVER_XAUDIO2)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_xaudio2${drv_suffix})
+  ENDIF()
+  IF(WITH_DRIVER_FMOD)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_fmod${drv_suffix})
+  ENDIF()
+  IF(WITH_DRIVER_OPENAL)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_openal${drv_suffix})
+  ENDIF()
+ELSE()
   IF(WITH_STATIC_DRIVERS)
     IF(WIN32)
       IF(WITH_DRIVER_DSOUND)
@@ -175,6 +211,7 @@ MACRO(NL_ADD_STATIC_SND_DRIVERS name)
     ENDIF()
 
   ENDIF()
+ENDIF() #hunter
 ENDMACRO(NL_ADD_STATIC_SND_DRIVERS)
 
 ###
@@ -249,6 +286,8 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
   OPTION(WITH_ASSIMP              "Use assimp exporter"                           OFF)
   OPTION(WITH_LIBGSF              "Use libgsf for max file library"               OFF)
 
+  OPTION(WITH_FFMPEG              "Use ffmpeg for audio decoder"                  OFF)
+
   ###
   # GUI toolkits
   ###
@@ -282,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)
@@ -1193,7 +1232,11 @@ MACRO(SETUP_EXTERNAL)
   ENDIF()
 
   IF(WIN32)
-    FIND_PACKAGE(External REQUIRED)
+    IF (HUNTER_ENABLED)
+      FIND_PACKAGE(External QUIET)
+    ELSE()
+      FIND_PACKAGE(External REQUIRED)
+    ENDIF()
 
     # If using custom boost, we need to define the right variables used by official boost CMake module
     IF(DEFINED BOOST_DIR)
@@ -1236,7 +1279,7 @@ MACRO(SETUP_EXTERNAL)
 
   IF(WIN32)
     # Must include DXSDK before WINSDK
-    FIND_PACKAGE(DirectXSDK REQUIRED)
+    FIND_PACKAGE(DirectXSDK)
     # IF(DXSDK_INCLUDE_DIR)
     #   INCLUDE_DIRECTORIES(${DXSDK_INCLUDE_DIR})
     # ENDIF()
@@ -1245,5 +1288,8 @@ MACRO(SETUP_EXTERNAL)
   IF(MSVC)
     FIND_PACKAGE(MSVC REQUIRED)
     FIND_PACKAGE(WindowsSDK REQUIRED)
+    IF(NOT DXSDK_DIR)
+      MESSAGE(FATAL_ERROR "DirectX SDK or DirectX files from Windows SDK not found.")
+    ENDIF()
   ENDIF()
 ENDMACRO()

azure-pipelines.yml

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

code/.editorconfig

@@ -1,23 +0,0 @@
-; Top-most EditorConfig file
-root = true
-
-; 4-column tab indentation
-[*.cpp]
-indent_style = tab
-indent_size = 4
-
-[*.c]
-indent_style = tab
-indent_size = 4
-
-[*.h]
-indent_style = tab
-indent_size = 4
-
-[*.py]
-indent_style = tab
-indent_size = 4
-
-[*.config]
-indent_style = space
-indent_size = 2

code/nel/include/nel/gui/css_border_renderer.h

@@ -1,94 +0,0 @@
-// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-
-#ifndef NL_CSS_BORDER_RENDERER_H
-#define NL_CSS_BORDER_RENDERER_H
-
-#include "nel/misc/types_nl.h"
-#include "nel/misc/rgba.h"
-#include "nel/misc/geom_ext.h"
-#include "nel/gui/css_types.h"
-
-namespace NLGUI
-{
-	/**
-	 * \brief Border renderer for GUI classes
-	 * \date 2019-09-03 10:50 GMT
-	 * \author Meelis Mägi (Nimetu)
-	 */
-	class CSSBorderRenderer
-	{
-	private:
-		// parent element screen coordinates
-		sint32 _XReal, _YReal;
-		sint32 _WReal, _HReal;
-
-		NLMISC::CQuadUV _QuadT;
-		NLMISC::CQuadUV _QuadR;
-		NLMISC::CQuadUV _QuadB;
-		NLMISC::CQuadUV _QuadL;
-
-		uint8 _RenderLayer;
-		bool _ModulateGlobalColor;
-
-		// if true, then updateCoords() is called from draw()
-		bool _Dirty;
-		// if true, then at least one border is set
-		bool _Border;
-		bool _BorderTop, _BorderRight, _BorderBottom, _BorderLeft;
-
-	public:
-		uint32        TopWidth, RightWidth, BottomWidth, LeftWidth;
-		NLMISC::CRGBA TopColor, RightColor, BottomColor, LeftColor;
-		CSSLineStyle  TopStyle, RightStyle, BottomStyle, LeftStyle;
-
-		// alpha value from parent
-		uint8 CurrentAlpha;
-
-	public:
-		CSSBorderRenderer();
-
-		void setRenderLayer(sint layer);
-		void setModulateGlobalColor(bool m);
-
-		void setRect(sint32 x, sint32 y, sint32 w, sint32 h);
-
-		void setWidth(uint32 top, uint32 right, uint32 bottom, uint32 left);
-		void setStyle(CSSLineStyle top, CSSLineStyle right, CSSLineStyle bottom, CSSLineStyle left);
-		void setColor(const NLMISC::CRGBA &top, const NLMISC::CRGBA &right, const NLMISC::CRGBA &bottom, const NLMISC::CRGBA &left);
-
-		void updateCoords();
-		void invalidateCoords() { _Dirty = _Border = true; }
-		void invalidateContent() { _Dirty = _Border = true; };
-
-		uint32 getTopWidth() const;
-		uint32 getRightWidth() const;
-		uint32 getBottomWidth() const;
-		uint32 getLeftWidth() const;
-
-		uint32 getLeftRightWidth() const;
-		uint32 getTopBottomWidth() const;
-
-		void draw();
-	}; // CSSBorderRenderer
-
-}//namespace
-
-#endif // NL_CSS_BORDER_RENDERER_H
-
-

code/nel/include/nel/misc/ucstring.h

@@ -1,393 +0,0 @@
-// 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) 2015  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
-// 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/>.
-
-#ifndef NL_UCSTRING_H
-#define NL_UCSTRING_H
-
-#include "types_nl.h"
-#include "debug.h"
-
-#include <string>
-
-/**
- * \typedef ucstring
- * An unicode string class (16 bits per character).
- * Add features to convert and assign \c ucstring to \c string and \c string to \c ucstring.
- */
-typedef std::basic_string<ucchar> ucstringbase;
-
-class ucstring : public ucstringbase
-{
-public:
-
-	ucstring () {}
-
-	ucstring (const ucstringbase &str) : ucstringbase (str) {}
-
-	ucstring (const std::string &str) : ucstringbase ()
-	{
-		rawCopy(str);
-	}
-
-	~ucstring () {}
-
-	ucstring &operator= (ucchar c)
-	{
-		resize (1);
-		operator[](0) = c;
-		return *this;
-	}
-
-	ucstring &operator= (const char *str)
-	{
-		resize (strlen (str));
-		for (uint i = 0; i < strlen (str); i++)
-		{
-			operator[](i) = uint8(str[i]);
-		}
-		return *this;
-	}
-
-	ucstring &operator= (const std::string &str)
-	{
-		resize (str.size ());
-		for (uint i = 0; i < str.size (); i++)
-		{
-			operator[](i) = uint8(str[i]);
-		}
-		return *this;
-	}
-
-	ucstring &operator= (const ucstringbase &str)
-	{
-		ucstringbase::operator =(str);
-		return *this;
-	}
-
-	ucstring& operator= (const ucchar *str)
-	{
-		ucstringbase::operator =(str);
-		return *this;
-	}
-	ucstring &operator+= (ucchar c)
-	{
-		resize (size() + 1);
-		operator[](size()-1) = c;
-		return *this;
-	}
-
-	ucstring &operator+= (const char *str)
-	{
-		size_t s = size();
-		resize (s + strlen(str));
-		for (uint i = 0; i < strlen(str); i++)
-		{
-			operator[](s+i) = uint8(str[i]);
-		}
-		return *this;
-	}
-
-	ucstring &operator+= (const std::string &str)
-	{
-		size_t s = size();
-		resize (s + str.size());
-		for (uint i = 0; i < str.size(); i++)
-		{
-			operator[](s+i) = uint8(str[i]);
-		}
-		return *this;
-	}
-
-	ucstring &operator+= (const ucstringbase &str)
-	{
-		ucstringbase::operator +=(str);
-		return *this;
-	}
-
-	const ucchar *c_str() const
-	{
-		const ucchar *tmp = ucstringbase::c_str();
-		const_cast<ucchar*>(tmp)[size()] = 0;
-		return tmp;
-	}
-
-	/// Converts the controlled ucstring to a string str
-	void toString (std::string &str) const
-	{
-		str.resize (size ());
-		for (uint i = 0; i < str.size (); i++)
-		{
-			if (operator[](i) > 255)
-				str[i] = '?';
-			else
-				str[i] = (char) operator[](i);
-		}
-	}
-
-	/// Converts the controlled ucstring and returns the resulting string
-	std::string toString () const
-	{
-		std::string str;
-		toString(str);
-		return str;
-	}
-
-	/// Convert this ucstring (16bits char) into a utf8 string
-	std::string toUtf8() const
-	{
-		std::string	res;
-		ucstring::const_iterator first(begin()), last(end());
-		for (; first != last; ++first)
-		{
-			//ucchar	c = *first;
-			uint nbLoop = 0;
-			if (*first < 0x80)
-				res += char(*first);
-			else if (*first < 0x800)
-			{
-				ucchar c = *first;
-				c = c >> 6;
-				c = c & 0x1F;
-				res += char(c) | 0xC0;
-				nbLoop = 1;
-			}
-			else /*if (*first < 0x10000)*/
-			{
-				ucchar c = *first;
-				c = c >> 12;
-				c = c & 0x0F;
-				res += char(c) | 0xE0;
-				nbLoop = 2;
-			}
-
-			for (uint i=0; i<nbLoop; ++i)
-			{
-				ucchar	c = *first;
-				c = c >> ((nbLoop - i - 1) * 6);
-				c = c & 0x3F;
-				res += char(c) | 0x80;
-			}
-		}
-		return res;
-	}
-
-	ucstring substr(size_type pos = 0, size_type n = npos) const
-	{
-		return ucstringbase::substr(pos, n);
-	}
-
-	// for luabind (can't bind to 'substr' else ...)
-	ucstring luabind_substr(size_type pos = 0, size_type n = npos) const
-	{
-		return ucstringbase::substr(pos, n);
-	}
-
-	/// Convert the utf8 string into this ucstring (16 bits char)
-	void fromUtf8(const std::string &stringUtf8)
-	{
-		// clear the string
-		erase();
-
-		uint8 c;
-		ucchar code;
-		sint iterations = 0;
-
-		std::string::const_iterator first(stringUtf8.begin()), last(stringUtf8.end());
-		for (; first != last; )
-		{
-			c = *first++;
-			code = c;
-
-			if ((code & 0xFE) == 0xFC)
-			{
-				code &= 0x01;
-				iterations = 5;
-			}
-			else if ((code & 0xFC) == 0xF8)
-			{
-				code &= 0x03;
-				iterations = 4;
-			}
-			else if ((code & 0xF8) == 0xF0)
-			{
-				code &= 0x07;
-				iterations = 3;
-			}
-			else if ((code & 0xF0) == 0xE0)
-			{
-				code &= 0x0F;
-				iterations = 2;
-			}
-			else if ((code & 0xE0) == 0xC0)
-			{
-				code &= 0x1F;
-				iterations = 1;
-			}
-			else if ((code & 0x80) == 0x80)
-			{
-				// If it's not a valid UTF8 string, just copy the line without utf8 conversion
-				rawCopy(stringUtf8);
-				return;
-			}
-			else
-			{
-				push_back(code);
-				iterations = 0;
-			}
-
-			if (iterations)
-			{
-				for (sint i = 0; i < iterations; i++)
-				{
-					if (first == last)
-					{
-						// If it's not a valid UTF8 string, just copy the line without utf8 conversion
-						rawCopy(stringUtf8);
-						return;
-					}
-
-					uint8 ch;
-					ch = *first ++;
-
-					if ((ch & 0xC0) != 0x80)
-					{
-						// If it's not a valid UTF8 string, just copy the line without utf8 conversion
-						rawCopy(stringUtf8);
-						return;
-					}
-
-					code <<= 6;
-					code |= (ucchar)(ch & 0x3F);
-				}
-				push_back(code);
-			}
-		}
-	}
-
-	static ucstring makeFromUtf8(const std::string &stringUtf8)
-	{
-		ucstring ret;
-		ret.fromUtf8(stringUtf8);
-
-		return ret;
-	}
-
-private:
-
-	void rawCopy(const std::string &str)
-	{
-		// We need to convert the char into 8bits unsigned int before promotion to 16 bits
-		// otherwise, as char are signed on some compiler (MSCV for ex), the sign bit is extended to 16 bits.
-		resize(str.size());
-		std::string::const_iterator first(str.begin()), last(str.end());
-		iterator dest(begin());
-		for (;first != last; ++first, ++dest)
-		{
-			*dest = uint8(*first);
-		}
-	}
-};
-
-inline ucstring operator+(const ucstringbase &ucstr, ucchar c)
-{
-	ucstring	ret;
-	ret= ucstr;
-	ret+= c;
-	return ret;
-}
-
-inline ucstring operator+(const ucstringbase &ucstr, const char *c)
-{
-	ucstring	ret;
-	ret= ucstr;
-	ret+= c;
-	return ret;
-}
-
-inline ucstring operator+(const ucstringbase &ucstr, const std::string &c)
-{
-	ucstring	ret;
-	ret= ucstr;
-	ret+= c;
-	return ret;
-}
-
-inline ucstring operator+(ucchar c, const ucstringbase &ucstr)
-{
-	ucstring	ret;
-	ret= c;
-	ret += ucstr;
-	return ret;
-}
-
-inline ucstring operator+(const char *c, const ucstringbase &ucstr)
-{
-	ucstring	ret;
-	ret= c;
-	ret += ucstr;
-	return ret;
-}
-
-inline ucstring operator+(const std::string &c, const ucstringbase &ucstr)
-{
-	ucstring	ret;
-	ret= c;
-	ret += ucstr;
-	return ret;
-}
-
-namespace NLMISC
-{
-
-// Traits for hash_map using CEntityId
-struct CUCStringHashMapTraits
-{
-	enum { bucket_size = 4, min_buckets = 8 };
-	CUCStringHashMapTraits() { }
-	size_t operator() (const ucstring &id ) const
-	{
-		return id.size();
-	}
-	bool operator() (const ucstring &id1, const ucstring &id2) const
-	{
-		return id1 < id2;
-	}
-};
-
-/** Convert an unicode string in lower case.
- * Characters with accent are converted in a lowercase character with accent
- * \param a string or a char to transform to lower case
- */
-
-ucstring	toLower (const ucstring &str);
-void		toLower (ucchar *str);
-ucchar		toLower (ucchar c);
-
-/** Convert an unicode string in upper case.
- * Characters with accent are converted in a uppercase character without accent
- * \param a string or a char to transform to upper case
- */
-
-ucstring	toUpper (const ucstring &str);
-void		toUpper (ucchar *str);
-ucchar		toUpper (ucchar c);
-
-};
-
-#endif // NL_UCSTRING_H

code/nel/src/gui/css_border_renderer.cpp

@@ -1,320 +0,0 @@
-// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-#include "stdpch.h"
-#include "nel/gui/css_border_renderer.h"
-#include "nel/gui/view_renderer.h"
-#include "nel/gui/widget_manager.h"
-
-using namespace std;
-using namespace NLMISC;
-
-#ifdef DEBUG_NEW
-#define new DEBUG_NEW
-#endif
-
-namespace NLGUI
-{
-
-
-	// ----------------------------------------------------------------------------
-	CSSBorderRenderer::CSSBorderRenderer()
-	{
-		TopWidth = RightWidth = BottomWidth = LeftWidth = 0;
-		TopColor = RightColor = BottomColor = LeftColor = CRGBA(128, 128, 128, 255);
-		TopStyle = RightStyle = BottomStyle = LeftStyle = CSS_LINE_STYLE_SOLID;
-		CurrentAlpha = 255;
-
-		_RenderLayer = 0;
-		_ModulateGlobalColor = false;
-
-		_Border = true;
-		_Dirty = true;
-		_BorderTop = _BorderRight = _BorderBottom = _BorderLeft = false;
-
-		//
-		_QuadT.Uv0.set(0.f, 0.f);
-		_QuadT.Uv1.set(0.f, 0.f);
-		_QuadT.Uv2.set(1.f, 1.f);
-		_QuadT.Uv3.set(0.f, 1.f);
-		//
-		_QuadR.Uv0.set(0.f, 0.f);
-		_QuadR.Uv1.set(0.f, 0.f);
-		_QuadR.Uv2.set(1.f, 1.f);
-		_QuadR.Uv3.set(0.f, 1.f);
-		//
-		_QuadB.Uv0.set(0.f, 0.f);
-		_QuadB.Uv1.set(0.f, 0.f);
-		_QuadB.Uv2.set(1.f, 1.f);
-		_QuadB.Uv3.set(0.f, 1.f);
-		//
-		_QuadL.Uv0.set(0.f, 0.f);
-		_QuadL.Uv1.set(0.f, 0.f);
-		_QuadL.Uv2.set(1.f, 1.f);
-		_QuadL.Uv3.set(0.f, 1.f);
-	}
-
-	// ----------------------------------------------------------------------------
-	void CSSBorderRenderer::setRenderLayer(sint layer)
-	{
-		_RenderLayer = layer;
-	}
-
-	// ----------------------------------------------------------------------------
-	void CSSBorderRenderer::setModulateGlobalColor(bool s)
-	{
-		_ModulateGlobalColor = s;
-	}
-
-	// ----------------------------------------------------------------------------
-	void CSSBorderRenderer::setRect(sint32 x, sint32 y, sint32 w, sint32 h)
-	{
-		_XReal = x;
-		_YReal = y;
-		_WReal = w;
-		_HReal = h;
-
-		_Dirty = _Border = (w > 0 && h > 0);
-	}
-
-	// ----------------------------------------------------------------------------
-	void CSSBorderRenderer::setWidth(uint32 top, uint32 right, uint32 bottom, uint32 left)
-	{
-		TopWidth = top;
-		RightWidth = right;
-		BottomWidth = bottom;
-		LeftWidth = left;
-
-		_Dirty = _Border = (top > 0 || right > 0 || bottom > 0 || left > 0);
-	}
-
-	// ----------------------------------------------------------------------------
-	void CSSBorderRenderer::setStyle(CSSLineStyle top, CSSLineStyle right, CSSLineStyle bottom, CSSLineStyle left)
-	{
-		TopStyle = top;
-		RightStyle = right;
-		BottomStyle = bottom;
-		LeftStyle = left;
-
-		_Dirty = _Border = true;
-	}
-
-	// ----------------------------------------------------------------------------
-	void CSSBorderRenderer::setColor(const NLMISC::CRGBA &top, const NLMISC::CRGBA &right, const NLMISC::CRGBA &bottom, const NLMISC::CRGBA &left)
-	{
-		TopColor = top;
-		RightColor = right;
-		BottomColor = bottom;
-		LeftColor = left;
-
-		_Dirty = true;
-	}
-
-	// ----------------------------------------------------------------------------
-	uint32 CSSBorderRenderer::getTopWidth() const
-	{
-		if (TopStyle == CSS_LINE_STYLE_NONE || TopStyle == CSS_LINE_STYLE_HIDDEN)
-			return 0;
-
-		return TopWidth;
-	}
-
-	// ----------------------------------------------------------------------------
-	uint32 CSSBorderRenderer::getRightWidth() const
-	{
-		if (RightStyle == CSS_LINE_STYLE_NONE || RightStyle == CSS_LINE_STYLE_HIDDEN)
-			return 0;
-
-		return RightWidth;
-	}
-
-	// ----------------------------------------------------------------------------
-	uint32 CSSBorderRenderer::getBottomWidth() const
-	{
-		if (BottomStyle == CSS_LINE_STYLE_NONE || BottomStyle == CSS_LINE_STYLE_HIDDEN)
-			return 0;
-
-		return BottomWidth;
-	}
-
-	// ----------------------------------------------------------------------------
-	uint32 CSSBorderRenderer::getLeftWidth() const
-	{
-		if (LeftStyle == CSS_LINE_STYLE_NONE || LeftStyle == CSS_LINE_STYLE_HIDDEN)
-			return 0;
-
-		return LeftWidth;
-	}
-
-	// ----------------------------------------------------------------------------
-	uint32 CSSBorderRenderer::getLeftRightWidth() const
-	{
-		return getLeftWidth() + getRightWidth();
-	}
-
-	// ----------------------------------------------------------------------------
-	uint32 CSSBorderRenderer::getTopBottomWidth() const
-	{
-		return getTopWidth() + getBottomWidth();
-	}
-
-	// ----------------------------------------------------------------------------
-	void CSSBorderRenderer::updateCoords()
-	{
-		_Dirty = false;
-		if (!_Border) return;
-
-		sint dTop    = getTopWidth();    _BorderTop    = dTop > 0;
-		sint dRight  = getRightWidth();  _BorderRight  = dRight > 0;
-		sint dBottom = getBottomWidth(); _BorderBottom = dBottom > 0;
-		sint dLeft   = getLeftWidth();   _BorderLeft   = dLeft > 0;
-
-		_Border = _BorderTop || _BorderRight || _BorderBottom || _BorderLeft;
-		if (!_Border) return;
-
-		if (_BorderTop)
-		{
-			// top-left
-			_QuadT.V3.x = _XReal;
-			_QuadT.V3.y = _YReal + _HReal;
-			// top-right
-			_QuadT.V2.x = _XReal + _WReal;
-			_QuadT.V2.y = _YReal + _HReal;
-			// bottom-right
-			_QuadT.V1.x = _XReal + _WReal - dRight;
-			_QuadT.V1.y = _YReal + _HReal - dTop;
-			// bottom-left
-			_QuadT.V0.x = _XReal + dLeft;
-			_QuadT.V0.y = _YReal + _HReal - dTop;
-		}
-
-		if (_BorderRight)
-		{
-			// top-left
-			_QuadR.V3.x = _XReal + _WReal - dRight;
-			_QuadR.V3.y = _YReal + _HReal - dTop;
-			// top-right
-			_QuadR.V2.x = _XReal + _WReal;
-			_QuadR.V2.y = _YReal + _HReal;
-			// bottom-right
-			_QuadR.V1.x = _XReal + _WReal;
-			_QuadR.V1.y = _YReal;
-			// bottom-left
-			_QuadR.V0.x = _XReal + _WReal - dRight;
-			_QuadR.V0.y = _YReal + dBottom;
-		}
-
-		if (_BorderBottom)
-		{
-			// top-left
-			_QuadB.V3.x = _XReal + dLeft;
-			_QuadB.V3.y = _YReal + dBottom;
-			// top-right
-			_QuadB.V2.x = _XReal + _WReal - dRight;
-			_QuadB.V2.y = _YReal + dBottom;
-			// bottom-right
-			_QuadB.V1.x = _XReal + _WReal;
-			_QuadB.V1.y = _YReal;
-			// bottom-left
-			_QuadB.V0.x = _XReal;
-			_QuadB.V0.y = _YReal;
-		}
-
-		if (_BorderLeft)
-		{
-			// top-left
-			_QuadL.V3.x = _XReal;
-			_QuadL.V3.y = _YReal + _HReal;
-			// top-right
-			_QuadL.V2.x = _XReal + dLeft;
-			_QuadL.V2.y = _YReal + _HReal - dTop;
-			// bottom-right
-			_QuadL.V1.x = _XReal + dLeft;
-			_QuadL.V1.y = _YReal + dBottom;
-			// bottom-left
-			_QuadL.V0.x = _XReal;
-			_QuadL.V0.y = _YReal;
-		}
-	}
-
-	// ----------------------------------------------------------------------------
-	void CSSBorderRenderer::draw() {
-		if (_Dirty) updateCoords();
-		if (!_Border) return;
-
-		CViewRenderer &rVR = *CViewRenderer::getInstance();
-
-		// TODO: no need for widget manager, if global color is set from parent
-		CRGBA globalColor;
-		if (_ModulateGlobalColor)
-			globalColor = CWidgetManager::getInstance()->getGlobalColor();
-
-		// TODO: monitor ModulateGlobalColor and CurrentAlpha in table checkCoords and recalculate colors on change only
-		// OUTSET - bottom/right darker than normal (default table style)
-		// INSET  - top/left darker than normal
-		if (_BorderTop)
-		{
-			CRGBA borderColorT = TopColor;
-			if (TopStyle == CSS_LINE_STYLE_INSET)
-				borderColorT = blend(borderColorT, CRGBA::Black, 0.5f);
-
-			if (_ModulateGlobalColor)
-				borderColorT.modulateFromColor (borderColorT, globalColor);
-
-			borderColorT.A = (uint8) (((uint16) CurrentAlpha * (uint16) borderColorT.A) >> 8);
-			rVR.drawQuad(_RenderLayer, _QuadT, rVR.getBlankTextureId(), borderColorT, false);
-		}
-		if (_BorderRight)
-		{
-			CRGBA borderColorR = RightColor;
-			if (RightStyle == CSS_LINE_STYLE_OUTSET)
-				borderColorR = blend(borderColorR, CRGBA::Black, 0.5f);
-
-			if (_ModulateGlobalColor)
-				borderColorR.modulateFromColor (borderColorR, globalColor);
-
-			borderColorR.A = (uint8) (((uint16) CurrentAlpha * (uint16) borderColorR.A) >> 8);
-			rVR.drawQuad(_RenderLayer, _QuadR, rVR.getBlankTextureId(), borderColorR, false);
-		}
-		if (_BorderBottom)
-		{
-			CRGBA borderColorB = BottomColor;
-			if (BottomStyle == CSS_LINE_STYLE_OUTSET)
-				borderColorB = blend(borderColorB, CRGBA::Black, 0.5f);
-
-			if (_ModulateGlobalColor)
-				borderColorB.modulateFromColor (borderColorB, globalColor);
-
-			borderColorB.A = (uint8) (((uint16) CurrentAlpha * (uint16) borderColorB.A) >> 8);
-			rVR.drawQuad(_RenderLayer, _QuadB, rVR.getBlankTextureId(), borderColorB, false);
-		}
-		if (_BorderLeft)
-		{
-			CRGBA borderColorL = LeftColor;
-			if (LeftStyle == CSS_LINE_STYLE_INSET)
-				borderColorL = blend(borderColorL, CRGBA::Black, 0.5f);
-
-			if (_ModulateGlobalColor)
-				borderColorL.modulateFromColor (borderColorL, globalColor);
-
-			borderColorL.A = (uint8) (((uint16) CurrentAlpha * (uint16) borderColorL.A) >> 8);
-			rVR.drawQuad(_RenderLayer, _QuadL, rVR.getBlankTextureId(), borderColorL, false);
-		}
-	}
-
-}//namespace
-

code/nel/tools/misc/data_mirror/config.cfg

@@ -1,5 +0,0 @@
-MainDirectory = "w:\database";
-MirrorDirectory = "q:\database";
-LogDirectory = "";
-BinaryCompare = "false";
-IgnoreDirectory = "";

code/nel/tools/sound/build_soundbank/build_soundbank_script.bat

@@ -1 +0,0 @@
-build_soundbank_r L:\leveldesign\ L:\leveldesign\dfn\ L:\build\sound_sheets\

code/ryzom/client/client_default.cfg

@@ -1,626 +0,0 @@
-//////////////////////////
-//////////////////////////
-/// CLIENT CONFIG FILE ///
-//////////////////////////
-//////////////////////////
-
-
-// If you set this variable to 1, your client.cfg will be overwritten when you quit the client.
-// You will loose all the comments and identation in this file.
-SaveConfig = 1;
-
-///////////////////
-// WINDOW CONFIG //
-///////////////////
-
-Driver3D="Auto"; // Valid values are "Auto" or "0", "OpengGL" or "1"  & "Direct3D" or "2"
-                 // "Auto" will choose the best suited driver depending on hardware
-FullScreen = 0;
-Width      = 0;
-Height     = 0;
-PositionX  = 0;
-PositionY  = 0;
-Frequency  = 0;
-Depth      = 32;
-Sleep      = -1;
-ProcessPriority	= 0;	// -2 = idle, -1 = below normal, 0 = normal, 1 = above normal, 2 = high, 3 = real time
-Contrast   = 0.0;		// -1.0 ~ 1.0
-Luminosity = 0.0;		// -1.0 ~ 1.0
-Gamma      = 0.0;		// -1.0 ~ 1.0
-Contrast_min	= -1.0;
-Luminosity_min	= -1.0;
-Gamma_min	= -1.0;
-Contrast_max	= 1.0;
-Luminosity_max	= 1.0;
-Gamma_max	= 1.0;
-
-
-/////////////
-// NETWORK //
-/////////////
-
-Application = { "open", "./client_ryzom_r.exe", "./" };
-BackgroundDownloader = 0;
-StartupHost = "https://open.ryzom.dev";
-StartupPage = "/login/r2_login.php";
-StartupVerify = 1;
-
-ConditionsTermsURL = "http://www.gnu.org/licenses/agpl-3.0.html";
-LoginSupportURL = "https://open.ryzom.dev/ams/";
-NamingPolicyURL = "https://open.ryzom.dev/ams/";
-ForgetPwdURL = "https://open.ryzom.dev/ams/";
-InstallWebPage = "https://open.ryzom.dev/ams/";
-StreamedPackageHosts = { "https://cdn.ryzom.dev/open/stream/" };
-
-// Full path and filename where cURL can find certificate bundle file
-// cacert.pem file can be downloaded from https://curl.haxx.se/docs/caextract.html
-// and added to client data path or system specific bundle can be used
-// Ubuntu has "/etc/ssl/certs/ca-certificates.crt"
-// % = defaultConfigFilePath
-CurlCABundle = "%cacert.pem";
-
-////////////////
-// INTERFACES //
-////////////////
-
-// the language to use as in ISO 639-2
-LanguageCode = "en";		// english
-
-XMLInputFile = "input_config_v3.xml";
-
-XMLLoginInterfaceFiles = {
-	"login_config.xml",
-	"login_widgets.xml",
-	"login_main.xml",
-	"login_keys.xml",
-};
-
-XMLOutGameInterfaceFiles = {
-	"out_v2_config.xml",
-	"out_v2_widgets.xml",
-	"out_v2_connect.xml",
-	"out_v2_intro.xml",
-	"out_v2_select.xml",
-	"out_v2_appear.xml",
-	"out_v2_location.xml",
-	"out_v2_crash.xml",
-	"out_v2_hierarchy.xml",
-	"out_v2_keys.xml",
-};
-
-TexturesInterface     = "texture_interfaces_v3";
-TexturesInterfaceDXTC = "texture_interfaces_dxtc";
-
-// The ligo primitive class file
-LigoPrimitiveClass = "world_editor_classes.xml";
-
-VerboseLog = 1;
-
-
-///////////
-// MOUSE //
-///////////
-HardwareCursor		= 1;
-
-CursorSpeed			= 1.0;			// In pixels per mickey
-CursorSpeed_min		= 0.5;
-CursorSpeed_max		= 2.0;
-
-CursorAcceleration		= 40;		// Threshold in mickey
-CursorAcceleration_min	= 20;
-CursorAcceleration_max	= 80;
-
-FreeLookSpeed		= 0.004;		// In radian per mickey
-FreeLookSpeed_min	= 0.0001;
-FreeLookSpeed_max	= 0.01;
-
-FreeLookAcceleration		= 40;	// Threshold in mickey
-FreeLookAcceleration_min	= 20;
-FreeLookAcceleration_max	= 80;
-
-FreeLookInverted			= 0;
-FreeLookTablet			= 0;
-AutomaticCamera      		= 0;
-DblClickMode			= 1;
-AutoEquipTool			= 1;
-
-///////////////////
-// RENDER CONFIG //
-///////////////////
-
-// NB: thoses variables configure also the InGameConfigurator:
-// _min and _max define the bounds
-// _step defines the step (NB: take care of _min and _max!!)
-// _ps0 is the LOW preset, _ps1 is the MEDIUM preset, _ps2 is the NORMAL Preset, and _ps3 is the HIGH one
-
-
-// *** LANDSCAPE
-LandscapeTileNear       = 50.000000;
-LandscapeTileNear_min   = 20.000000;
-LandscapeTileNear_max   = 100.000000;
-LandscapeTileNear_step  = 10.0;
-LandscapeTileNear_ps0   = 20.0;
-LandscapeTileNear_ps1   = 40.0;
-LandscapeTileNear_ps2   = 50.0;
-LandscapeTileNear_ps3   = 80.0;
-
-// NB: threshold is inverted ULandscape::setThreshold(), to be more intelligible
-LandscapeThreshold      = 1000.0;
-LandscapeThreshold_min  = 100.0;    // Low quality => 0.01 threshold
-LandscapeThreshold_max  = 2000.0;   // High quality => 0.0005 threshold
-LandscapeThreshold_step = 100.0;
-LandscapeThreshold_ps0  = 100.0;
-LandscapeThreshold_ps1  = 500.0;
-LandscapeThreshold_ps2  = 1000.0;
-LandscapeThreshold_ps3  = 2000.0;
-
-Vision		= 500.000000;
-Vision_min	= 200.000000;
-Vision_max	= 800.000000;
-Vision_step	= 100.000000;
-Vision_ps0	= 200.0;
-Vision_ps1	= 400.0;
-Vision_ps2	= 500.0;
-Vision_ps3	= 800.0;
-
-MicroVeget      = 1;	// Enable/Disable MicroVeget.
-MicroVeget_ps0	= 0;
-MicroVeget_ps1	= 1;
-MicroVeget_ps2	= 1;
-MicroVeget_ps3	= 1;
-
-MicroVegetDensity		= 80.0;
-MicroVegetDensity_min	= 10.0;
-MicroVegetDensity_max	= 100.0;
-MicroVegetDensity_step	= 10.0;
-MicroVegetDensity_ps0	= 10.0;	// not used since disabled!
-MicroVegetDensity_ps1	= 30.0;
-MicroVegetDensity_ps2	= 80.0;
-MicroVegetDensity_ps3	= 100.0;
-
-
-// *** FX
-FxNbMaxPoly		= 20000;
-FxNbMaxPoly_min	= 2000;
-FxNbMaxPoly_max	= 50000;
-FxNbMaxPoly_step= 2000;
-FxNbMaxPoly_ps0	= 2000;
-FxNbMaxPoly_ps1	= 10000;
-FxNbMaxPoly_ps2	= 20000;
-FxNbMaxPoly_ps3	= 50000;
-
-Cloud = 1;
-Cloud_ps0	= 0	;
-Cloud_ps1	= 1	;
-Cloud_ps2	= 1	;
-Cloud_ps3	= 1	;
-
-CloudQuality		= 160.0;
-CloudQuality_min	= 80.0;
-CloudQuality_max	= 320.0;
-CloudQuality_step	= 20.0;
-CloudQuality_ps0	= 80.0;	// not used since disabled!
-CloudQuality_ps1	= 80.0;
-CloudQuality_ps2	= 160.0;
-CloudQuality_ps3	= 320.0;
-
-CloudUpdate		= 1;
-CloudUpdate_min	= 1;
-CloudUpdate_max	= 8;
-CloudUpdate_step= 1;
-CloudUpdate_ps0	= 1;	// not used since disabled!
-CloudUpdate_ps1	= 1;
-CloudUpdate_ps2	= 1;
-CloudUpdate_ps3	= 3;
-
-Shadows     = 1;
-Shadows_ps0	= 0;
-Shadows_ps1	= 1;
-Shadows_ps2	= 1;
-Shadows_ps3	= 1;
-
-FXAA		= 1;
-FXAA_ps0	= 0;
-FXAA_ps1	= 1;
-FXAA_ps2	= 1;
-FXAA_ps3	= 1;
-
-AnisotropicFilter	= 0;
-
-Bloom = 1;
-Bloom_ps0	= 0;
-Bloom_ps1	= 1;
-Bloom_ps2	= 1;
-Bloom_ps3	= 1;
-
-SquareBloom = 1;
-SquareBloom_ps0	= 0;
-SquareBloom_ps1	= 1;
-SquareBloom_ps2	= 1;
-SquareBloom_ps3	= 1;
-
-DensityBloom = 255.0;
-DensityBloom_min	= 0.0;
-DensityBloom_max	= 255.0;
-DensityBloom_step	= 1.0;
-DensityBloom_ps0	= 255.0;
-DensityBloom_ps1	= 255.0;
-DensityBloom_ps2	= 255.0;
-DensityBloom_ps3	= 255.0;
-
-
-// *** CHARACTERS
-SkinNbMaxPoly		= 100000;
-SkinNbMaxPoly_min	= 5000;
-SkinNbMaxPoly_max	= 250000;
-SkinNbMaxPoly_step	= 5000;
-SkinNbMaxPoly_ps0	= 10000;
-SkinNbMaxPoly_ps1	= 70000;
-SkinNbMaxPoly_ps2	= 100000;
-SkinNbMaxPoly_ps3	= 200000;
-
-NbMaxSkeletonNotCLod		= 125;
-NbMaxSkeletonNotCLod_min	= 5;
-NbMaxSkeletonNotCLod_max	= 255;
-NbMaxSkeletonNotCLod_step	= 5;
-NbMaxSkeletonNotCLod_ps0	= 10;
-NbMaxSkeletonNotCLod_ps1	= 50;
-NbMaxSkeletonNotCLod_ps2	= 125;
-NbMaxSkeletonNotCLod_ps3	= 255;
-
-CharacterFarClip		= 200.0;
-CharacterFarClip_min	= 50.0;
-CharacterFarClip_max	= 500.0;
-CharacterFarClip_step	= 10.0;
-CharacterFarClip_ps0	= 50.0;
-CharacterFarClip_ps1	= 100.0;
-CharacterFarClip_ps2	= 200.0;
-CharacterFarClip_ps3	= 500.0;
-
-EnableRacialAnimation	= 1;
-
-// *** MISC
-// This is the actual aspect ratio of your screen (no relation with the resolution!!). Set 1.7777 if you got a 16/9 screen for instance
-ScreenAspectRatio	= 0.0;
-ForceDXTC           = 1;	// Enable/Disable DXTC.
-DivideTextureSizeBy2= 0;	// Divide texture size
-DisableVtxProgram   = 0;	// Disable Hardware Vertex Program.
-DisableVtxAGP       = 0;	// Disable Hardware Vertex AGP.
-DisableTextureShdr  = 0;	// Disable Hardware Texture Shader.
-HDEntityTexture     = 1;
-HDTextureInstalled  = 1;
-WaitVBL             = 0;	// 0 or 1 to wait Vertical Sync.
-
-//////////////////
-// GAME OPTIONS //
-//////////////////
-SelectWithRClick	= 1;
-DisplayWeapons		= 1;
-RotKeySpeedMax		= 2.0;
-RotKeySpeedMax_min	= 1.0;
-RotKeySpeedMax_max	= 4.0;
-RotKeySpeedMin		= 1.0;
-RotKeySpeedMin_min	= 0.5;
-RotKeySpeedMin_max	= 2.0;
-RotAccel			= 3.0;
-FollowOnAtk			= 0;
-AtkOnSelect			= 0;
-ZCPacsPrim			= "gen_bt_col_ext.pacs_prim";
-
-/////////////////
-// PREFERENCES //
-/////////////////
-FPV					= 0;	// FPV(First Person View) : default is false (Third Person View).
-CameraHeight		= 2.2;	// Camera Height (in meter) from the ground (for the Third Person View).
-CameraDistance		= 3.0;	// Camera Distance(in meter) from the user (for the Third Person View).
-CameraDistStep		= 1.0;
-CameraDistMin		= 1.0;
-CameraDistMax		= 25.0;
-CameraAccel			= 5.0;
-CameraSpeedMin		= 2.0;
-CameraSpeedMax		= 100.0;
-CameraResetSpeed	= 10.0;		// Speed in radian/s
-
-// Values for UI Scale
-InterfaceScale      = 1.0;
-InterfaceScale_min  = 0.8;
-InterfaceScale_max  = 2.0;
-InterfaceScale_step = 0.05;
-
-// Enable biliner filtering for UI textures
-// Texture atlas needs to be generated with border duplication
-// or there will be visible texture bleeding
-BilinearUI          = 1;
-
-// Default values for map
-MaxMapScale			= 2.0;
-R2EDMaxMapScale		= 8.0;
-
-WindowSnapInvert	= 0;
-WindowSnapDistance	= 10;
-
-//////////////////
-// SOUND CONFIG //
-//////////////////
-SoundForceSoftwareBuffer= 1;
-SoundOn = 1;
-UseEax = 0;
-
-MaxTrack = 32;
-MaxTrack_min = 4;
-MaxTrack_max = 32;
-MaxTrack_step = 4;
-
-// This is the volume for "InGame" sound FXs
-SoundSFXVolume = 1.0;
-SoundSFXVolume_min = 0.0;
-SoundSFXVolume_max = 1.0;
-SoundSFXVolume_step = 0.001;
-
-// This is volume for "InGame" music. Does not affect the MP3 player
-SoundGameMusicVolume = 0.5;
-SoundGameMusicVolume_min = 0.0;
-SoundGameMusicVolume_max = 1.0;
-SoundGameMusicVolume_step = 0.001;
-
-// MP3 player
-MediaPlayerDirectory = "music";
-MediaPlayerAutoPlay = false;
-
-// MISC
-PreDataPath = { "user", "patch", "data", "examples" };
-NeedComputeVS = 0;
-
-NegFiltersDebug = {"Update DB", "Reading:", "Read Value :", "impulseCallBack", "CLIMPD:", "LNET" };
-NegFiltersInfo = { "CLIMPD:", "CPath::lookup" , "LNET" };
-NegFiltersWarning = { "'basics.Equipment Slot'.", "_usercolor.tga", "PACS" };
-
-// Big screen shot
-ScreenShotWidth		 = 0;
-ScreenShotHeight	 = 0;
-ScreenShotFullDetail = 1; // 1 to switch full detail mode for characters (both standard & big screenshots)
-
-// Read : "ID", "R G B A MODE [FX]"
-SystemInfoColors =
-{
-// OLD STUFF Here for compatibility
-"RG", "0   0   0   255 normal",	// Black to see when there is an error
-"BC", "0   0   0   255 normal", // Black to see when there is an error
-"JA", "0   0   0   255 normal", // Black to see when there is an error
-"BL", "0   0   0   255 normal", // Black to see when there is an error
-"VE", "0   0   0   255 normal", // Black to see when there is an error
-"VI", "0   0   0   255 normal", // Black to see when there is an error
-
-// NEW System Info Categories
-"SYS",	"255 255 255 255 normal",	// Default system messages
-"BC",	"255 255 255 255 centeraround",	// Broadcast messages
-"TAGBC",	"255 255 255 255 centeraround", // Taged broadcast messages : color should remain white as some word are tagged
-"XP",	"255 255 64  255 over",		// XP Gain
-"SP",	"255 255 64  255 over",		// SP Gain
-"TTL",	"255 255 64  255 over",		// Title
-"TSK",	"255 255 255 255 over",		// Task
-"ZON",	"255 255 255 255 center",	// Zone
-"DG",	"255 0   0   255 normal",	// Damage to me
-"DMG",	"255 0   0   255 normal",	// Damage to me
-"DGP",	"200 0   0   255 normal",	// Damage to me from player
-"DGM",	"255 128 64  255 normal",	// Damage from me
-"MIS",	"150 150 150 255 normal",	// The opponent misses
-"MISM",	"255 255 255 255 normal",	// I miss
-"ITM",	"0   200 0   255 over",		// Item
-"ITMO",	"170 170 255 255 overonly",	// Item other in group
-"ITMF",	"220 0   220 255 over",		// Item failed
-"SPL",	"50  50  250 255 normal",	// Spell to me
-"SPLM",	"50  150 250 255 normal",	// Spell from me
-"EMT",	"255 150 150 255 normal",	// Emote
-"MTD",	"255 255 0   255 over",		// Message Of The Day
-"FORLD","64  255 64  255 overonly",	// Forage Locate Deposit
-"CHK",	"255 120 60  255 center",	// Tous ce qui ne remplit pas une condition
-"CHKCB","255 255  0  255 center",	// Tous ce qui ne remplit pas une condition en combat (trop loin, cible invalide, pas assez de mana, etc.)
-"PVPTM","255 120 60  255 overonly",	// PVP timer
-"THM",	"255 255 64  255 over misc_levelup.ps",	// Thema finished
-"AMB",	"255 255 64  255 center",	// Ambiance
-"ISE",	"192 208 255 255 normal",	// Item special effect
-"ISE2",	"192 208 255 255 center",	// Item special effect with center text (for effects without flying text)
-"OSM",	"128 160 255 255 center",	// Outpost state message
-"AROUND","255 255 0 255 around",	// Only in around channel
-"R2_INVITE","0 255 0 255 around",	// Ring invitation
-};
-
-PrintfCommands       = {
-	"52", "15", "55 55 0 255", "28", "uiChapterV", "624",
-	"428", "0 0 0 255", "18", "", "624", "378",
-	"0 0 0 255", "14", "", "644", "278", "0 0 0 255",
-	"18", "", "52", "17", "255 255 255 255", "28",
-	"uiChapterV", "622", "430", "255 255 255 255", "18", "",
-	"622", "380", "255 255 255 255", "14", "", "642",
-	"280", "255 255 255 255", "18", ""
-};
-
-PrintfCommandsFreeTrial = {
-	"52", "15", "55 55 0 255", "28", "uiChapterV", "624",
-	"428", "0 0 0 255", "18", "", "624", "378",
-	"0 0 0 255", "14", "", "644", "278", "0 0 0 255",
-	"18", "", "52", "17", "255 255 255 255", "28",
-	"uiChapterV", "622", "430", "255 255 255 255", "18", "",
-	"622", "380", "255 255 255 255", "14", "", "642",
-	"280", "255 255 255 255", "18", ""
-};
-
-DisplayMissingAnimFile = 0;
-
-LoadingStringCount = 54;
-
-
-// Some R2 parameters ...
-
-R2Mode               = 1;
-R2EDEnabled          = 1;
-R2EDExtendedDebug	 = 0;
-R2EDLightPalette	 = 0;
-R2ClientGw           = "r2linux01";
-LoadLuaDebugger      = 0;
-CheckR2ScenarioMD5   = 1;
-LevelDesignEnabled   = 0;
-
-DmCameraDistMax      = 25;
-DmRun                = 20;
-DmWalk               = 6;
-
-R2EDReloadFiles      = {
-	"r2ed.xml",
-	"r2_basic_bricks.lua",
-	"r2_components.lua",
-	"r2_core.lua",
-	"r2_features_default.lua",
-	"r2_features_fauna.lua",
-	"r2_features_npc_groups.lua",
-	"r2_palette.lua",
-	"r2_scenario.lua",
-	"r2_ui.lua"
-};
-
-XMLInterfaceFiles    = {
-	"config.xml",
-	"widgets.xml",
-	"webig_widgets.xml",
-	"appzone.xml",
-	"player.xml",
-	"inventory.xml",
-	"interaction.xml",
-	"phrase.xml",
-	"harvest.xml",
-	"macros.xml",
-	"info_player.xml",
-	"outpost.xml",
-	"guild.xml",
-	"taskbar.xml",
-	"game_config.xml",
-	"game_context_menu.xml",
-	"player_trade.xml",
-	"bot_chat_v4.xml",
-	"compass.xml",
-	"map.xml",
-	"hierarchy.xml",
-	"reset.xml",
-	"actions.xml",
-	"help.xml",
-	"encyclopedia.xml",
-	"commands.xml",
-	"commands2.xml",
-	"ring_access_point_filter.xml",
-	"ring_window.xml",
-	"bg_downloader.xml",
-	"ryzhome_toolbar.xml",
-	"tp_interface.xml"
-};
-
-XMLR2EDInterfaceFiles =
-{
-	"r2ed.xml",
-	"r2_triggers.xml",
-	"r2_logic_entities.xml",
-	"r2ed_acts.xml",
-	"r2ed_scenario.xml",
-	"r2ed_connect.xml"
-};
-
-FogDistAndDepthLookupBias = 20; // bias for lookup of fog distance and depth
-
-
-// Hardware cursor textures
-// These will be extracted from the corresponding packed ui .tga files when they are loaded
-// *
-// * individual .tga files for hardware cursor bitmap not looked for, and not supported yet
-HardwareCursors =
-{
-	"curs_can_pan.tga",
-	"curs_can_pan_dup.tga",
-	"curs_create.tga",
-	"curs_create_multi.tga",
-	"curs_create_vertex_invalid.tga",
-	"curs_default.tga",
-	"curs_dup.tga",
-	"curs_L.tga",
-	"curs_M.tga",
-	"curs_pan.tga",
-	"curs_pan_dup.tga",
-	"curs_pick.tga",
-	"curs_pick_dup.tga",
-	"curs_R.tga",
-	"curs_resize_BL_TR.tga",
-	"curs_resize_BR_TL.tga",
-	"curs_resize_LR.tga",
-	"curs_resize_TB.tga",
-	"curs_rotate.tga",
-	"curs_scale.tga",
-	"curs_stop.tga",
-	"text_cursor.tga",
-	"r2_hand_can_pan.tga",
-	"r2_hand_pan.tga",
-	"r2ed_tool_can_pick.tga",
-	"r2ed_tool_can_rotate.tga",
-	"r2ed_tool_pick.tga",
-	"r2ed_tool_rotate.tga",
-	"r2ed_tool_rotating.tga"
-};
-
-Loading_BG			= "new_loading_bg.tga";			// Default name for the loading background file.
-Launch_BG			= "new_launcher_bg.tga";			// Default name for the launch background file.
-TeleportKami_BG		= "new_teleport_kami_bg.tga";
-TeleportKaravan_BG	= "new_teleport_caravan_bg.tga";
-Elevator_BG			= "new_elevator_bg.tga";		// Default name for the loading background file.
-ResurectKami_BG		= "new_resurect_kami_bg.tga";
-ResurectKaravan_BG	= "new_resurect_caravane_bg.tga";
-End_BG				= "end_bg.tga";				// Default name for the last background file.
-
-ScenarioSavePath = "./my_scenarios/";
-
-// list ofpredefined keyset
-// name will be looked up in the translation file by searching 'uiCP_KeysetName_"  + id
-// tooltip will be looked up in the translation file by searching 'uiCP_KeysetTooltip_"  + id
-// 'bi.' stands for built-in
-// note : we add a dot in the name to be sure that there cannot be a conflict with character keyset name
-BuiltInKeySets =
-{
-	"",	   // default ryzom keyboard layout
-	"bi.zqsd", // european keyboard fps displacement style (NB : don't change this layout name, ryzom will automatically select it if keyboard is french or belgian)
-	"bi.wasd",  // english keyboard fps displacement style (NB : don't change this layout name, ryzom will automatically select it if keyboard is not french nor belgian)
-	"bi.wow_alike" // 'world of warcraft' like keyboard style. (NB : not available for ring)
-};
-
-// "Newbie Training", "Story Telling", "Mistery", "Hack & Slash", "Guild Training", "Other"
-ScenarioTypes = {"so_newbie_training","so_story_telling","so_mistery","so_hack_slash","so_guild_training","so_other"};
-
-ScenarioLanguages = {"fr","de","en","other_lang"};
-
-// Map each language to a forum help page
-HelpPages =
-{
-	"fr=https://app.ryzom.com/app_forum/index.php?page=topic/view/6629/1&lang=fr",
-	"en=https://app.ryzom.com/app_forum/index.php?page=topic/view/6629/1&lang=en",
-	"wk=https://app.ryzom.com/app_forum/index.php?page=topic/view/6629/1",
-	"de=https://app.ryzom.com/app_forum/index.php?page=topic/view/6629/1&lang=de",
-	"es=https://app.ryzom.com/app_forum/index.php?page=topic/view/6629/1&lang=es",
-	"ru=https://app.ryzom.com/app_forum/index.php?page=topic/view/6629/1&lang=ru"
-};
-
-// User created channel
-ChannelIgnoreFilter =
-{
-	"Uni Français", "English Uni", "Español Uni",
-	"русский Uni", "Deutsch Uni", "Karavan",
-	"Kami", "Ranger", "Marauder", "Fyros",
-	"Matis", "Tryker", "Zoraï"
-};
-
-// interval in minutes for webig notify thread to run
-WebIgNotifInterval   = 10;
-WebIgMainDomain      = "https://open.ryzom.dev";
-WebIgTrustedDomains  = {
-	"open.ryzom.dev"
-};
-PatchletUrl          = "https://open.ryzom.dev/app_patchlet/index.php?patch=preload";
-
-SelectedSlot = 0;
-
-BuildName = "RELEASE_HEAD";

code/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.cpp

@@ -1,121 +0,0 @@
-// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
-// Copyright (C) 2010  Winch Gate Property Limited
-//
-// This source file has been modified by the following contributors:
-// Copyright (C) 2013  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-//
-// 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/>.
-
-
-
-
-#include "stdpch.h"
-#include "dbgroup_list_sheet_bonus_malus.h"
-#include "interface_manager.h"
-
-
-using namespace std;
-using namespace NLMISC;
-
-// ***************************************************************************
-#define DISABLE_LEAF "DISABLED"
-
-NLMISC_REGISTER_OBJECT(CViewBase, CDBGroupListSheetBonusMalus, std::string, "list_sheet_bonus_malus");
-
-// ***************************************************************************
-CDBGroupListSheetBonusMalus::CDBGroupListSheetBonusMalus(const TCtorParam &param)
-:	CDBGroupListSheet(param)
-{
-	_TextId= -1;
-
-	// want leave space between controls in the list
-	// Yoyo: I think it's better like this, + this is important for space consideration and because of XPCat/PVPOutpost
-	//_ListLeaveSpace= false;
-}
-
-
-// ***************************************************************************
-bool CDBGroupListSheetBonusMalus::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup)
-{
-	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-
-	if(!CDBGroupListSheet::parse(cur, parentGroup))
-		return false;
-
-	// read the texture
-	CXMLAutoPtr	prop;
-	prop = (char*) xmlGetProp( cur, (xmlChar*)"disable_texture" );
-	if (prop)
-	{
-		CInterfaceManager *pIM = CInterfaceManager::getInstance();
-		CViewRenderer &rVR = *CViewRenderer::getInstance();
-		_TextId= rVR.getTextureIdFromName ((const char *)prop);
-	}
-
-	// get the Node leaves to be tested each frame
-	uint	i= 0;
-	for(;;)
-	{
-		string	db= toString("%s:%d:" DISABLE_LEAF, _DbBranchName.c_str(), i);
-		CCDBNodeLeaf	*node= NLGUI::CDBManager::getInstance()->getDbProp(db, false);
-		if(!node)
-		{
-			break;
-		}
-		else
-		{
-			_DisableStates.push_back(node);
-			i++;
-		}
-	}
-
-	return true;
-}
-
-// ***************************************************************************
-void CDBGroupListSheetBonusMalus::draw ()
-{
-	CDBGroupListSheet::draw();
-
-//	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-//	CViewRenderer		&rVR= *CViewRenderer::getInstance();
-
-//	sint32	drl= getRenderLayer()+1;
-
-	// May draw disable bitmaps on the ctrl sheets if disabled.
-	uint	numCtrls= (uint)min(_SheetChildren.size(), _DisableStates.size());
-	for(uint i=0;i<numCtrls;i++)
-	{
-		CDBCtrlSheet	*ctrl= _SheetChildren[i]->Ctrl;
-		// if the ctrl is displayed, and if the state is disabled
-		if(ctrl->getActive())
-		{
-			if(_DisableStates[i]->getValue32()!=0)
-			{
-				ctrl->setGrayed(true);
-				/*
-				// YOYO: for now, don't display the gray bitmap. cross not cool.
-				CRGBA	crossColor= ctrl->getSheetColor();
-				crossColor.A>>= 2;
-				// Draw the disable bitmap on this control. +1 for the slot (ugly)
-				rVR.drawRotFlipBitmap(drl, ctrl->getXReal()+1, ctrl->getYReal()+1,
-					CCtrlSheetInfo::BrickSheetWidth, CCtrlSheetInfo::BrickSheetHeight, 0, 0, _TextId, crossColor);
-				*/
-			}
-			else
-				ctrl->setGrayed(false);
-		}
-	}
-}
-

config.h.cmake

@@ -37,6 +37,7 @@
 #cmakedefine RYZOM_CLIENT_EDIT_ACCOUNT_URL "${RYZOM_CLIENT_EDIT_ACCOUNT_URL}"
 #cmakedefine RYZOM_CLIENT_FORGET_PASSWORD_URL "${RYZOM_CLIENT_FORGET_PASSWORD_URL}"
 #cmakedefine RYZOM_CLIENT_PATCH_URL "${RYZOM_CLIENT_PATCH_URL}"
+#cmakedefine RYZOM_CLIENT_APP_NAME "${RYZOM_CLIENT_APP_NAME}"
 
 #cmakedefine RYZOM_WEBIG_MAIN_URL "${RYZOM_WEBIG_MAIN_URL}"
 #cmakedefine RYZOM_WEBIG_TRUSTED_DOMAIN "${RYZOM_WEBIG_TRUSTED_DOMAIN}"