aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-14 19:49:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source
This commit is contained in:
kervala 2015-04-20 13:38:51 +02:00
commit 1baab1ba2d
10 changed files with 72 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@ SaveConfig = 1;
Driver3D="Auto"; // Valid values are "Auto" or "0", "OpengGL" or "1" & "Direct3D" or "2" Driver3D="Auto"; // Valid values are "Auto" or "0", "OpengGL" or "1" & "Direct3D" or "2"
// "Auto" will choose the best suited driver depending on hardware // "Auto" will choose the best suited driver depending on hardware
FullScreen = 1; FullScreen = 0;
Width = 1024; Width = 1024;
Height = 768; Height = 768;
PositionX = 0; PositionX = 0;
@ -39,20 +39,15 @@ Gamma_max = 1.0;
// NETWORK // // NETWORK //
///////////// /////////////
Application = { "ryzom_open", "./client_ryzom_r.exe", "./" }; Application = { "ryzom_live", "./client_ryzom_r.exe", "./" };
BackgroundDownloader = 0; BackgroundDownloader = 0;
PatchServer = ""; PatchServer = "http://dl.ryzom.com/patch_live";
PatchWanted = 0; SignUpURL = "http://www.ryzom.com/subscribe";
SignUpURL = ""; StartupHost = "shard.ryzom.com:40916";
StartupHost = "shard.ryzomcore.org:40916";
StartupPage = "/login/r2_login.php"; StartupPage = "/login/r2_login.php";
InstallStatsUrl = "http://open.ryzom.com:50000/stats/stats.php"; InstallStatsUrl = "http://shard.ryzom.com:50000/stats/stats.php";
CreateAccountURL = "http://shard.ryzomcore.org/ams/?page=register"; CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";
EditAccountURL = "http://shard.ryzomcore.org/ams/?page=settings"; InstallWebPage = "http://dl.ryzom.com/installer/";
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 = "";
//////////////// ////////////////
@ -84,10 +79,6 @@ XMLOutGameInterfaceFiles = {
"out_v2_keys.xml", "out_v2_keys.xml",
}; };
TexturesInterface = "texture_interfaces_v3";
TexturesInterfaceDXTC = "texture_interfaces_dxtc";
// The ligo primitive class file // The ligo primitive class file
LigoPrimitiveClass = "world_editor_classes.xml"; LigoPrimitiveClass = "world_editor_classes.xml";
@ -339,7 +330,8 @@ SoundGameMusicVolume_max = 1.0;
SoundGameMusicVolume_step = 0.001; SoundGameMusicVolume_step = 0.001;
// MISC // MISC
PreDataPath = { "user", "patch", "data", "examples" }; PreDataPath = { "user", "patch", "examples", "data/fonts", "data/gamedev.bnp" };
DataPath = { "data" };
NeedComputeVS = 0; NeedComputeVS = 0;
NegFiltersDebug = {"Update DB", "Reading:", "Read Value :", "impulseCallBack", "CLIMPD:", "LNET" }; NegFiltersDebug = {"Update DB", "Reading:", "Read Value :", "impulseCallBack", "CLIMPD:", "LNET" };
@ -419,7 +411,7 @@ PrintfCommandsFreeTrial = {
DisplayMissingAnimFile = 0; DisplayMissingAnimFile = 0;
LoadingStringCount = 0; LoadingStringCount = 54;
// Some R2 parameters ... // Some R2 parameters ...

34
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" Driver3D="Auto"; // Valid values are "Auto" or "0", "OpengGL" or "1" & "Direct3D" or "2"
// "Auto" will choose the best suited driver depending on hardware // "Auto" will choose the best suited driver depending on hardware
FullScreen = 1; FullScreen = 0;
Width = 1024; Width = 1024;
Height = 768; Height = 768;
PositionX = 0; PositionX = 0;
@ -39,16 +39,15 @@ Gamma_max = 1.0;
// NETWORK // // NETWORK //
///////////// /////////////
Application = { "ryzom_open", "./client_ryzom_r.exe", "./" }; Application = { "ryzom_live", "./client_ryzom_r.exe", "./" };
BackgroundDownloader = 0; BackgroundDownloader = 0;
PatchServer = ""; PatchServer = "http://dl.ryzom.com/patch_live";
PatchWanted = 0; SignUpURL = "http://www.ryzom.com/subscribe";
SignUpURL = ""; StartupHost = "shard.ryzom.com:40916";
StartupHost = "open.ryzom.com:40916";
StartupPage = "/login/r2_login.php"; StartupPage = "/login/r2_login.php";
InstallStatsUrl = "http://open.ryzom.com:50000/stats/stats.php"; InstallStatsUrl = "http://shard.ryzom.com:50000/stats/stats.php";
CreateAccountURL = ""; CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";
InstallWebPage = ""; InstallWebPage = "http://dl.ryzom.com/installer/";
//////////////// ////////////////
@ -80,10 +79,6 @@ XMLOutGameInterfaceFiles = {
"out_v2_keys.xml", "out_v2_keys.xml",
}; };
TexturesInterface = "texture_interfaces_v3";
TexturesInterfaceDXTC = "texture_interfaces_dxtc";
// The ligo primitive class file // The ligo primitive class file
LigoPrimitiveClass = "world_editor_classes.xml"; LigoPrimitiveClass = "world_editor_classes.xml";
@ -483,7 +478,7 @@ XMLR2EDInterfaceFiles =
{ {
"r2ed.xml", "r2ed.xml",
"r2_triggers.xml", "r2_triggers.xml",
"r2_logic_entities.xml", "r2_logic_entities.xml",
"r2ed_acts.xml", "r2ed_acts.xml",
"r2ed_scenario.xml", "r2ed_scenario.xml",
"r2ed_connect.xml" "r2ed_connect.xml"
@ -567,14 +562,11 @@ HelpPages =
"de=http://forums.ryzom.com/forum/showthread.php?t=29131" "de=http://forums.ryzom.com/forum/showthread.php?t=29131"
}; };
WebIgMainDomain = "atys.ryzom.com"; WebIgMainDomain = "app.ryzom.com";
WebIgTrustedDomains = {
WebIgTrustedDomains = "api.ryzom.com", "app.ryzom.com"
{
"atys.ryzom.com"
}; };
PatchletUrl = "http://app.ryzom.com/app_patchlet/index.php?patch=preload";
PatchletUrl = "http://atys.ryzom.com/start/app_patchlet.php?patch=preload";
SelectedSlot = 0; SelectedSlot = 0;

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

