From 60d59a2300c136808bbb8277ebf1ab142b9c1f7a Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 25 Apr 2014 12:00:29 +0200 Subject: [PATCH 01/24] Changed: Official Ryzom URLs --- code/ryzom/client/src/client_cfg.cpp | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp index a42c7988b..bb837b03b 100644 --- a/code/ryzom/client/src/client_cfg.cpp +++ b/code/ryzom/client/src/client_cfg.cpp @@ -327,13 +327,13 @@ CClientConfig::CClientConfig() TexturesLoginInterface.push_back("texture_interfaces_v3_login"); DisplayAccountButtons = true; - CreateAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=register"; + CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php"; ConditionsTermsURL = "https://secure.ryzom.com/signup/terms_of_use.php"; - EditAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=settings"; + EditAccountURL = "https://secure.ryzom.com/payment_profile/index.php"; BetaAccountURL = "http://www.ryzom.com/profile"; - ForgetPwdURL = "http://shard.ryzomcore.org/ams/index.php?page=forgot_password"; + ForgetPwdURL = "https://secure.ryzom.com/payment_profile/lost_secure_password.php"; FreeTrialURL = "http://www.ryzom.com/join/?freetrial=1"; - LoginSupportURL = "http://shard.ryzomcore.org/ams/index.php"; + LoginSupportURL = "http://www.ryzom.com/en/support.html"; 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. @@ -889,14 +889,6 @@ void CClientConfig::setValues() READ_STRING_DEV(FreeTrialURL) READ_STRING_DEV(LoginSupportURL) - READ_STRING_FV(CreateAccountURL) - READ_STRING_FV(EditAccountURL) - READ_STRING_FV(ConditionsTermsURL) - READ_STRING_FV(BetaAccountURL) - READ_STRING_FV(ForgetPwdURL) - READ_STRING_FV(FreeTrialURL) - READ_STRING_FV(LoginSupportURL) - #ifndef RZ_NO_CLIENT // if cookie is not empty, it means that the client was launch // by the nel_launcher, so it can't be local @@ -1059,18 +1051,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 // From 0083870c8a1b6b9ca733a20ce6b71653e75bea45 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 30 Apr 2014 09:30:32 +0200 Subject: [PATCH 02/24] Changed: Updated client_default.cfg to official client one --- code/ryzom/client/client_default.cfg | 28 ++++++++------------ code/ryzom/client/client_default.cfg.in | 34 ++++++++++--------------- 2 files changed, 23 insertions(+), 39 deletions(-) diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg index a27e69ee0..e4b9b3ee9 100644 --- a/code/ryzom/client/client_default.cfg +++ b/code/ryzom/client/client_default.cfg @@ -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,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"; +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 = "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 = "http://shard.ryzom.com:50000/stats/stats.php"; +CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php"; +InstallWebPage = "http://dl.ryzom.com/installer/"; //////////////// @@ -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"; @@ -333,7 +324,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" }; diff --git a/code/ryzom/client/client_default.cfg.in b/code/ryzom/client/client_default.cfg.in index 030a4a2b2..b7c4f2552 100644 --- a/code/ryzom/client/client_default.cfg.in +++ b/code/ryzom/client/client_default.cfg.in @@ -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"; @@ -477,7 +472,7 @@ XMLR2EDInterfaceFiles = { "r2ed.xml", "r2_triggers.xml", - "r2_logic_entities.xml", + "r2_logic_entities.xml", "r2ed_acts.xml", "r2ed_scenario.xml", "r2ed_connect.xml" @@ -561,14 +556,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; From d666ec71f4c1914d7c07d1326af12af2269afde1 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 13 May 2014 10:02:32 +0200 Subject: [PATCH 05/24] Changed: Set official Ryzom client version and identifiers for OS X bundle --- code/ryzom/client/src/CMakeLists.txt | 19 +++++++++++++------ .../common/src/game_share/ryzom_version.h | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt index 1fc53145b..0bba39d56 100644 --- a/code/ryzom/client/src/CMakeLists.txt +++ b/code/ryzom/client/src/CMakeLists.txt @@ -48,12 +48,19 @@ 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") + + 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) @@ -116,7 +123,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) diff --git a/code/ryzom/common/src/game_share/ryzom_version.h b/code/ryzom/common/src/game_share/ryzom_version.h index 2dfdca48e..7bc654d3a 100644 --- a/code/ryzom/common/src/game_share/ryzom_version.h +++ b/code/ryzom/common/src/game_share/ryzom_version.h @@ -17,7 +17,7 @@ #ifndef RYZOM_VERSION_H #define RYZOM_VERSION_H -#define RYZOM_VERSION "RYZOM CORE" +#define RYZOM_VERSION "2.1.0" #endif // RYZOM_VERSION_H From 7e7e15ebb6cab10b6e84013482aaa51dc7ca7530 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 12 Sep 2014 11:19:33 +0200 Subject: [PATCH 06/24] Backed out changeset: cd8e80e4b0d6 --- code/ryzom/client/src/browse_faq.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/code/ryzom/client/src/browse_faq.cpp b/code/ryzom/client/src/browse_faq.cpp index 8311087eb..9f8fcd9b0 100644 --- a/code/ryzom/client/src/browse_faq.cpp +++ b/code/ryzom/client/src/browse_faq.cpp @@ -49,11 +49,19 @@ void browseFAQ(NLMISC::CConfigFile &cf) } if (url.empty()) { - // not found - nlwarning("No FAQ url"); - } - else - { - openURL(url.c_str()); + // not found ? rely on hardcoded stuff + if (nlstricmp(languageCode, "fr") == 0) + { + url = "http://forums.ryzom.com/forum/showthread.php?t=29130"; + } + else if (nlstricmp(languageCode, "de") == 0) + { + url = "http://forums.ryzom.com/forum/showthread.php?t=29131"; + } + else + { + url = "http://forums.ryzom.com/forum/showthread.php?t=29129"; + } } + openURL(url.c_str()); } From 13cddfe2c7779d7bf88f8727e08163423b934c09 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 12 Sep 2014 11:20:36 +0200 Subject: [PATCH 07/24] Backed out changeset: eae58a811aa5 --- code/ryzom/client/src/client_cfg.cpp | 6 +++--- code/ryzom/client/src/init_main_loop.cpp | 10 +++++----- code/ryzom/client/src/login.cpp | 4 ++-- code/ryzom/client/src/release.cpp | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp index f766e0606..bb837b03b 100644 --- a/code/ryzom/client/src/client_cfg.cpp +++ b/code/ryzom/client/src/client_cfg.cpp @@ -433,11 +433,11 @@ CClientConfig::CClientConfig() PatchVersion.clear(); PatchServer.clear(); - WebIgMainDomain = "shard.ryzomcore.org"; + WebIgMainDomain = "atys.ryzom.com"; WebIgTrustedDomains.push_back(WebIgMainDomain); - RingReleaseNotePath = "http://" + WebIgMainDomain + "/releasenotes_ring/index.php"; - ReleaseNotePath = "http://" + WebIgMainDomain + "/releasenotes/index.php"; + RingReleaseNotePath = "http://"+WebIgMainDomain+"/releasenotes_ring/index.php"; + ReleaseNotePath = "http://"+WebIgMainDomain+"/releasenotes/index.php"; /////////////// diff --git a/code/ryzom/client/src/init_main_loop.cpp b/code/ryzom/client/src/init_main_loop.cpp index 60f4fedb9..b251689ea 100644 --- a/code/ryzom/client/src/init_main_loop.cpp +++ b/code/ryzom/client/src/init_main_loop.cpp @@ -176,8 +176,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); @@ -232,7 +232,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]; @@ -255,7 +255,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; } @@ -265,7 +265,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() diff --git a/code/ryzom/client/src/login.cpp b/code/ryzom/client/src/login.cpp index 210afcea9..45e3fea51 100644 --- a/code/ryzom/client/src/login.cpp +++ b/code/ryzom/client/src/login.cpp @@ -1084,7 +1084,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); }*/ @@ -1211,7 +1211,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); // }*/ // diff --git a/code/ryzom/client/src/release.cpp b/code/ryzom/client/src/release.cpp index 722cbfe57..b40d68b35 100644 --- a/code/ryzom/client/src/release.cpp +++ b/code/ryzom/client/src/release.cpp @@ -655,7 +655,7 @@ void release() #if FINAL_VERSION - // openURL ("http://www.ryzomcore.org/exit/"); + // openURL ("http://ryzom.com/exit/"); #endif }// release // From 2eabeb234e66187c3f5a423a4271ed560f251bcd Mon Sep 17 00:00:00 2001 From: kaetemi Date: Sat, 13 Sep 2014 10:08:44 +0200 Subject: [PATCH 08/24] File name, fix #202 --- code/ryzom/common/src/game_share/scenario_entry_points.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ryzom/common/src/game_share/scenario_entry_points.cpp b/code/ryzom/common/src/game_share/scenario_entry_points.cpp index 7c01af145..e32778089 100644 --- a/code/ryzom/common/src/game_share/scenario_entry_points.cpp +++ b/code/ryzom/common/src/game_share/scenario_entry_points.cpp @@ -57,7 +57,7 @@ CScenarioEntryPoints::CScenarioEntryPoints() void CScenarioEntryPoints::init() { _CompleteIslandsFilename = "r2_islands.xml"; - _EntryPointsFilename = "r2_entry_points.txt"; + _EntryPointsFilename = "ring_map_entry_ponts.txt"; } //----------------------------------------------------------------------------- From 74864831272b9b4b0c489b18b9efe0734a5694af Mon Sep 17 00:00:00 2001 From: dfighter1985 Date: Sun, 21 Dec 2014 22:55:27 +0100 Subject: [PATCH 09/24] CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219. --- code/nel/include/nel/gui/ctrl_text_button.h | 1 + code/nel/src/gui/ctrl_text_button.cpp | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/code/nel/include/nel/gui/ctrl_text_button.h b/code/nel/include/nel/gui/ctrl_text_button.h index d2b49ffa9..4f5251a8b 100644 --- a/code/nel/include/nel/gui/ctrl_text_button.h +++ b/code/nel/include/nel/gui/ctrl_text_button.h @@ -51,6 +51,7 @@ namespace NLGUI // Init part virtual bool parse (xmlNodePtr cur,CInterfaceGroup * parentGroup); + virtual void checkCoords(); virtual void updateCoords(); virtual uint32 getMemory() { return (uint32)(sizeof(*this)+_Id.size()); } diff --git a/code/nel/src/gui/ctrl_text_button.cpp b/code/nel/src/gui/ctrl_text_button.cpp index cdf9ea0d2..2fb19a9fc 100644 --- a/code/nel/src/gui/ctrl_text_button.cpp +++ b/code/nel/src/gui/ctrl_text_button.cpp @@ -868,6 +868,15 @@ namespace NLGUI } } + // *************************************************************************** + void CCtrlTextButton::checkCoords() + { + if( _ViewText != NULL ) + _ViewText->checkCoords(); + + CCtrlBaseButton::checkCoords(); + } + // *************************************************************************** void CCtrlTextButton::updateCoords() From 1aaff9f1885eb43851272dd37c397c353ee200a8 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Mon, 22 Dec 2014 14:15:38 +0100 Subject: [PATCH 10/24] Move to hotfix: 9878ab4ebe5e --- code/nel/include/nel/gui/ctrl_text_button.h | 1 - code/nel/src/gui/ctrl_text_button.cpp | 9 --------- 2 files changed, 10 deletions(-) diff --git a/code/nel/include/nel/gui/ctrl_text_button.h b/code/nel/include/nel/gui/ctrl_text_button.h index 4f5251a8b..d2b49ffa9 100644 --- a/code/nel/include/nel/gui/ctrl_text_button.h +++ b/code/nel/include/nel/gui/ctrl_text_button.h @@ -51,7 +51,6 @@ namespace NLGUI // Init part virtual bool parse (xmlNodePtr cur,CInterfaceGroup * parentGroup); - virtual void checkCoords(); virtual void updateCoords(); virtual uint32 getMemory() { return (uint32)(sizeof(*this)+_Id.size()); } diff --git a/code/nel/src/gui/ctrl_text_button.cpp b/code/nel/src/gui/ctrl_text_button.cpp index 2fb19a9fc..cdf9ea0d2 100644 --- a/code/nel/src/gui/ctrl_text_button.cpp +++ b/code/nel/src/gui/ctrl_text_button.cpp @@ -868,15 +868,6 @@ namespace NLGUI } } - // *************************************************************************** - void CCtrlTextButton::checkCoords() - { - if( _ViewText != NULL ) - _ViewText->checkCoords(); - - CCtrlBaseButton::checkCoords(); - } - // *************************************************************************** void CCtrlTextButton::updateCoords() From abc6a50c2dda3391e54b80bd9df64d343eca42a7 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 14 Feb 2015 15:09:18 +0100 Subject: [PATCH 11/24] Changed: Added RYZOM_COMPATIBILITY_VERSION version string for compatibility branch --- code/ryzom/common/src/game_share/ryzom_version.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/ryzom/common/src/game_share/ryzom_version.h b/code/ryzom/common/src/game_share/ryzom_version.h index 4fc1d56ad..d9fb89d18 100644 --- a/code/ryzom/common/src/game_share/ryzom_version.h +++ b/code/ryzom/common/src/game_share/ryzom_version.h @@ -17,7 +17,8 @@ #ifndef RYZOM_VERSION_H #define RYZOM_VERSION_H -#define RYZOM_VERSION "2.1.0 (ryzom" \ +#define RYZOM_COMPATIBILITY_VERSION "2.1.0" +#define RYZOM_VERSION RYZOM_COMPATIBILITY_VERSION" (ryzom" \ "/" \ "v0.11.2" \ ")" From ce0ec3b9122d3cf140ac131918d7652a8737b341 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 7 Mar 2015 17:51:12 +0100 Subject: [PATCH 13/24] Changed: Minor changes --- code/ryzom/client/src/client_cfg.cpp | 4 ++-- code/ryzom/client/src/init_main_loop.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp index a1bdc6ce1..b8b236636 100644 --- a/code/ryzom/client/src/client_cfg.cpp +++ b/code/ryzom/client/src/client_cfg.cpp @@ -431,8 +431,8 @@ CClientConfig::CClientConfig() WebIgMainDomain = "atys.ryzom.com"; WebIgTrustedDomains.push_back(WebIgMainDomain); - RingReleaseNotePath = "http://"+WebIgMainDomain+"/releasenotes_ring/index.php"; - ReleaseNotePath = "http://"+WebIgMainDomain+"/releasenotes/index.php"; + RingReleaseNotePath = "http://" + WebIgMainDomain + "/releasenotes_ring/index.php"; + ReleaseNotePath = "http://" + WebIgMainDomain + "/releasenotes/index.php"; /////////////// diff --git a/code/ryzom/client/src/init_main_loop.cpp b/code/ryzom/client/src/init_main_loop.cpp index 192a38c11..852a779de 100644 --- a/code/ryzom/client/src/init_main_loop.cpp +++ b/code/ryzom/client/src/init_main_loop.cpp @@ -185,7 +185,7 @@ struct CStatThread : public NLMISC::IRunnable 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)"); - curl_easy_setopt(curl, CURLOPT_REFERER, string("http://www.ryzom.com/"+referer).c_str()); + 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); @@ -240,7 +240,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.ryzom.com%2F"+referer); + addParam(params, "referer", "http%3A%2F%2Fwww.ryzom.com%2F" + referer); time_t rawtime; struct tm * timeinfo; char buffer [80]; From ff9e70101755b7333047f26c29c765e5247b1ea8 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 31 Oct 2015 16:14:34 +0100 Subject: [PATCH 14/24] Fixed: Use official support URL --- .../data/gamedev/interfaces_v3/help.xml | 63 ++++++++++++------- 1 file changed, 41 insertions(+), 22 deletions(-) diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/help.xml b/code/ryzom/client/data/gamedev/interfaces_v3/help.xml index edfb8c19e..39cfb1af4 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/help.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/help.xml @@ -863,10 +863,8 @@ - + value="http://app.ryzom.com/ticket_system/index.php?mode=load" /> - - - - - - + + + + + + + + From acec665b40f51f6d0de37ad4794e9bc82a140f49 Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 5 Nov 2015 17:42:43 +0100 Subject: [PATCH 15/24] Changed: Revert back to official client version (revision will be displayed in Ryzom Core client) --- code/ryzom/common/src/game_share/ryzom_version.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/ryzom/common/src/game_share/ryzom_version.h b/code/ryzom/common/src/game_share/ryzom_version.h index 50decd298..d83389cf4 100644 --- a/code/ryzom/common/src/game_share/ryzom_version.h +++ b/code/ryzom/common/src/game_share/ryzom_version.h @@ -17,11 +17,7 @@ #ifndef RYZOM_VERSION_H #define RYZOM_VERSION_H -#define RYZOM_COMPATIBILITY_VERSION "2.1.0" -#define RYZOM_VERSION RYZOM_COMPATIBILITY_VERSION" (ryzom" \ - "/" \ - "v0.12.0" \ - "-dev)" +#define RYZOM_VERSION "2.1.0" #endif // RYZOM_VERSION_H From 5efa005715655ef49649c296c5a38fe70922a2e4 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 7 Nov 2015 14:57:43 +0100 Subject: [PATCH 16/24] Fixed: Add revision in Info.plist for long version --- code/ryzom/client/src/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt index b9747eb0f..ccfa52620 100644 --- a/code/ryzom/client/src/CMakeLists.txt +++ b/code/ryzom/client/src/CMakeLists.txt @@ -50,6 +50,11 @@ if(APPLE) 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() From e0ca13b55099c1e673c619665f4c5752b81bb238 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 7 Nov 2015 15:56:47 +0100 Subject: [PATCH 17/24] Added: Steam OS X script installscript_osx.vdf --- .../ryzom/client/macosx/installscript_osx.vdf | 21 +++++++++++++++++++ code/ryzom/client/src/CMakeLists.txt | 1 + 2 files changed, 22 insertions(+) create mode 100644 code/ryzom/client/macosx/installscript_osx.vdf diff --git a/code/ryzom/client/macosx/installscript_osx.vdf b/code/ryzom/client/macosx/installscript_osx.vdf new file mode 100644 index 000000000..4eeace98b --- /dev/null +++ b/code/ryzom/client/macosx/installscript_osx.vdf @@ -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" + } + } +} + diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt index ccfa52620..9c9724383 100644 --- a/code/ryzom/client/src/CMakeLists.txt +++ b/code/ryzom/client/src/CMakeLists.txt @@ -82,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}) From fb124d9fbc9aa07be9166e688d46a403c64b6385 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 7 Nov 2015 15:57:38 +0100 Subject: [PATCH 18/24] Changed: Updated default settings for official client --- code/ryzom/client/client_default.cfg | 44 ++++++++++++++-------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg index a26f80d30..58ecf36a5 100644 --- a/code/ryzom/client/client_default.cfg +++ b/code/ryzom/client/client_default.cfg @@ -15,9 +15,9 @@ 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 = 0; -Width = 1024; -Height = 768; +FullScreen = 1; +Width = 0; +Height = 0; PositionX = 0; PositionY = 0; Frequency = 60; @@ -121,24 +121,24 @@ AutoEquipTool = 1; // *** 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; +LandscapeTileNear = 150.000000; +LandscapeTileNear_min = 20.000000; +LandscapeTileNear_max = 250.000000; +LandscapeTileNear_step = 10.0; +LandscapeTileNear_ps0 = 20.0; +LandscapeTileNear_ps1 = 100.0; +LandscapeTileNear_ps2 = 150.0; +LandscapeTileNear_ps3 = 200.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; +LandscapeThreshold = 2000.0; +LandscapeThreshold_min = 100.0; // Low quality => 0.01 threshold +LandscapeThreshold_max = 4000.0; // High quality => 0.0005 threshold +LandscapeThreshold_step = 100.0; +LandscapeThreshold_ps0 = 100.0; +LandscapeThreshold_ps1 = 1000.0; +LandscapeThreshold_ps2 = 2000.0; +LandscapeThreshold_ps3 = 3000.0; Vision = 500.000000; Vision_min = 200.000000; @@ -211,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; @@ -271,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. @@ -345,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 From 35ee674ac80961ac695b4ac20eb192839301c12c Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 8 Nov 2015 14:21:26 +0100 Subject: [PATCH 19/24] Changed: Remove hardcoded FAQ URLs --- code/ryzom/client/src/browse_faq.cpp | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/code/ryzom/client/src/browse_faq.cpp b/code/ryzom/client/src/browse_faq.cpp index 1f345f0af..cdf830fe8 100644 --- a/code/ryzom/client/src/browse_faq.cpp +++ b/code/ryzom/client/src/browse_faq.cpp @@ -52,21 +52,14 @@ void browseFAQ(NLMISC::CConfigFile &cf) } } } + if (url.empty()) { - // not found ? rely on hardcoded stuff - if (nlstricmp(languageCode, "fr") == 0) - { - url = "http://forums.ryzom.com/forum/showthread.php?t=29130"; - } - else if (nlstricmp(languageCode, "de") == 0) - { - url = "http://forums.ryzom.com/forum/showthread.php?t=29131"; - } - else - { - url = "http://forums.ryzom.com/forum/showthread.php?t=29129"; - } + // not found + nlwarning("No FAQ url"); + } + else + { + openURL(url.c_str()); } - openURL(url.c_str()); } From a2691e03d4eb9829ebbc494df713965cc8691071 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 8 Nov 2015 14:47:56 +0100 Subject: [PATCH 20/24] Changed: Support new forums URLs --- code/ryzom/client/src/login.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/code/ryzom/client/src/login.cpp b/code/ryzom/client/src/login.cpp index ee8224d08..16cf5d17a 100644 --- a/code/ryzom/client/src/login.cpp +++ b/code/ryzom/client/src/login.cpp @@ -1910,16 +1910,26 @@ 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) + if (pos_lang != string::npos) + url.replace(pos_lang + 1, 2, ClientCfg.getHtmlLanguageCode()); + + // append language + if (url.find('?') != string::npos) url += "&"; else url += "?"; + url += "language=" + ClientCfg.LanguageCode; + openURL(url.c_str()); nlinfo("openURL %s", url.c_str()); From fd321350724186b006810c158d7647eaeb191bba Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 9 Nov 2015 10:04:43 +0100 Subject: [PATCH 21/24] Changed: Removed unused/invalid URLs and updated some of them --- code/ryzom/client/client_default.cfg | 10 ++++++---- code/ryzom/client/src/client_cfg.cpp | 12 +++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg index 58ecf36a5..a433cf318 100644 --- a/code/ryzom/client/client_default.cfg +++ b/code/ryzom/client/client_default.cfg @@ -42,12 +42,12 @@ Gamma_max = 1.0; Application = { "ryzom_live", "./client_ryzom_r.exe", "./" }; BackgroundDownloader = 0; 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://shard.ryzom.com:50000/stats/stats.php"; -CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php"; -InstallWebPage = "http://dl.ryzom.com/installer/"; + +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"; //////////////// @@ -559,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"; diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp index 59db73dc9..7cb3d41b6 100644 --- a/code/ryzom/client/src/client_cfg.cpp +++ b/code/ryzom/client/src/client_cfg.cpp @@ -326,12 +326,8 @@ CClientConfig::CClientConfig() DisplayAccountButtons = true; CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php"; - ConditionsTermsURL = "https://secure.ryzom.com/signup/terms_of_use.php"; EditAccountURL = "https://secure.ryzom.com/payment_profile/index.php"; - BetaAccountURL = "http://www.ryzom.com/profile"; ForgetPwdURL = "https://secure.ryzom.com/payment_profile/lost_secure_password.php"; - FreeTrialURL = "http://www.ryzom.com/join/?freetrial=1"; - LoginSupportURL = "http://www.ryzom.com/en/support.html"; 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. @@ -876,11 +872,13 @@ 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) + + // defined in client_default.cfg + READ_STRING_FV(ConditionsTermsURL) + READ_STRING_FV(LoginSupportURL) #ifndef RZ_NO_CLIENT // if cookie is not empty, it means that the client was launch From 0a60387a928c04392c9c1a64ba57906089f931da Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 9 Nov 2015 10:05:39 +0100 Subject: [PATCH 22/24] Changed: Frequency to 0 to enable automatic detection --- code/ryzom/client/client_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg index a433cf318..39be8e0f7 100644 --- a/code/ryzom/client/client_default.cfg +++ b/code/ryzom/client/client_default.cfg @@ -20,7 +20,7 @@ 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 From 8a137088ba2375a372483be21c1c5677ac31edc6 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 9 Nov 2015 12:48:07 +0100 Subject: [PATCH 23/24] Fixed: Wrong comparison --- code/ryzom/client/src/login.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ryzom/client/src/login.cpp b/code/ryzom/client/src/login.cpp index 16cf5d17a..4d56a67a7 100644 --- a/code/ryzom/client/src/login.cpp +++ b/code/ryzom/client/src/login.cpp @@ -1919,7 +1919,7 @@ class CAHOpenURL : public IActionHandler if (pos_lang != string::npos) pos_lang = url.find("=en#"); - if (pos_lang != string::npos) + if (pos_lang == string::npos) url.replace(pos_lang + 1, 2, ClientCfg.getHtmlLanguageCode()); // append language From ed50c9b475c8cf88ba3bfdc11cfc225c614eff04 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 11 Nov 2015 16:40:42 +0100 Subject: [PATCH 24/24] Fixed: Bug with language in URLs --- code/ryzom/client/src/login.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/code/ryzom/client/src/login.cpp b/code/ryzom/client/src/login.cpp index 4d56a67a7..153b7ba6a 100644 --- a/code/ryzom/client/src/login.cpp +++ b/code/ryzom/client/src/login.cpp @@ -1916,19 +1916,23 @@ class CAHOpenURL : public IActionHandler string::size_type pos_lang = url.find("/en/"); // or new forums - if (pos_lang != string::npos) + if (pos_lang == string::npos) pos_lang = url.find("=en#"); - if (pos_lang == string::npos) + if (pos_lang != string::npos) + { url.replace(pos_lang + 1, 2, ClientCfg.getHtmlLanguageCode()); - - // append language - if (url.find('?') != string::npos) - url += "&"; + } else - url += "?"; + { + // append language + if (url.find('?') != string::npos) + url += "&"; + else + url += "?"; - url += "language=" + ClientCfg.LanguageCode; + url += "language=" + ClientCfg.LanguageCode; + } openURL(url.c_str());