merge de ryzomcore essai 1

This commit is contained in:
compil 2017-10-14 19:30:19 +02:00
parent 98942e57b3
commit 33f3f13dac
2942 changed files with 0 additions and 359 deletions

28
.hgeol
View file

@ -1,28 +0,0 @@
[patterns]
**.h = native
**.cpp = native
**/database.xml = BIN
**/msg.xml = BIN
**.txt = native
**.xml = native
**.layout = native
**.looknfeel = native
**.imageset = native
**.font = native
**.scheme = native
**.tpl = native
**.xsd = native
**.dox = native
**.py = native
**.lua = native
**.pkg = native
[repository]
native = LF

265
.hgignore
View file

@ -1,265 +0,0 @@
syntax: glob
# Various build directories
bin
obj
Debug
Release
ReleaseDebug
DebugFast
ReleaseDebugStatic
DebugFastStatic
# Test and application directories
screenshots
release
test
Temp
# NeL cache
*.packed_sheets
# Ryzom save
save_shard
last_loaded_char.bin
*.binprim
*.string_cache
graphs_output
default_c
# Windows compile
*.exe
*.dll
*.lib
*.obj
# Linux compile
*.a
*.la
*.lo
*.Po
*.Plo
*.o
*.so
*.so.*
*_debug
*.pc
*.gch
# Mac OS X compile
*.dylib
# Log dump files
report_refused
report_failed
exception_catched
*.stat
*.log
log.txt
# Max plugin extensions
*.dlx
*.dlm
*.dlu
# makeall build
.mode_static
# cmake build files & directories
CMakeFiles
CMakeCache.txt
cmake_install.cmake
CTestTestfile.cmake
CPackConfig.cmake
CPackSourceConfig.cmake
.libs
# Linux garbage
Makefile*
aclocal.m4
config.guess
config.sub
configure
depcomp
config.h.in
nelconfig.h.in
install-sh
ltmain.sh
missing
ylwrap
*.mk
# Visual Studio garbage
*.opensdf
UpgradeLog*.XML
_UpgradeReport_Files
BuildLog.htm
mt.dep
ipch
*.suo
*.ncb
*.user
*.ilk
*.pdb
*.aps
*.exp
*.idb
*.sdf
# Mac OS X garbage
.DS_Store
# Ryzom server garbage
aes_alias_name.cfg
aes_nagios_report.txt
aes_state.txt
*.launch_ctrl
*.state
*.start_count
# Vim and kwrite cache
*~
# Kdevelop4 garbage
*.kdev4
.kdev4
# intellij project folder
.idea/
# Python cache
*.pyd
*.pyc
# Qt compiler
moc_*.cpp
*.moc
# Misc garbage
*.rej
*.orig
*.cachefile
*.cache
*.patch
*.7z
3rdParty
.svn
thumbs.db
Thumbs.db
*.tpl.php
.SyncID
.SyncIgnore
.SyncArchive
# build
code/nel/build/*
code/nelns/build/*
code/snowballs/build/*
code/ryzom/build/*
code/build/*
code/build-2010/*
build/*
install/*
build_vc*
code/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
# 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
# WebTT temp dir
code/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
#tools and external dir's
external
external_stlport
nel_tools*
ryzom_tools*
#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

18
.hgtags
View file

@ -1,18 +0,0 @@
950d650ca92e6041611258d7e5131ccf661e4ec2 compatibility-merge
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

View file

@ -1,48 +0,0 @@
sudo: false
language: cpp
compiler:
- gcc
os:
- linux
matrix:
fast_finish: true
env:
- CMAKE_CONFIGURE_OPTIONS="-DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON"
- CMAKE_CONFIGURE_OPTIONS="-DCPPTEST_LIBRARY_DEBUG:STRING=/usr/lib/libcpptest.so"
CMAKE_BUILD_OPTIONS="--target nel_unit_test -- -j 2"
RUN="build/bin/nel_unit_test"
addons:
apt:
packages:
- liblua5.1-dev
- libluabind-dev
- libcpptest-dev
- libogg-dev
- libvorbis-dev
- libopenal-dev
- libgif-dev
- libfreetype6-dev
- libxml2-dev
before_script:
- mkdir build
- cmake --version
- cmake -Hcode -Bbuild $CMAKE_CONFIGURE_OPTIONS
- cat build/CMakeCache.txt
script:
- cmake --build build $CMAKE_BUILD_OPTIONS
- $RUN
notifications:
irc:
channels:
- $NOTIFICATION_IRC_CHANNEL
template:
- "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}"
- "Description : %{commit_message}"
- "Change view : %{compare_url}"
- "Build details : %{build_url}"

0
code/web/docs/admin/shard_restart/Filelist.xml Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/H38.css Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/H70_2.htm Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hd36.xml Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hf69.htm Normal file → Executable file
View file

BIN
code/web/docs/admin/shard_restart/Hg39_1.gif Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 76 KiB

0
code/web/docs/admin/shard_restart/Hg39_1.htm Normal file → Executable file
View file

BIN
code/web/docs/admin/shard_restart/Hg41_2.gif Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 74 KiB

0
code/web/docs/admin/shard_restart/Hg41_2.htm Normal file → Executable file
View file

BIN
code/web/docs/admin/shard_restart/Hg43_3.gif Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 KiB

After

Width:  |  Height:  |  Size: 151 KiB

0
code/web/docs/admin/shard_restart/Hg43_3.htm Normal file → Executable file
View file

BIN
code/web/docs/admin/shard_restart/Hg45_4.gif Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 154 KiB

After

Width:  |  Height:  |  Size: 154 KiB

0
code/web/docs/admin/shard_restart/Hg45_4.htm Normal file → Executable file
View file

BIN
code/web/docs/admin/shard_restart/Hg47_5.gif Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

0
code/web/docs/admin/shard_restart/Hg47_5.htm Normal file → Executable file
View file

BIN
code/web/docs/admin/shard_restart/Hg49_6.gif Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 128 KiB

After

Width:  |  Height:  |  Size: 128 KiB

0
code/web/docs/admin/shard_restart/Hg49_6.htm Normal file → Executable file
View file

BIN
code/web/docs/admin/shard_restart/Hg51_7.gif Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 152 KiB

After

Width:  |  Height:  |  Size: 152 KiB

0
code/web/docs/admin/shard_restart/Hg51_7.htm Normal file → Executable file
View file

BIN
code/web/docs/admin/shard_restart/Hg53_8.gif Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 166 KiB

After

Width:  |  Height:  |  Size: 166 KiB

0
code/web/docs/admin/shard_restart/Hg53_8.htm Normal file → Executable file
View file

BIN
code/web/docs/admin/shard_restart/Hg55_9.gif Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 165 KiB

After

Width:  |  Height:  |  Size: 165 KiB

0
code/web/docs/admin/shard_restart/Hg55_9.htm Normal file → Executable file
View file

BIN
code/web/docs/admin/shard_restart/Hg57_10.gif Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 165 KiB

After

Width:  |  Height:  |  Size: 165 KiB

0
code/web/docs/admin/shard_restart/Hg57_10.htm Normal file → Executable file
View file

BIN
code/web/docs/admin/shard_restart/Hg59_11.gif Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 112 KiB

0
code/web/docs/admin/shard_restart/Hg59_11.htm Normal file → Executable file
View file

BIN
code/web/docs/admin/shard_restart/Hg61_12.gif Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 146 KiB

After

Width:  |  Height:  |  Size: 146 KiB

0
code/web/docs/admin/shard_restart/Hg61_12.htm Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hn68.htm Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hu37.js Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hz63.htm Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/lt_off.gif Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 900 B

After

Width:  |  Height:  |  Size: 900 B

0
code/web/docs/admin/shard_restart/lt_over.gif Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 912 B

After

Width:  |  Height:  |  Size: 912 B

0
code/web/docs/admin/shard_restart/rt_off.gif Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 900 B

After

Width:  |  Height:  |  Size: 900 B

0
code/web/docs/admin/shard_restart/rt_over.gif Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 916 B

After

Width:  |  Height:  |  Size: 916 B

0
code/web/docs/ams/doxygen/Doxyfile Normal file → Executable file
View file

0
code/web/docs/ams/doxygen/img/db.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 201 KiB

After

Width:  |  Height:  |  Size: 201 KiB

0
code/web/docs/ams/doxygen/img/info.jpg Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 454 KiB

After

Width:  |  Height:  |  Size: 454 KiB

0
code/web/docs/ams/doxygen/img/info.psd Normal file → Executable file
View file

0
code/web/docs/ams/doxygen/info.php Normal file → Executable file
View file

0
code/web/docs/ams/doxygen/logo.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
code/web/private_php/ams/autoload/.plugincache.php.swp Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/assigned.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/dblayer.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/forwarded.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/gui_elements.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/helpers.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/in_support_group.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/mail_handler.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/mycrypt.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/pagination.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/plugincache.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/querycache.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/rest_api.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/support_group.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/sync.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/ticket.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/ticket_category.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/ticket_content.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/ticket_info.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/ticket_log.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/ticket_queue.php Normal file → Executable file
View file

View file

0
code/web/private_php/ams/autoload/ticket_reply.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/ticket_user.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/users.php Normal file → Executable file
View file

0
code/web/private_php/ams/configs/ams_lib.conf Normal file → Executable file
View file

0
code/web/private_php/ams/configs/ingame_layout.ini Normal file → Executable file
View file

0
code/web/private_php/ams/img/info/client.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

0
code/web/private_php/ams/img/info/connect.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

0
code/web/private_php/ams/img/info/cpuid.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

0
code/web/private_php/ams/img/info/ht.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

0
code/web/private_php/ams/img/info/local.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

0
code/web/private_php/ams/img/info/mask.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

0
code/web/private_php/ams/img/info/memory.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

0
code/web/private_php/ams/img/info/nel.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

0
code/web/private_php/ams/img/info/os.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

0
code/web/private_php/ams/img/info/patch.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

0
code/web/private_php/ams/img/info/position.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

0
code/web/private_php/ams/img/info/processor.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

0
code/web/private_php/ams/img/info/server.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

0
code/web/private_php/ams/img/info/shard.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

0
code/web/private_php/ams/img/info/user.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

0
code/web/private_php/ams/img/info/view.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View file

View file

0
code/web/private_php/ams/ingame_templates/index.tpl Normal file → Executable file
View file

0
code/web/private_php/ams/ingame_templates/layout.tpl Normal file → Executable file
View file

View file

View file

View file

0
code/web/private_php/ams/ingame_templates/login.tpl Normal file → Executable file
View file

0
code/web/private_php/ams/ingame_templates/register.tpl Normal file → Executable file
View file

0
code/web/private_php/ams/ingame_templates/settings.tpl Normal file → Executable file
View file

Some files were not shown because too many files have changed in this diff Show more