From 60d59a2300c136808bbb8277ebf1ab142b9c1f7a Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 25 Apr 2014 12:00:29 +0200 Subject: [PATCH 1/8] 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 2/8] 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 5/8] 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 6/8] 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 7/8] 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 8/8] 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"; } //-----------------------------------------------------------------------------