From bae7019bc42aa95b3a5a8ba90f520b3053597cdf Mon Sep 17 00:00:00 2001 From: kaetemi Date: Sat, 18 Sep 2021 16:55:39 +0800 Subject: [PATCH] Use client_default from forge data repo --- ryzom/client/client_default.cfg | 154 ++++++++++++++++++-------------- 1 file changed, 85 insertions(+), 69 deletions(-) diff --git a/ryzom/client/client_default.cfg b/ryzom/client/client_default.cfg index b1420b547..473f99a08 100644 --- a/ryzom/client/client_default.cfg +++ b/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 = 0; Height = 0; PositionX = 0; @@ -39,27 +39,42 @@ Gamma_max = 1.0; // NETWORK // ///////////// -Application = { "classic", "./client_ryzom_r.exe", "./" }; +Application = { "ryzom_live", "./client_ryzom_r.exe", "./" }; BackgroundDownloader = 0; -SignUpURL = "https://classic.ryzom.dev/ams/?page=register"; -StartupHost = "https://classic.ryzom.dev"; +StartupHost = "shard.ryzom.com:40916"; StartupPage = "/login/r2_login.php"; StartupVerify = 1; -InstallStatsUrl = "https://classic.ryzom.dev/stats/stats.php"; -CreateAccountURL = "https://classic.ryzom.dev/ams/?page=register"; -EditAccountURL = "https://classic.ryzom.dev/ams/?page=settings"; -ConditionsTermsURL = "http://www.gnu.org/licenses/agpl-3.0.html"; -ForgetPwdURL = "https://classic.ryzom.dev/ams/"; -LoginSupportURL = "https://classic.ryzom.dev/ams/"; -NamingPolicyURL = "https://classic.ryzom.dev/ams/"; -InstallWebPage = "https://classic.ryzom.dev/ams/"; -StreamedPackageHosts = { "https://cdn.ryzom.dev/classic/stream/" }; + +LoginSupportURL = "https://app.ryzom.com/app_forum/index.php?page=topic/view/22047/1&post149889=en#1"; +ConditionsTermsURL = +{ + "fr=https://ryzom.com/fr/terms-of-service", + "en=https://ryzom.com/terms-of-service", + "wk=https://ryzom.com/terms-of-service", + "de=https://ryzom.com/de/terms-of-service", + "es=https://ryzom.com/es/terms-of-service", + "ru=https://ryzom.com/ru/terms-of-service" +}; +NamingPolicyURL = +{ + "fr=https://ryzom.com/fr/terms-of-service#ii-charte-des-noms", + "en=https://ryzom.com/terms-of-service#ii-naming-policy", + "wk=https://ryzom.com/terms-of-service#ii-naming-policy", + "de=https://ryzom.com/de/terms-of-service#ii-namensrichtlinien", + "es=https://ryzom.com/es/terms-of-service#ii-política-de-nombres", + "ru=https://ryzom.com/ru/terms-of-service#ii-политика-именования" +}; + +CreateAccountURL = "https://me.ryzom.com"; +EditAccountURL = "https://me.ryzom.com"; +ForgetPwdURL = "https://me.ryzom.com/?forget_password=1"; // Full path and filename where cURL can find certificate bundle file // cacert.pem file can be downloaded from https://curl.haxx.se/docs/caextract.html // and added to client data path or system specific bundle can be used // Ubuntu has "/etc/ssl/certs/ca-certificates.crt" -// CurlCABundle = "cacert.pem"; +// % = defaultConfigFilePath +CurlCABundle = "%cacert.pem"; //////////////// // INTERFACES // @@ -90,13 +105,13 @@ XMLOutGameInterfaceFiles = { "out_v2_keys.xml", }; -TexturesInterface = "texture_interfaces_v3"; -TexturesInterfaceDXTC = "texture_interfaces_dxtc"; +TexturesInterface = {"texture_interfaces_v3_2x"}; +TexturesInterfaceDXTC = {"texture_interfaces_dxtc_2x"}; // The ligo primitive class file LigoPrimitiveClass = "world_editor_classes.xml"; -VerboseLog = 1; +VerboseLog = 0; /////////// @@ -184,12 +199,12 @@ MicroVegetDensity_ps3 = 100.0; // *** FX FxNbMaxPoly = 20000; FxNbMaxPoly_min = 2000; -FxNbMaxPoly_max = 40000; +FxNbMaxPoly_max = 50000; FxNbMaxPoly_step= 2000; FxNbMaxPoly_ps0 = 2000; -FxNbMaxPoly_ps1 = 12000; +FxNbMaxPoly_ps1 = 10000; FxNbMaxPoly_ps2 = 20000; -FxNbMaxPoly_ps3 = 32000; +FxNbMaxPoly_ps3 = 50000; Cloud = 1; Cloud_ps0 = 0 ; @@ -229,7 +244,7 @@ FXAA_ps3 = 1; AnisotropicFilter = 0; -Bloom = 0; +Bloom = 1; Bloom_ps0 = 0; Bloom_ps1 = 1; Bloom_ps2 = 1; @@ -254,21 +269,21 @@ DensityBloom_ps3 = 255.0; // *** CHARACTERS SkinNbMaxPoly = 100000; SkinNbMaxPoly_min = 5000; -SkinNbMaxPoly_max = 140000; +SkinNbMaxPoly_max = 250000; SkinNbMaxPoly_step = 5000; SkinNbMaxPoly_ps0 = 10000; -SkinNbMaxPoly_ps1 = 60000; +SkinNbMaxPoly_ps1 = 70000; SkinNbMaxPoly_ps2 = 100000; -SkinNbMaxPoly_ps3 = 140000; +SkinNbMaxPoly_ps3 = 200000; -NbMaxSkeletonNotCLod = 60; +NbMaxSkeletonNotCLod = 125; NbMaxSkeletonNotCLod_min = 5; -NbMaxSkeletonNotCLod_max = 120; +NbMaxSkeletonNotCLod_max = 255; NbMaxSkeletonNotCLod_step = 5; NbMaxSkeletonNotCLod_ps0 = 10; -NbMaxSkeletonNotCLod_ps1 = 30; -NbMaxSkeletonNotCLod_ps2 = 60; -NbMaxSkeletonNotCLod_ps3 = 120; +NbMaxSkeletonNotCLod_ps1 = 50; +NbMaxSkeletonNotCLod_ps2 = 125; +NbMaxSkeletonNotCLod_ps3 = 255; CharacterFarClip = 200.0; CharacterFarClip_min = 50.0; @@ -317,7 +332,7 @@ CameraHeight = 2.2; // Camera Height (in meter) from the ground (for the Third CameraDistance = 3.0; // Camera Distance(in meter) from the user (for the Third Person View). CameraDistStep = 1.0; CameraDistMin = 1.0; -CameraDistMax = 5.0; +CameraDistMax = 25.0; CameraAccel = 5.0; CameraSpeedMin = 2.0; CameraSpeedMax = 100.0; @@ -335,7 +350,7 @@ InterfaceScale_step = 0.05; BilinearUI = 1; // Default values for map -MaxMapScale = 2.0; +MaxMapScale = 4.0; R2EDMaxMapScale = 8.0; WindowSnapInvert = 0; @@ -370,7 +385,7 @@ SoundGameMusicVolume_step = 0.001; // MP3 player MediaPlayerDirectory = "music"; -MediaPlayerAutoPlay = false; +MediaPlayerAutoPlay = 0; // MISC PreDataPath = { "user", "patch", "data", "examples" }; @@ -431,31 +446,15 @@ SystemInfoColors = "R2_INVITE","0 255 0 255 around", // Ring invitation }; -PrintfCommands ={ -"634","478","0 0 0 255","24","uiTextCommand1", -"624","428","0 0 0 255","18","uiTextCommand2", -"624","378","0 0 0 255","14","uiTextCommand3", -"644","278","0 0 0 255","18","uiTextCommand4", -"632","480","255 255 255 255","24","uiTextCommand1", -"622","430","255 255 255 255","18","uiTextCommand2", -"622","380","255 255 255 255","14","uiTextCommand3", -"642","280","255 255 255 255","18","uiTextCommand4" -}; - -PrintfCommandsFreeTrial ={ -"634","478","0 0 0 255","24","uiTextCommandFT1", -"634","428","0 0 0 255","12","uiTextCommandFT2", -"634","378","0 0 0 255","12","uiTextCommandFT3", -"684","278","0 0 0 255","10","uiTextCommandFT4", -"632","480","255 255 255 255","24","uiTextCommandFT1", -"632","430","255 255 255 255","12","uiTextCommandFT2", -"632","380","255 255 255 255","12","uiTextCommandFT3", -"682","280","255 255 255 255","10","uiTextCommandFT4" -}; +loadingTexts = { + "0", "132", "30 144 255 255", "18", "uiS2", + "0", "105", "255 188 0 255", "14", "uiS2E0", + "0", "65", "255 255 255 255", "12", "NEWS" +}; DisplayMissingAnimFile = 0; -LoadingStringCount = 0; +LoadingStringCount = 54; // Some R2 parameters ... @@ -466,7 +465,7 @@ R2EDExtendedDebug = 0; R2EDLightPalette = 0; R2ClientGw = "r2linux01"; LoadLuaDebugger = 0; -CheckR2ScenarioMD5 = 0; +CheckR2ScenarioMD5 = 1; LevelDesignEnabled = 0; DmCameraDistMax = 25; @@ -489,6 +488,8 @@ R2EDReloadFiles = { XMLInterfaceFiles = { "config.xml", "widgets.xml", + "webig_widgets.xml", + "appzone.xml", "player.xml", "inventory.xml", "interaction.xml", @@ -514,7 +515,9 @@ XMLInterfaceFiles = { "commands2.xml", "ring_access_point_filter.xml", "ring_window.xml", - "bg_downloader.xml" + "bg_downloader.xml", + "ryzhome_toolbar.xml", + "tp_interface.xml" }; XMLR2EDInterfaceFiles = @@ -567,13 +570,13 @@ HardwareCursors = "r2ed_tool_rotating.tga" }; -Loading_BG = "loading_bg.tga"; // Default name for the loading background file. -Launch_BG = "launcher_bg.tga"; // Default name for the launch background file. -TeleportKami_BG = "teleport_kami_bg.tga"; -TeleportKaravan_BG = "teleport_caravan_bg.tga"; -Elevator_BG = "elevator_bg.tga"; // Default name for the loading background file. -ResurectKami_BG = "resurect_kami_bg.tga"; -ResurectKaravan_BG = "resurect_caravane_bg.tga"; +Loading_BG = "new_loading_bg.tga"; // Default name for the loading background file. +Launch_BG = "new_launcher_bg.tga"; // Default name for the launch background file. +TeleportKami_BG = "new_teleport_kami_bg.tga"; +TeleportKaravan_BG = "new_teleport_caravan_bg.tga"; +Elevator_BG = "new_elevator_bg.tga"; // Default name for the loading background file. +ResurectKami_BG = "new_resurect_kami_bg.tga"; +ResurectKaravan_BG = "new_resurect_caravane_bg.tga"; End_BG = "end_bg.tga"; // Default name for the last background file. ScenarioSavePath = "./my_scenarios/"; @@ -599,17 +602,30 @@ ScenarioLanguages = {"fr","de","en","other_lang"}; // Map each language to a forum help page HelpPages = { - "fr=https://classic.ryzom.dev/ams/", - "en=https://classic.ryzom.dev/ams/", - "wk=https://classic.ryzom.dev/ams/", - "de=https://classic.ryzom.dev/ams/", - "es=https://classic.ryzom.dev/ams/", - "ru=https://classic.ryzom.dev/ams/" + "fr=https://app.ryzom.com/app_forum/index.php?page=topic/view/6629/1&lang=fr", + "en=https://app.ryzom.com/app_forum/index.php?page=topic/view/6629/1&lang=en", + "wk=https://app.ryzom.com/app_forum/index.php?page=topic/view/6629/1", + "de=https://app.ryzom.com/app_forum/index.php?page=topic/view/6629/1&lang=de", + "es=https://app.ryzom.com/app_forum/index.php?page=topic/view/6629/1&lang=es", + "ru=https://app.ryzom.com/app_forum/index.php?page=topic/view/6629/1&lang=ru" +}; + +// User created channel +ChannelIgnoreFilter = +{ + "Uni Français", "English Uni", "Español Uni", + "русский Uni", "Deutsch Uni", "Karavan", + "Kami", "Ranger", "Marauder", "Fyros", + "Matis", "Tryker", "Zoraï", "Forge" }; // interval in minutes for webig notify thread to run +WebIgNotifInterval = 10; +WebIgMainDomain = "app.ryzom.com"; WebIgTrustedDomains = { + "api.ryzom.com", "app.ryzom.com", "apps.ryzom.com", "ark.ryzom.com", "arkapi.ryzom.com" }; +PatchletUrl = "https://app.ryzom.com/app_patchlet/index.php?patch=preload"; SelectedSlot = 0;