Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2015-11-23 16:44:42 +01:00
commit 57f5df2aac
173 changed files with 220453 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
code/ryzom/client/client_default.cfg
View file

@ -16,11 +16,11 @@ SaveConfig = 1;
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 = 1;
Width = 1024;
Height = 768;
Width = 0;
Height = 0;
PositionX = 0;
PositionY = 0;
Frequency = 60;
Frequency = 0;
Depth = 32;
Sleep = -1;
ProcessPriority = 0; // -2 = idle, -1 = below normal, 0 = normal, 1 = above normal, 2 = high, 3 = real time
@ -39,20 +39,15 @@ Gamma_max = 1.0;
// NETWORK //
/////////////
Application = { "ryzom_open", "./client_ryzom_r.exe", "./" };
Application = { "ryzom_live", "./client_ryzom_r.exe", "./" };
BackgroundDownloader = 0;
PatchServer = "";
PatchWanted = 0;
SignUpURL = "";
StartupHost = "shard.ryzomcore.org:40916";
PatchServer = "http://dl.ryzom.com/patch_live";
StartupHost = "shard.ryzom.com:40916";
StartupPage = "/login/r2_login.php";
InstallStatsUrl = "http://open.ryzom.com:50000/stats/stats.php";
CreateAccountURL = "http://shard.ryzomcore.org/ams/?page=register";
EditAccountURL = "http://shard.ryzomcore.org/ams/?page=settings";
ConditionsTermsURL = "http://www.gnu.org/licenses/agpl-3.0.html";
ForgetPwdURL = "http://shard.ryzomcore.org/ams/?page=forgot_password";
LoginSupportURL = "https://plus.google.com/u/0/communities/103798956862568269036";
InstallWebPage = "";
InstallStatsUrl = "";
ConditionsTermsURL = "http://app.ryzom.com/app_forum/index.php?page=topic/view/21885/1&post148782=en#1";
LoginSupportURL = "http://app.ryzom.com/app_forum/index.php?page=topic/view/22047/1&post149889=en#1";
////////////////
@ -84,10 +79,6 @@ XMLOutGameInterfaceFiles = {
"out_v2_keys.xml",
};
TexturesInterface = "texture_interfaces_v3";
TexturesInterfaceDXTC = "texture_interfaces_dxtc";
// The ligo primitive class file
LigoPrimitiveClass = "world_editor_classes.xml";
@ -220,7 +211,7 @@ FXAA_ps1 = 1;
FXAA_ps2 = 1;
FXAA_ps3 = 1;
Bloom = 0;
Bloom = 1;
Bloom_ps0 = 0;
Bloom_ps1 = 1;
Bloom_ps2 = 1;
@ -280,7 +271,7 @@ DivideTextureSizeBy2= 0; // Divide texture size
DisableVtxProgram = 0; // Disable Hardware Vertex Program.
DisableVtxAGP = 0; // Disable Hardware Vertex AGP.
DisableTextureShdr = 0; // Disable Hardware Texture Shader.
HDEntityTexture = 0;
HDEntityTexture = 1;
HDTextureInstalled = 1;
WaitVBL = 0; // 0 or 1 to wait Vertical Sync.
@ -339,7 +330,8 @@ SoundGameMusicVolume_max = 1.0;
SoundGameMusicVolume_step = 0.001;
// MISC
PreDataPath = { "user", "patch", "data", "examples" };
PreDataPath = { "user", "patch", "examples", "data/fonts", "data/gamedev.bnp" };
DataPath = { "data" };
NeedComputeVS = 0;
NegFiltersDebug = {"Update DB", "Reading:", "Read Value :", "impulseCallBack", "CLIMPD:", "LNET" };
@ -353,7 +345,7 @@ ScreenShotFullDetail = 1; // 1 to switch full detail mode for characters (both s
// 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
@ -419,7 +411,7 @@ PrintfCommandsFreeTrial = {
DisplayMissingAnimFile = 0;
LoadingStringCount = 0;
LoadingStringCount = 54;
// Some R2 parameters ...
@ -567,7 +559,9 @@ HelpPages =
"fr=http://forums.ryzom.com/forum/showthread.php?t=29130",
"en=http://forums.ryzom.com/forum/showthread.php?t=29129",
"wk=http://forums.ryzom.com/forum/showthread.php?t=29129",
"de=http://forums.ryzom.com/forum/showthread.php?t=29131"
"de=http://forums.ryzom.com/forum/showthread.php?t=29131",
"es=http://forums.ryzom.com/forum/showthread.php?t=29131",
"ru=http://forums.ryzom.com/forum/showthread.php?t=29131"
};
WebIgMainDomain = "app.ryzom.com";