@ -47,12 +47,19 @@ SOURCE_GROUP("r2" FILES ${SRC_R2})
# on Mac, create a .App Bundle # on Mac, create a .App Bundle
if(APPLE) 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_ICON_FILE "ryzom.icns")
SET(MACOSX_BUNDLE_GUI_IDENTIFIER "") SET(MACOSX_BUNDLE_GUI_IDENTIFIER "com.winchgate.Ryzom")
SET(MACOSX_BUNDLE_LONG_VERSION_STRING ${NL_VERSION}) SET(MACOSX_BUNDLE_LONG_VERSION_STRING ${RYZOM_VERSION_LONG})
SET(MACOSX_BUNDLE_BUNDLE_NAME "Ryzom Core Client") SET(MACOSX_BUNDLE_BUNDLE_NAME "Ryzom")
SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "0.8") SET(MACOSX_BUNDLE_SHORT_VERSION_STRING ${RYZOM_VERSION_SHORT})
SET(MACOSX_BUNDLE_BUNDLE_VERSION "1.0") SET(MACOSX_BUNDLE_BUNDLE_VERSION "1.0")
SET(MACOSX_BUNDLE_COPYRIGHT "Winchgate and The Ryzom Core Community") SET(MACOSX_BUNDLE_COPYRIGHT "Winchgate and The Ryzom Core Community")
SET(RYZOM_OUTPUT_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${MACOSX_BUNDLE_BUNDLE_NAME}.app) 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}) 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_RUNTIME_FLAGS(ryzom_client)
NL_ADD_LIB_SUFFIX(ryzom_client) NL_ADD_LIB_SUFFIX(ryzom_client)

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

@ -49,11 +49,19 @@ void browseFAQ(NLMISC::CConfigFile &cf)
} }
if (url.empty()) if (url.empty())
{ {
// not found // not found ? rely on hardcoded stuff
nlwarning("No FAQ url"); if (nlstricmp(languageCode, "fr") == 0)
} {
else url = "http://forums.ryzom.com/forum/showthread.php?t=29130";
{ }
openURL(url.c_str()); 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());
} }

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

