From 1150cfeb75dbb0ec6be85d7f8683bd3f9c4246fe Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Wed, 30 Apr 2014 09:30:32 +0200
Subject: [PATCH] Changed: Updated client_default.cfg to official client one

--HG--
branch : compatibility
---
 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;