32
code/ryzom/client/client_default.cfg.in
View file

@ -15,7 +15,7 @@ SaveConfig = 1;
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 = 1;
FullScreen = 0;
Width = 1024;
Height = 768;
PositionX = 0;
@ -39,16 +39,15 @@ Gamma_max = 1.0;
// NETWORK //
/////////////
Application = { "ryzom_open", "./client_ryzom_r.exe", "./" };
Application = { "ryzom_live", "./client_ryzom_r.exe", "./" };
BackgroundDownloader = 0;
PatchServer = "";
PatchWanted = 0;
SignUpURL = "";
StartupHost = "open.ryzom.com:40916";
PatchServer = "http://dl.ryzom.com/patch_live";
SignUpURL = "http://www.ryzom.com/subscribe";
StartupHost = "shard.ryzom.com:40916";
StartupPage = "/login/r2_login.php";
InstallStatsUrl = "http://open.ryzom.com:50000/stats/stats.php";
CreateAccountURL = "";
InstallWebPage = "";
InstallStatsUrl = "http://shard.ryzom.com:50000/stats/stats.php";
CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";
InstallWebPage = "http://dl.ryzom.com/installer/";
////////////////
@ -80,10 +79,6 @@ XMLOutGameInterfaceFiles = {
"out_v2_keys.xml",
};
TexturesInterface = "texture_interfaces_v3";
TexturesInterfaceDXTC = "texture_interfaces_dxtc";
// The ligo primitive class file
LigoPrimitiveClass = "world_editor_classes.xml";
@ -567,14 +562,11 @@ HelpPages =
"de=http://forums.ryzom.com/forum/showthread.php?t=29131"
};
WebIgMainDomain = "atys.ryzom.com";
WebIgTrustedDomains =
{
"atys.ryzom.com"
WebIgMainDomain = "app.ryzom.com";
WebIgTrustedDomains = {
"api.ryzom.com", "app.ryzom.com"
};
PatchletUrl = "http://atys.ryzom.com/start/app_patchlet.php?patch=preload";
PatchletUrl = "http://app.ryzom.com/app_patchlet/index.php?patch=preload";
SelectedSlot = 0;

63
code/ryzom/client/data/gamedev/interfaces_v3/help.xml
View file

@ -863,10 +863,8 @@
</group>
</group>
</group>
<!--<define id="cs_url"
value="http://app.ryzom.com/ticket_system/index.php?mode=load" />-->
<define id="cs_url"
value="http://shard.ryzomcore.org/ams/index.php" />
value="http://app.ryzom.com/ticket_system/index.php?mode=load" />
<group type="container"
id="cs_browser"
w="410"
@ -907,22 +905,6 @@
group_params_r="menu=ui:interface:base_menu_with_color"
on_active="lua"
on_active_params="help:openCSBrowserHeader('cs_browser')">
<!--Quitta start-->
<ctrl style="text_button_header"
button_type="push_button"
id="browse_home"
posref="MR MR"
x="-16"
y="0"
hardtext="AMS-HOME"
tooltip="uittBrowseHome"
onclick_l="browse_home"
params_l="name=ui:interface:cs_browser:content:html"
frozen="false" />
<!--Quitta end-->
</group>
<group id="content"
x="0"
@ -937,9 +919,9 @@
url="home"
title_prefix="uiHelpTitle"
sizeref="wh"
x="2"
x="184"
y="0"
w="-4"
w="-190"
h="0"
background_color="0 0 0 255"
error_color="255 240 48 255"
@ -960,7 +942,7 @@
h6_font_size="12"
paragraph_begin_space="12"
multi_line_space_factor="0.25"
td_begin_space="10"
td_begin_space="0"
li_begin_space="4"
ul_begin_space="12"
li_indent="-10"
@ -1007,6 +989,43 @@
<ctrl style="skin_scroll"
id="scroll_bar" />
</group>
<group id="sbtree"
posref="TL TL"
x="0"
y="-12"
sizeref="h"
w="180"
h="-12">
<group id="black"
posref="BR BR"
sizeref="hw"
w="-12"
h="0"
inherit_gc_alpha="true" />
<instance template="inner_thin_border"
posparent="black"
inherit_gc_alpha="true" />
<group id="tree_list"
type="tree"
posref="TL TL"
x="16"
y="-4"
col_over="255 255 255 48"
col_select="255 255 255 80"
fontsize="10"
max_sizeparent="parent"
max_sizeref="wh"
max_w="-20"
max_h="-10">
<node name="uiCSBase"
handler="launch_help"
params="help_container=ui:interface:cs_browser|url=%cs_url" />
</group>
<ctrl style="skin_scroll"
id="scroll_bar"
align="T"
target="tree_list" />
</group>
</group>
</group>
<!--******************-->

53
code/ryzom/client/data/ssl_ca_cert.pem
View file

@ -0,0 +1,53 @@
-----BEGIN CERTIFICATE-----
MIIEsTCCA5mgAwIBAgIQFtJJbfjBfHu0hPEjpDUISzANBgkqhkiG9w0BAQsFADBB
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3RlLCBJbmMuMRswGQYDVQQDExJ0
aGF3dGUgU1NMIENBIC0gRzIwHhcNMTUwODA2MDAwMDAwWhcNMTcwODMxMjM1OTU5
WjByMQswCQYDVQQGEwJDWTEPMA0GA1UECAwGQ3lwcnVzMREwDwYDVQQHDAhMaW1h
c3NvbDEkMCIGA1UECgwbV2luY2ggR2F0ZSBQcm9wZXJ0eSBMaW1pdGVkMRkwFwYD
VQQDDBBzZWN1cmUucnl6b20uY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
CgKCAQEA5gKQ6EQdfBmGuLC0+bSHCEztqEoJ/FN3xCHCSt8IjJCXaC7BO1RMrcDF
CqZZaSmuFg+ePTJ4c7igVZ83yQEvkRH5FycWwL9vvF2xTfRdASZogzdn1K9C1Erl
jF2Gmqg80HPDSe36XpWjlOFBaj5AlGrPYnTe1HqKslnPdREL1/I12eIdMv2Nfup3
55X/rDKuQFYBRpzznIg95acveKLVCM+UY+AAtdMjJFS/Xb/MBSZBX1psss32DMcr
UaxdOIaiPublBwWMBmeRYzAvA9QQK2zZkElJUu5gz0vRM380CNKSWmXUOLF6U+qS
WV9CgQuk6ivL+ydu6IFDiZtTjblcswIDAQABo4IBcjCCAW4wGwYDVR0RBBQwEoIQ
c2VjdXJlLnJ5em9tLmNvbTAJBgNVHRMEAjAAMG4GA1UdIARnMGUwYwYGZ4EMAQIC
MFkwJgYIKwYBBQUHAgEWGmh0dHBzOi8vd3d3LnRoYXd0ZS5jb20vY3BzMC8GCCsG
AQUFBwICMCMMIWh0dHBzOi8vd3d3LnRoYXd0ZS5jb20vcmVwb3NpdG9yeTAOBgNV
HQ8BAf8EBAMCBaAwHwYDVR0jBBgwFoAUwk9IV/zRT5rAXTh9DgXb2S61UmAwKwYD
VR0fBCQwIjAgoB6gHIYaaHR0cDovL3RqLnN5bWNiLmNvbS90ai5jcmwwHQYDVR0l
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFcGCCsGAQUFBwEBBEswSTAfBggrBgEF
BQcwAYYTaHR0cDovL3RqLnN5bWNkLmNvbTAmBggrBgEFBQcwAoYaaHR0cDovL3Rq
LnN5bWNiLmNvbS90ai5jcnQwDQYJKoZIhvcNAQELBQADggEBAGB8DQaxTtEX06uf
krmZegXJOO3SucxhYqdVjGdx3CXm+t22St6ynS0vtLZN3i/fAhYEcGemV/gJNui0
qtvx6wjtQ0oYg4FyuMbBtwFYHJhAAI5NLRIthYLJGIKTxqLAmxXKy64HlOP6MS8q
SCbmm295/KCag2STwmJ5ASqCper59044q7JAZUNfOFe47PWYeu85g9njiTLdMlkb
GMtlOsA9A2FcrNPzok2Bgs6ya+GAg2jH5dABHlEp8P5qxB5IoPI+TS+lxTzLJYRq
HznhUjEwtAvD8FR6PY+2xi1PatMVZKZ1gs+kOBaAp4pZ9MuwDJTo7Bn5aS26/Lpl
N2Vq1gY=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB
qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV
BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw
NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j
LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG
A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG
SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs
W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta
3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk
6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6
Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J
NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA
MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP
r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU
DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz
YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2
/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/
LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7
jVaMaA==
-----END CERTIFICATE-----

21
code/ryzom/client/macosx/installscript_osx.vdf Normal file
View file

@ -0,0 +1,21 @@
"Installscript"
{
"version" "2"
"symlink"
{
"0"
{
"link" "Ryzom.app/Contents/Resources/data"
"target" "../../../data"
}
}
"chmod"
{
"0"
{
"file" "Ryzom.app/Contents/MacOS/Ryzom"
"mode" "755"
}
}
}

25
code/ryzom/client/src/CMakeLists.txt
View file

@ -47,12 +47,24 @@ SOURCE_GROUP("r2" FILES ${SRC_R2})
# on Mac, create a .App Bundle
if(APPLE)
SET(MACOSX_BUNDLE_INFO_STRING "Ryzom Core Client")
SET(RYZOM_VERSION_SHORT "2.1.0")
SET(RYZOM_VERSION_LONG "2.1.0")
# define directories used by GetRevision
SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
SET(ROOT_DIR ${CMAKE_SOURCE_DIR}/..)
INCLUDE(GetRevision)
IF(REVISION)
SET(RYZOM_VERSION_LONG "${RYZOM_VERSION_LONG}.${REVISION}")
ENDIF()
SET(MACOSX_BUNDLE_INFO_STRING "Ryzom")
SET(MACOSX_BUNDLE_ICON_FILE "ryzom.icns")
SET(MACOSX_BUNDLE_GUI_IDENTIFIER "")
SET(MACOSX_BUNDLE_LONG_VERSION_STRING ${NL_VERSION})
SET(MACOSX_BUNDLE_BUNDLE_NAME "Ryzom Core Client")
SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "0.8")
SET(MACOSX_BUNDLE_GUI_IDENTIFIER "com.winchgate.Ryzom")
SET(MACOSX_BUNDLE_LONG_VERSION_STRING ${RYZOM_VERSION_LONG})
SET(MACOSX_BUNDLE_BUNDLE_NAME "Ryzom")
SET(MACOSX_BUNDLE_SHORT_VERSION_STRING ${RYZOM_VERSION_SHORT})
SET(MACOSX_BUNDLE_BUNDLE_VERSION "1.0")
SET(MACOSX_BUNDLE_COPYRIGHT "Winchgate and The Ryzom Core Community")
SET(RYZOM_OUTPUT_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${MACOSX_BUNDLE_BUNDLE_NAME}.app)
@ -70,6 +82,7 @@ IF(APPLE)
ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/PkgInfo ${RYZOM_CONTENTS_DIR})
ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/ryzom.icns ${RYZOM_RESOURCES_DIR})
ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${CMAKE_SOURCE_DIR}/ryzom/client/client_default.cfg ${RYZOM_RESOURCES_DIR})
ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/installscript_osx.vdf ${RYZOM_OUTPUT_DIR})
IF(RYZOM_DATA_DIR)
ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -RpX ${RYZOM_DATA_DIR} ${RYZOM_RESOURCES_DIR})
@ -114,7 +127,7 @@ ENDIF(APPLE)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} ${LUABIND_DEFINITIONS})
NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Core Client")
NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Client")
NL_ADD_RUNTIME_FLAGS(ryzom_client)
NL_ADD_LIB_SUFFIX(ryzom_client)