@ -327,13 +327,13 @@ CClientConfig::CClientConfig()
TexturesLoginInterface.push_back("texture_interfaces_v3_login"); TexturesLoginInterface.push_back("texture_interfaces_v3_login");
DisplayAccountButtons = true; DisplayAccountButtons = true;
CreateAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=register"; CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";
ConditionsTermsURL = "http://www.gnu.org/licenses/agpl-3.0.html"; 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://shard.ryzomcore.org/ams/index.php?page=settings"; 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://shard.ryzomcore.org/ams/index.php?page=register"; 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. Position = CVector(0.f, 0.f, 0.f); // Default Position.
Heading = CVector(0.f, 1.f, 0.f); // Default Heading. Heading = CVector(0.f, 1.f, 0.f); // Default Heading.
EyesHeight = 1.5f; // Default User Eyes Height. EyesHeight = 1.5f; // Default User Eyes Height.
@ -428,7 +428,7 @@ CClientConfig::CClientConfig()
PatchVersion.clear(); PatchVersion.clear();
PatchServer.clear(); PatchServer.clear();
WebIgMainDomain = "shard.ryzomcore.org"; WebIgMainDomain = "atys.ryzom.com";
WebIgTrustedDomains.push_back(WebIgMainDomain); WebIgTrustedDomains.push_back(WebIgMainDomain);
RingReleaseNotePath = "http://" + WebIgMainDomain + "/releasenotes_ring/index.php"; RingReleaseNotePath = "http://" + WebIgMainDomain + "/releasenotes_ring/index.php";
@ -882,14 +882,6 @@ void CClientConfig::setValues()
READ_STRING_DEV(FreeTrialURL) READ_STRING_DEV(FreeTrialURL)
READ_STRING_DEV(LoginSupportURL) 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 #ifndef RZ_NO_CLIENT
// if cookie is not empty, it means that the client was launch // if cookie is not empty, it means that the client was launch
// by the nel_launcher, so it can't be local // by the nel_launcher, so it can't be local
@ -1055,18 +1047,11 @@ void CClientConfig::setValues()
///////////////////////// /////////////////////////
// NEW PATCHING SYSTEM // // NEW PATCHING SYSTEM //
READ_BOOL_FV(PatchWanted) 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(PatchUrl)
READ_STRING_DEV(PatchVersion) READ_STRING_DEV(PatchVersion)
READ_STRING_DEV(RingReleaseNotePath) READ_STRING_DEV(RingReleaseNotePath)
READ_STRING_DEV(ReleaseNotePath) READ_STRING_DEV(ReleaseNotePath)
READ_STRING_FV(PatchServer)
///////////////////////// /////////////////////////
// NEW PATCHLET SYSTEM // // NEW PATCHLET SYSTEM //

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

@ -184,8 +184,8 @@ struct CStatThread : public NLMISC::IRunnable
if(!curl) return; if(!curl) return;
curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1); curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
// curl_easy_setopt(curl, CURLOPT_USERAGENT, "unknown"); // 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_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.ryzomcore.org/" + 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()); curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
CURLcode res = curl_easy_perform(curl); CURLcode res = curl_easy_perform(curl);
curl_easy_cleanup(curl); curl_easy_cleanup(curl);
@ -240,7 +240,7 @@ struct CStatThread : public NLMISC::IRunnable
addParam(params, "page", ""); addParam(params, "page", "");
addParam(params, "pagetitle", referer); addParam(params, "pagetitle", referer);
addParam(params, "screen", toString("%dx%d", ClientCfg.ConfigFile.getVar("Width").asInt(), ClientCfg.ConfigFile.getVar("Height").asInt())); 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; time_t rawtime;
struct tm * timeinfo; struct tm * timeinfo;
char buffer [80]; char buffer [80];
@ -263,7 +263,7 @@ struct CStatThread : public NLMISC::IRunnable
default: shard= "unknown"; break; default: shard= "unknown"; break;
} }
addParam(params, "cv_Shard", shard); 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; return true;
} }
@ -273,7 +273,7 @@ struct CStatThread : public NLMISC::IRunnable
std::string params; std::string params;
addParam(params, "cookie", cookie()); addParam(params, "cookie", cookie());
addParam(params, "ra", randomString()); 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() void run()

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

@ -1085,7 +1085,7 @@ void initShardDisplay()
for (uint fff = 0; fff < 20; ++fff) for (uint fff = 0; fff < 20; ++fff)
{ {
CShard s ( toString("%05d",fff), fff%3, fff+32, toString("%s%d","pipo",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); Shards.push_back(s);
}*/ }*/
@ -1212,7 +1212,7 @@ void onlogin(bool vanishScreen = true)
// for (uint fff = 0; fff < 20; ++fff) // for (uint fff = 0; fff < 20; ++fff)
// { // {
// CShard s ( toString("%05d",fff), fff%3, fff+32, toString("%s%d","pipo",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); // Shards.push_back(s);
// }*/ // }*/
// //

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

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

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

@ -17,10 +17,11 @@
#ifndef RYZOM_VERSION_H #ifndef RYZOM_VERSION_H
#define RYZOM_VERSION_H #define RYZOM_VERSION_H
#define RYZOM_VERSION "ryzomcore" \ #define RYZOM_COMPATIBILITY_VERSION "2.1.0"
#define RYZOM_VERSION RYZOM_COMPATIBILITY_VERSION" (ryzom" \
"/" \ "/" \
"v0.12.0" \ "v0.12.0" \
"-dev" "-dev)"
#endif // RYZOM_VERSION_H #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() void CScenarioEntryPoints::init()
{ {
_CompleteIslandsFilename = "r2_islands.xml"; _CompleteIslandsFilename = "r2_islands.xml";
_EntryPointsFilename = "r2_entry_points.txt"; _EntryPointsFilename = "ring_map_entry_ponts.txt";
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------