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; diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt index c20d9d0dc..9e5b23461 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/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp index c687c10a5..f766e0606 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"; - 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"; + 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. @@ -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 // 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