1
code/ryzom/client/src/browse_faq.cpp
View file

@ -52,6 +52,7 @@ void browseFAQ(NLMISC::CConfigFile &cf)
}
}
}
if (url.empty())
{
// not found

31
code/ryzom/client/src/client_cfg.cpp
View file

@ -325,13 +325,9 @@ CClientConfig::CClientConfig()
TexturesLoginInterface.push_back("texture_interfaces_v3_login");
DisplayAccountButtons = true;
CreateAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=register";
ConditionsTermsURL = "http://www.gnu.org/licenses/agpl-3.0.html";
EditAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=settings";
BetaAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=settings";
ForgetPwdURL = "http://shard.ryzomcore.org/ams/index.php?page=forgot_password";
FreeTrialURL = "http://shard.ryzomcore.org/ams/index.php?page=register";
LoginSupportURL = "http://shard.ryzomcore.org/ams/index.php";
CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";
EditAccountURL = "https://secure.ryzom.com/payment_profile/index.php";
ForgetPwdURL = "https://secure.ryzom.com/payment_profile/lost_secure_password.php";
Position = CVector(0.f, 0.f, 0.f); // Default Position.
Heading = CVector(0.f, 1.f, 0.f); // Default Heading.
EyesHeight = 1.5f; // Default User Eyes Height.
@ -426,7 +422,7 @@ CClientConfig::CClientConfig()
PatchVersion.clear();
PatchServer.clear();
WebIgMainDomain = "shard.ryzomcore.org";
WebIgMainDomain = "atys.ryzom.com";
WebIgTrustedDomains.push_back(WebIgMainDomain);
CurlMaxConnections = 2;
@ -875,18 +871,12 @@ void CClientConfig::setValues()
READ_BOOL_DEV(DisplayAccountButtons)
READ_STRING_DEV(CreateAccountURL)
READ_STRING_DEV(EditAccountURL)
READ_STRING_DEV(ConditionsTermsURL)
READ_STRING_DEV(BetaAccountURL)
READ_STRING_DEV(ForgetPwdURL)
READ_STRING_DEV(BetaAccountURL)
READ_STRING_DEV(FreeTrialURL)
READ_STRING_DEV(LoginSupportURL)
READ_STRING_FV(CreateAccountURL)
READ_STRING_FV(EditAccountURL)
// defined in client_default.cfg
READ_STRING_FV(ConditionsTermsURL)
READ_STRING_FV(BetaAccountURL)
READ_STRING_FV(ForgetPwdURL)
READ_STRING_FV(FreeTrialURL)
READ_STRING_FV(LoginSupportURL)
#ifndef RZ_NO_CLIENT
@ -1054,18 +1044,11 @@ void CClientConfig::setValues()
/////////////////////////
// NEW PATCHING SYSTEM //
READ_BOOL_FV(PatchWanted)
READ_STRING_FV(PatchServer)
READ_STRING_FV(PatchUrl)
READ_STRING_FV(PatchVersion)
READ_STRING_FV(RingReleaseNotePath)
READ_STRING_FV(ReleaseNotePath)
READ_BOOL_DEV(PatchWanted)
READ_STRING_DEV(PatchServer)
READ_STRING_DEV(PatchUrl)
READ_STRING_DEV(PatchVersion)
READ_STRING_DEV(RingReleaseNotePath)
READ_STRING_DEV(ReleaseNotePath)
READ_STRING_FV(PatchServer)
/////////////////////////
// NEW PATCHLET SYSTEM //

10
code/ryzom/client/src/init_main_loop.cpp
View file

@ -183,8 +183,8 @@ struct CStatThread : public NLMISC::IRunnable
if(!curl) return;
curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
// curl_easy_setopt(curl, CURLOPT_USERAGENT, "unknown");
curl_easy_setopt(curl, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)"); // FIXME
curl_easy_setopt(curl, CURLOPT_REFERER, string("http://www.ryzomcore.org/" + referer).c_str());
curl_easy_setopt(curl, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)");
curl_easy_setopt(curl, CURLOPT_REFERER, string("http://www.ryzom.com/" + referer).c_str());
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
CURLcode res = curl_easy_perform(curl);
curl_easy_cleanup(curl);
@ -239,7 +239,7 @@ struct CStatThread : public NLMISC::IRunnable
addParam(params, "page", "");
addParam(params, "pagetitle", referer);
addParam(params, "screen", toString("%dx%d", ClientCfg.ConfigFile.getVar("Width").asInt(), ClientCfg.ConfigFile.getVar("Height").asInt()));
addParam(params, "referer", "http%3A%2F%2Fwww.ryzomcore.org%2F" + referer);
addParam(params, "referer", "http%3A%2F%2Fwww.ryzom.com%2F" + referer);
time_t rawtime;
struct tm * timeinfo;
char buffer [80];
@ -262,7 +262,7 @@ struct CStatThread : public NLMISC::IRunnable
default: shard= "unknown"; break;
}
addParam(params, "cv_Shard", shard);
/* get("http://ryzom.com.woopra-ns.com/visit/" + params); */// FIXME
get("http://ryzom.com.woopra-ns.com/visit/"+params);
return true;
}
@ -272,7 +272,7 @@ struct CStatThread : public NLMISC::IRunnable
std::string params;
addParam(params, "cookie", cookie());
addParam(params, "ra", randomString());
/* get("http://ryzom.com.woopra-ns.com/ping/" + params); */// FIXME
get("http://ryzom.com.woopra-ns.com/ping/"+params);
}
void run()

30
code/ryzom/client/src/login.cpp
View file

@ -1085,7 +1085,7 @@ void initShardDisplay()
for (uint fff = 0; fff < 20; ++fff)
{
CShard s ( toString("%05d",fff), fff%3, fff+32, toString("%s%d","pipo",fff),
32*fff%46546, "32.32.32.32", "http://www.ryzomcore.org" );
32*fff%46546, "32.32.32.32", "http://www.ryzom.com" );
Shards.push_back(s);
}*/
@ -1212,7 +1212,7 @@ void onlogin(bool vanishScreen = true)
// for (uint fff = 0; fff < 20; ++fff)
// {
// CShard s ( toString("%05d",fff), fff%3, fff+32, toString("%s%d","pipo",fff),
// 32*fff%46546, "32.32.32.32", "http://www.ryzomcore.org" );
// 32*fff%46546, "32.32.32.32", "http://www.ryzom.com" );
// Shards.push_back(s);
// }*/
//
@ -1910,16 +1910,30 @@ class CAHOpenURL : public IActionHandler
return;
}
// modify existing languages
// old site
string::size_type pos_lang = url.find("/en/");
if(pos_lang!=string::npos)
url.replace(pos_lang+1, 2, ClientCfg.getHtmlLanguageCode());
// or new forums
if (pos_lang == string::npos)
pos_lang = url.find("=en#");
if(url.find('?')!=string::npos)
url += "&";
if (pos_lang != string::npos)
{
url.replace(pos_lang + 1, 2, ClientCfg.getHtmlLanguageCode());
}
else
url += "?";
url += "language=" + ClientCfg.LanguageCode;
{
// append language
if (url.find('?') != string::npos)
url += "&";
else
url += "?";
url += "language=" + ClientCfg.LanguageCode;
}
openURL(url.c_str());
nlinfo("openURL %s", url.c_str());

2
code/ryzom/client/src/release.cpp
View file

@ -667,7 +667,7 @@ void release()
#if FINAL_VERSION
// openURL ("http://www.ryzomcore.org/exit/");
// openURL ("http://ryzom.com/exit/");
#endif
}// release //

5
code/ryzom/common/src/game_share/ryzom_version.h
View file

@ -17,10 +17,7 @@
#ifndef RYZOM_VERSION_H
#define RYZOM_VERSION_H
#define RYZOM_VERSION "ryzomcore" \
"/" \
"v0.12.0" \
"-dev"
#define RYZOM_VERSION "2.1.0"
#endif // RYZOM_VERSION_H

2
code/ryzom/common/src/game_share/scenario_entry_points.cpp
View file

@ -57,7 +57,7 @@ CScenarioEntryPoints::CScenarioEntryPoints()
void CScenarioEntryPoints::init()
{
_CompleteIslandsFilename = "r2_islands.xml";
_EntryPointsFilename = "r2_entry_points.txt";
_EntryPointsFilename = "ring_map_entry_ponts.txt";
}
//-----------------------------------------------------------------------------

6
code/ryzom/tools/translation/5_make_words_diff.bat Normal file
View file

@ -0,0 +1,6 @@
@echo off
echo Generating words diff...
bin\translation_tools make_words_diff
echo Done.
pause

6
code/ryzom/tools/translation/6_merge_words_diff.bat Normal file
View file

@ -0,0 +1,6 @@
@echo off
echo Merging words diff...
bin\translation_tools merge_words_diff
echo Done.
pause

16
code/ryzom/tools/translation/7_install_translation.bat Normal file
View file

@ -0,0 +1,16 @@
@echo off
echo Installing translation file into ryzom...
REM Copy translated files in client directory...
xcopy /Y translated\*.uxt ..\..\client\data\gamedev\language\
xcopy /Y translated\skill_*.txt ..\..\client\data\gamedev\language\
xcopy /Y translated\item_*.txt ..\..\client\data\gamedev\language\
xcopy /Y translated\creature_*.txt ..\..\client\data\gamedev\language\
xcopy /Y translated\sbrick_*.txt ..\..\client\data\gamedev\language\
xcopy /Y translated\sphrase_*.txt ..\..\client\data\gamedev\language\
xcopy /Y translated\place_*.txt ..\..\client\data\gamedev\language\
xcopy /Y translated\faction_*.txt ..\..\client\data\gamedev\language\
xcopy /Y translated\title_*.txt ..\..\client\data\gamedev\language\
xcopy /Y translated\outpost_*.txt ..\..\client\data\gamedev\language\
echo Done.

6
code/ryzom/tools/translation/AA_clean_string_diff.bat Normal file
View file

@ -0,0 +1,6 @@
@echo off
echo Cleaning string diff...
bin\translation_tools clean_string_diff
echo Done.
pause

6
code/ryzom/tools/translation/A_make_string_diff.bat Normal file
View file

@ -0,0 +1,6 @@
@echo off
echo Generating string diff...
bin\translation_tools make_string_diff
echo Done.
pause

6
code/ryzom/tools/translation/B_merge_string_diff.bat Normal file
View file

@ -0,0 +1,6 @@
@echo off
echo Merging string diff...
bin\translation_tools merge_string_diff
echo Done.
pause

0
code/ryzom/tools/translation/bin/put_translation_tools_here.tag Normal file
View file

0
code/ryzom/tools/translation/diff/do_not_remove.tag Normal file
View file

0
code/ryzom/tools/translation/history/do_not_remove_this_file.txt Normal file
View file

6
code/ryzom/tools/translation/languages.txt Normal file
View file

@ -0,0 +1,6 @@
wk
fr
en
de
ru
es

24
code/ryzom/tools/translation/readme.txt Normal file
View file

@ -0,0 +1,24 @@
Please don't update files in "translated" directly!
First, be sure you put "translation_tools" in "bin" directory.
How to update translations in UXT files :
1. Update original texts in "work/wk.uxt"
2. Launch A_make_string_diff script
3. Open files in "diff" directory
4. Replace original text with translation between [ and ]
5. The 2 last lines : // REMOVE THE FOLOWING LINE WHEN TRANSLATION IS DONE and // DIFF NOT TRANSLATED
6. Save files
7. Launch AA_clean_string_diff to delete translations help (old values)
8. Launch B_merge_string_diff to merge your translations in "translated"
How to update translations in words files :
1. Update original texts in "work" directory
2. Launch 5_make_words_diff script
3. Open files in "diff" directory
4. Replace original text with translation (separators are <tab>)
5. The 2 last lines : REMOVE THE FOLOWING TWO LINE WHEN TRANSLATION IS DONE and DIFF NOT TRANSLATED
6. Save files
7. Launch 6_merge_words_diff to merge your translations in "translated"

BIN
code/ryzom/tools/translation/translated/bodypart_words_de.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/bodypart_words_en.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/bodypart_words_es.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/bodypart_words_fr.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/bodypart_words_ru.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/bodypart_words_wk.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/career_words_de.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/career_words_en.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/career_words_es.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/career_words_fr.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/career_words_ru.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/career_words_wk.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/characteristic_words_de.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/characteristic_words_en.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/characteristic_words_es.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/characteristic_words_fr.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/characteristic_words_ru.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/characteristic_words_wk.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/classificationtype_words_de.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/classificationtype_words_en.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/classificationtype_words_es.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/classificationtype_words_fr.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/classificationtype_words_ru.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/classificationtype_words_wk.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/creature_words_de.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/creature_words_en.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/creature_words_es.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/creature_words_fr.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/creature_words_ru.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/creature_words_wk.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/damage_words_de.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/damage_words_en.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/damage_words_fr.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/damage_words_ru.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/damagetype_words_de.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/damagetype_words_en.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/damagetype_words_es.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/damagetype_words_fr.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/damagetype_words_ru.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/damagetype_words_wk.txt Normal file
View file

Binary file not shown.

27233
code/ryzom/tools/translation/translated/de.uxt Normal file
View file

File diff suppressed because it is too large Load diff

BIN
code/ryzom/tools/translation/translated/ecosystem_words_de.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/ecosystem_words_en.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/ecosystem_words_es.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/ecosystem_words_fr.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/ecosystem_words_ru.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/ecosystem_words_wk.txt Normal file
View file

Binary file not shown.

27215
code/ryzom/tools/translation/translated/en.uxt Normal file
View file

File diff suppressed because it is too large Load diff

27259
code/ryzom/tools/translation/translated/es.uxt Normal file
View file

File diff suppressed because it is too large Load diff

BIN
code/ryzom/tools/translation/translated/faction_words_de.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/faction_words_en.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/faction_words_es.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/faction_words_fr.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/faction_words_ru.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/faction_words_wk.txt Normal file
View file

Binary file not shown.

27216
code/ryzom/tools/translation/translated/fr.uxt Normal file
View file

File diff suppressed because it is too large Load diff

BIN
code/ryzom/tools/translation/translated/item_words_de.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/item_words_en.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/item_words_es.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/item_words_fr.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/item_words_ru.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/item_words_wk.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/job_words_de.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/job_words_en.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/job_words_es.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/job_words_fr.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/job_words_ru.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/job_words_wk.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/outpost_words_de.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/outpost_words_en.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/outpost_words_es.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/outpost_words_fr.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/outpost_words_ru.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/outpost_words_wk.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/place_words_de.txt Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/translation/translated/place_words_en.txt Normal file
View file

Binary file not shown.

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