From aaeb12058de3db8f9d567b7319c3b2c22ec41f4d Mon Sep 17 00:00:00 2001 From: deed Date: Mon, 15 May 2017 10:41:46 +0200 Subject: [PATCH] test nouveau client_default.cfg --- client/exedll_linux32/client_default.cfg | 291 ++++++++--------- client/exedll_linux64/client_default.cfg | 291 ++++++++--------- client/exedll_osx/client_default.cfg | 295 +++++++++--------- client/exedll_win32/client_default.cfg | 291 ++++++++--------- client/exedll_win64/client_default.cfg | 291 ++++++++--------- .../kh_interfaces}/appzone.lua | 2 +- .../kh_interfaces}/ryzhome_toolbar.lua | 18 +- 7 files changed, 742 insertions(+), 737 deletions(-) mode change 100644 => 100755 client/exedll_linux32/client_default.cfg mode change 100644 => 100755 client/exedll_linux64/client_default.cfg mode change 100644 => 100755 client/exedll_osx/client_default.cfg mode change 100644 => 100755 client/exedll_win32/client_default.cfg mode change 100644 => 100755 client/exedll_win64/client_default.cfg rename data/{ryz/ryz_zzz_bazaar => kh/kh_interfaces}/appzone.lua (99%) rename data/{ryz/ryz_zzz_bazaar => kh/kh_interfaces}/ryzhome_toolbar.lua (88%) diff --git a/client/exedll_linux32/client_default.cfg b/client/exedll_linux32/client_default.cfg old mode 100644 new mode 100755 index d54b489f..7bae6bd3 --- a/client/exedll_linux32/client_default.cfg +++ b/client/exedll_linux32/client_default.cfg @@ -46,13 +46,13 @@ PatchUrl = "http://lirria.khaganat.net:43435"; RingReleaseNotePath = "http://lirria.khaganat.net/patch/index.php"; StartupHost = "lirria.khaganat.net:40916"; StartupPage = "/login/r2_login.php"; -InstallStatsUrl = "https://lirria.khaganat.net:50000/stats/stats.php"; +InstallStatsUrl = "http://lirria.khaganat.net:50000/stats/stats.php"; -CreateAccountURL = "https://lirria.khaganat.net/ams/?page=register"; -EditAccountURL = "https://lirria.khaganat.net/"; -ForgetPwdURL = "https://lirria.khaganat.net/ams/index.php?page=forgot_password"; +CreateAccountURL = "http://lirria.khaganat.net/ams/?page=register"; +EditAccountURL = "http://lirria.khaganat.net/"; +ForgetPwdURL = "http://lirria.khaganat.net/ams/index.php?page=forgot_password"; //FreeTrialURL = "https://lirria.khaganat.net/"; -LoginSupportURL = "https://www.khaganat.net/irc"; +LoginSupportURL = "http://www.khaganat.net/irc"; ConditionsTermsURL = "khaganat.net/wikhan/fr:charte"; @@ -106,27 +106,27 @@ VerboseLog = 1; /////////// HardwareCursor = 1; -CursorSpeed = 1.0; // In pixels per mickey -CursorSpeed_min = 0.5; -CursorSpeed_max = 2.0; +CursorSpeed = 1.0; // In pixels per mickey +CursorSpeed_min = 0.5; +CursorSpeed_max = 2.0; -CursorAcceleration = 40; // Threshold in mickey +CursorAcceleration = 40; // Threshold in mickey CursorAcceleration_min = 20; CursorAcceleration_max = 80; -FreeLookSpeed = 0.004; // In radian per mickey -FreeLookSpeed_min = 0.0001; -FreeLookSpeed_max = 0.01; +FreeLookSpeed = 0.004; // In radian per mickey +FreeLookSpeed_min = 0.0001; +FreeLookSpeed_max = 0.01; -FreeLookAcceleration = 40; // Threshold in mickey -FreeLookAcceleration_min = 20; -FreeLookAcceleration_max = 80; +FreeLookAcceleration = 40; // Threshold in mickey +FreeLookAcceleration_min = 20; +FreeLookAcceleration_max = 80; -FreeLookInverted = 0; -FreeLookTablet = 0; -AutomaticCamera = 0; -DblClickMode = 1; -AutoEquipTool = 1; +FreeLookInverted = 0; +FreeLookTablet = 0; +AutomaticCamera = 0; +DblClickMode = 1; +AutoEquipTool = 1; /////////////////// // RENDER CONFIG // @@ -140,43 +140,43 @@ AutoEquipTool = 1; // *** LANDSCAPE LandscapeTileNear = 50.000000; -LandscapeTileNear_min = 20.000000; -LandscapeTileNear_max = 100.000000; +LandscapeTileNear_min = 5.000000; +LandscapeTileNear_max = 200.000000; LandscapeTileNear_step = 10.0; -LandscapeTileNear_ps0 = 20.0; +LandscapeTileNear_ps0 = 5.0; LandscapeTileNear_ps1 = 40.0; LandscapeTileNear_ps2 = 50.0; -LandscapeTileNear_ps3 = 80.0; +LandscapeTileNear_ps3 = 120.0; // NB: threshold is inverted ULandscape::setThreshold(), to be more intelligible LandscapeThreshold = 1000.0; -LandscapeThreshold_min = 100.0; // Low quality => 0.01 threshold -LandscapeThreshold_max = 2000.0; // High quality => 0.0005 threshold -LandscapeThreshold_step = 100.0; -LandscapeThreshold_ps0 = 100.0; +LandscapeThreshold_min = 50.0; // Low quality => 0.01 threshold +LandscapeThreshold_max = 3000.0; // High quality => 0.0005 threshold +LandscapeThreshold_step = 50.0; +LandscapeThreshold_ps0 = 50.0; LandscapeThreshold_ps1 = 500.0; LandscapeThreshold_ps2 = 1000.0; LandscapeThreshold_ps3 = 2000.0; -Vision = 500.000000; -Vision_min = 200.000000; -Vision_max = 800.000000; -Vision_step = 100.000000; -Vision_ps0 = 200.0; +Vision = 500.000000; +Vision_min = 100.000000; +Vision_max = 1500.000000; +Vision_step = 100.000000; +Vision_ps0 = 100.0; Vision_ps1 = 400.0; Vision_ps2 = 500.0; -Vision_ps3 = 800.0; +Vision_ps3 = 1000.0; -MicroVeget = 1; // Enable/Disable MicroVeget. +MicroVeget = 1; // Enable/Disable MicroVeget. MicroVeget_ps0 = 0; MicroVeget_ps1 = 1; MicroVeget_ps2 = 1; MicroVeget_ps3 = 1; -MicroVegetDensity = 80.0; +MicroVegetDensity = 80.0; MicroVegetDensity_min = 10.0; MicroVegetDensity_max = 100.0; -MicroVegetDensity_step = 10.0; +MicroVegetDensity_step = 10.0; MicroVegetDensity_ps0 = 10.0; // not used since disabled! MicroVegetDensity_ps1 = 30.0; MicroVegetDensity_ps2 = 80.0; @@ -184,46 +184,46 @@ MicroVegetDensity_ps3 = 100.0; // *** FX -FxNbMaxPoly = 20000; -FxNbMaxPoly_min = 2000; +FxNbMaxPoly = 20000; +FxNbMaxPoly_min = 1000; FxNbMaxPoly_max = 50000; -FxNbMaxPoly_step= 2000; -FxNbMaxPoly_ps0 = 2000; +FxNbMaxPoly_step = 1000; +FxNbMaxPoly_ps0 = 1000; FxNbMaxPoly_ps1 = 10000; FxNbMaxPoly_ps2 = 20000; FxNbMaxPoly_ps3 = 50000; -Cloud = 1; -Cloud_ps0 = 0 ; -Cloud_ps1 = 1 ; -Cloud_ps2 = 1 ; -Cloud_ps3 = 1 ; +Cloud = 1; +Cloud_ps0 = 0; +Cloud_ps1 = 1; +Cloud_ps2 = 1; +Cloud_ps3 = 1; -CloudQuality = 160.0; +CloudQuality = 160.0; CloudQuality_min = 80.0; CloudQuality_max = 320.0; -CloudQuality_step = 20.0; +CloudQuality_step = 20.0; CloudQuality_ps0 = 80.0; // not used since disabled! CloudQuality_ps1 = 80.0; CloudQuality_ps2 = 160.0; CloudQuality_ps3 = 320.0; -CloudUpdate = 1; +CloudUpdate = 1; CloudUpdate_min = 1; CloudUpdate_max = 8; -CloudUpdate_step= 1; +CloudUpdate_step = 1; CloudUpdate_ps0 = 1; // not used since disabled! CloudUpdate_ps1 = 1; CloudUpdate_ps2 = 1; CloudUpdate_ps3 = 3; -Shadows = 1; +Shadows = 1; Shadows_ps0 = 0; Shadows_ps1 = 1; Shadows_ps2 = 1; Shadows_ps3 = 1; -FXAA = 1; +FXAA = 1; FXAA_ps0 = 0; FXAA_ps1 = 1; FXAA_ps2 = 1; @@ -231,52 +231,52 @@ FXAA_ps3 = 1; AnisotropicFilter = 0; -Bloom = 1; +Bloom = 1; Bloom_ps0 = 0; -Bloom_ps1 = 1; +Bloom_ps1 = 0; Bloom_ps2 = 1; Bloom_ps3 = 1; SquareBloom = 1; SquareBloom_ps0 = 0; -SquareBloom_ps1 = 1; +SquareBloom_ps1 = 0; SquareBloom_ps2 = 1; SquareBloom_ps3 = 1; -DensityBloom = 255.0; +DensityBloom = 150.0; DensityBloom_min = 0.0; DensityBloom_max = 255.0; -DensityBloom_step = 1.0; -DensityBloom_ps0 = 255.0; -DensityBloom_ps1 = 255.0; -DensityBloom_ps2 = 255.0; -DensityBloom_ps3 = 255.0; +DensityBloom_step = 1.0; +DensityBloom_ps0 = 0; +DensityBloom_ps1 = 0; +DensityBloom_ps2 = 150.0; +DensityBloom_ps3 = 150.0; // *** CHARACTERS -SkinNbMaxPoly = 100000; +SkinNbMaxPoly = 100000; SkinNbMaxPoly_min = 5000; -SkinNbMaxPoly_max = 250000; -SkinNbMaxPoly_step = 5000; -SkinNbMaxPoly_ps0 = 10000; +SkinNbMaxPoly_max = 300000; +SkinNbMaxPoly_step = 5000; +SkinNbMaxPoly_ps0 = 5000; SkinNbMaxPoly_ps1 = 70000; SkinNbMaxPoly_ps2 = 100000; SkinNbMaxPoly_ps3 = 200000; -NbMaxSkeletonNotCLod = 125; +NbMaxSkeletonNotCLod = 125; NbMaxSkeletonNotCLod_min = 5; -NbMaxSkeletonNotCLod_max = 255; -NbMaxSkeletonNotCLod_step = 5; -NbMaxSkeletonNotCLod_ps0 = 10; -NbMaxSkeletonNotCLod_ps1 = 50; +NbMaxSkeletonNotCLod_max = 400; +NbMaxSkeletonNotCLod_step = 5; +NbMaxSkeletonNotCLod_ps0 = 5; +NbMaxSkeletonNotCLod_ps1 = 20; NbMaxSkeletonNotCLod_ps2 = 125; NbMaxSkeletonNotCLod_ps3 = 255; -CharacterFarClip = 200.0; -CharacterFarClip_min = 50.0; -CharacterFarClip_max = 500.0; -CharacterFarClip_step = 10.0; -CharacterFarClip_ps0 = 50.0; +CharacterFarClip = 200.0; +CharacterFarClip_min = 25.0; +CharacterFarClip_max = 1000.0; +CharacterFarClip_step = 10.0; +CharacterFarClip_ps0 = 25.0; CharacterFarClip_ps1 = 100.0; CharacterFarClip_ps2 = 200.0; CharacterFarClip_ps3 = 500.0; @@ -286,67 +286,67 @@ EnableRacialAnimation = 1; // *** MISC // This is the actual aspect ratio of your screen (no relation with the resolution!!). Set 1.7777 if you got a 16/9 screen for instance ScreenAspectRatio = 0.0; -ForceDXTC = 1; // Enable/Disable DXTC. -DivideTextureSizeBy2= 0; // Divide texture size -DisableVtxProgram = 0; // Disable Hardware Vertex Program. -DisableVtxAGP = 0; // Disable Hardware Vertex AGP. -DisableTextureShdr = 0; // Disable Hardware Texture Shader. -HDEntityTexture = 1; -HDTextureInstalled = 1; -WaitVBL = 0; // 0 or 1 to wait Vertical Sync. +ForceDXTC = 1; // Enable/Disable DXTC. +DivideTextureSizeBy2 = 0; // Divide texture size +DisableVtxProgram = 0; // Disable Hardware Vertex Program. +DisableVtxAGP = 0; // Disable Hardware Vertex AGP. +DisableTextureShdr = 0; // Disable Hardware Texture Shader. +HDEntityTexture = 1; +HDTextureInstalled = 1; +WaitVBL = 0; // 0 or 1 to wait Vertical Sync. ////////////////// // GAME OPTIONS // ////////////////// -SelectWithRClick = 1; -DisplayWeapons = 1; -RotKeySpeedMax = 2.0; +SelectWithRClick = 1; +DisplayWeapons = 1; +RotKeySpeedMax = 2.0; RotKeySpeedMax_min = 1.0; RotKeySpeedMax_max = 4.0; -RotKeySpeedMin = 1.0; +RotKeySpeedMin = 1.0; RotKeySpeedMin_min = 0.5; RotKeySpeedMin_max = 2.0; -RotAccel = 3.0; -FollowOnAtk = 0; -AtkOnSelect = 0; -ZCPacsPrim = "gen_bt_col_ext.pacs_prim"; +RotAccel = 3.0; +FollowOnAtk = 0; +AtkOnSelect = 0; +ZCPacsPrim = "gen_bt_col_ext.pacs_prim"; ///////////////// // PREFERENCES // ///////////////// -FPV = 0; // FPV(First Person View) : default is false (Third Person View). -CameraHeight = 2.2; // Camera Height (in meter) from the ground (for the Third Person View). +FPV = 0; // FPV(First Person View) : default is false (Third Person View). +CameraHeight = 2.2; // Camera Height (in meter) from the ground (for the Third Person View). CameraDistance = 3.0; // Camera Distance(in meter) from the user (for the Third Person View). CameraDistStep = 1.0; -CameraDistMin = 1.0; -CameraDistMax = 250.0; -CameraAccel = 5.0; +CameraDistMin = 1.0; +CameraDistMax = 250.0; +CameraAccel = 5.0; CameraSpeedMin = 2.0; CameraSpeedMax = 100.0; -CameraResetSpeed = 10.0; // Speed in radian/s +CameraResetSpeed = 10.0; // Speed in radian/s ////////////////// // SOUND CONFIG // ////////////////// -SoundForceSoftwareBuffer= 1; -SoundOn = 1; -UseEax = 0; +SoundForceSoftwareBuffer = 1; +SoundOn = 1; +UseEax = 0; -MaxTrack = 32; -MaxTrack_min = 4; -MaxTrack_max = 32; +MaxTrack = 32; +MaxTrack_min = 4; +MaxTrack_max = 32; MaxTrack_step = 4; // This is the volume for "InGame" sound FXs -SoundSFXVolume = 1.0; -SoundSFXVolume_min = 0.0; -SoundSFXVolume_max = 1.0; +SoundSFXVolume = 1.0; +SoundSFXVolume_min = 0.0; +SoundSFXVolume_max = 1.0; SoundSFXVolume_step = 0.001; // This is volume for "InGame" music. Does not affect the MP3 player -SoundGameMusicVolume = 0.5; -SoundGameMusicVolume_min = 0.0; -SoundGameMusicVolume_max = 1.0; +SoundGameMusicVolume = 0.5; +SoundGameMusicVolume_min = 0.0; +SoundGameMusicVolume_max = 1.0; SoundGameMusicVolume_step = 0.001; // MISC @@ -359,15 +359,15 @@ NegFiltersInfo = { "CLIMPD:", "CPath::lookup" , "LNET" }; NegFiltersWarning = { "'basics.Equipment Slot'.", "_usercolor.tga", "PACS" }; // Big screen shot -ScreenShotWidth = 0; +ScreenShotWidth = 0; ScreenShotHeight = 0; -ScreenShotFullDetail = 1; // 1 to switch full detail mode for characters (both standard & big screenshots) +ScreenShotFullDetail = 1; // 1 to switch full detail mode for characters (both standard & big screenshots) // Read : "ID", "R G B A MODE [FX]" SystemInfoColors = { // OLD STUFF Here for compatibility -"RG", "0 0 0 255 normal", // Black to see when there is an error +"RG", "0 0 0 255 normal", // Black to see when there is an error "BC", "0 0 0 255 normal", // Black to see when there is an error "JA", "0 0 0 255 normal", // Black to see when there is an error "BL", "0 0 0 255 normal", // Black to see when there is an error @@ -431,18 +431,18 @@ PrintfCommandsFreeTrial = { DisplayMissingAnimFile = 0; -LoadingStringCount = 54; +LoadingStringCount = 54; // Some R2 parameters ... -R2Mode = 1; -R2EDEnabled = 1; -R2EDExtendedDebug = 0; -R2EDLightPalette = 0; -R2ClientGw = "r2linux01"; -LoadLuaDebugger = 0; -CheckR2ScenarioMD5 = 1; +R2Mode = 1; +R2EDEnabled = 1; +R2EDExtendedDebug = 0; +R2EDLightPalette = 0; +R2ClientGw = "r2linux01"; +LoadLuaDebugger = 0; +CheckR2ScenarioMD5 = 1; LevelDesignEnabled = 0; DmCameraDistMax = 25; @@ -463,36 +463,37 @@ R2EDReloadFiles = { }; XMLInterfaceFiles = { - "config.xml", - "widgets.xml", + "config.xml", + "widgets.xml", "webig_widgets.xml", "appzone.xml", - "player.xml", - "inventory.xml", - "interaction.xml", + "player.xml", + "inventory.xml", + "interaction.xml", "phrase.xml", - "harvest.xml", - "macros.xml", - "info_player.xml", - "outpost.xml", - "guild.xml", - "taskbar.xml", + "harvest.xml", + "macros.xml", + "info_player.xml", + "outpost.xml", + "guild.xml", + "taskbar.xml", "game_config.xml", - "game_context_menu.xml", - "player_trade.xml", - "bot_chat_v4.xml", - "compass.xml", - "map.xml", + "game_context_menu.xml", + "player_trade.xml", + "bot_chat_v4.xml", + "compass.xml", + "map.xml", "hierarchy.xml", - "reset.xml", - "actions.xml", - "help.xml", - "encyclopedia.xml", - "commands.xml", - "commands2.xml", - "ring_access_point_filter.xml", - "ring_window.xml", + "reset.xml", + "actions.xml", + "help.xml", + "encyclopedia.xml", + "commands.xml", + "commands2.xml", + "ring_access_point_filter.xml", + "ring_window.xml", "bg_downloader.xml", + "ryzhome_toolbar.xml" }; XMLR2EDInterfaceFiles = @@ -587,7 +588,7 @@ HelpPages = WebIgMainDomain = "app.lirria.khaganat.net"; WebIgTrustedDomains = { - "api.lirria.khaganat.net", "app.lirria.khaganat.net", "lirria.khaganat.net" + "api.lirria.khaganat.net", "app.lirria.khaganat.net", "lirria.khaganat.net", "www.khaganat.net" }; //PatchletUrl = ""; diff --git a/client/exedll_linux64/client_default.cfg b/client/exedll_linux64/client_default.cfg old mode 100644 new mode 100755 index d54b489f..7bae6bd3 --- a/client/exedll_linux64/client_default.cfg +++ b/client/exedll_linux64/client_default.cfg @@ -46,13 +46,13 @@ PatchUrl = "http://lirria.khaganat.net:43435"; RingReleaseNotePath = "http://lirria.khaganat.net/patch/index.php"; StartupHost = "lirria.khaganat.net:40916"; StartupPage = "/login/r2_login.php"; -InstallStatsUrl = "https://lirria.khaganat.net:50000/stats/stats.php"; +InstallStatsUrl = "http://lirria.khaganat.net:50000/stats/stats.php"; -CreateAccountURL = "https://lirria.khaganat.net/ams/?page=register"; -EditAccountURL = "https://lirria.khaganat.net/"; -ForgetPwdURL = "https://lirria.khaganat.net/ams/index.php?page=forgot_password"; +CreateAccountURL = "http://lirria.khaganat.net/ams/?page=register"; +EditAccountURL = "http://lirria.khaganat.net/"; +ForgetPwdURL = "http://lirria.khaganat.net/ams/index.php?page=forgot_password"; //FreeTrialURL = "https://lirria.khaganat.net/"; -LoginSupportURL = "https://www.khaganat.net/irc"; +LoginSupportURL = "http://www.khaganat.net/irc"; ConditionsTermsURL = "khaganat.net/wikhan/fr:charte"; @@ -106,27 +106,27 @@ VerboseLog = 1; /////////// HardwareCursor = 1; -CursorSpeed = 1.0; // In pixels per mickey -CursorSpeed_min = 0.5; -CursorSpeed_max = 2.0; +CursorSpeed = 1.0; // In pixels per mickey +CursorSpeed_min = 0.5; +CursorSpeed_max = 2.0; -CursorAcceleration = 40; // Threshold in mickey +CursorAcceleration = 40; // Threshold in mickey CursorAcceleration_min = 20; CursorAcceleration_max = 80; -FreeLookSpeed = 0.004; // In radian per mickey -FreeLookSpeed_min = 0.0001; -FreeLookSpeed_max = 0.01; +FreeLookSpeed = 0.004; // In radian per mickey +FreeLookSpeed_min = 0.0001; +FreeLookSpeed_max = 0.01; -FreeLookAcceleration = 40; // Threshold in mickey -FreeLookAcceleration_min = 20; -FreeLookAcceleration_max = 80; +FreeLookAcceleration = 40; // Threshold in mickey +FreeLookAcceleration_min = 20; +FreeLookAcceleration_max = 80; -FreeLookInverted = 0; -FreeLookTablet = 0; -AutomaticCamera = 0; -DblClickMode = 1; -AutoEquipTool = 1; +FreeLookInverted = 0; +FreeLookTablet = 0; +AutomaticCamera = 0; +DblClickMode = 1; +AutoEquipTool = 1; /////////////////// // RENDER CONFIG // @@ -140,43 +140,43 @@ AutoEquipTool = 1; // *** LANDSCAPE LandscapeTileNear = 50.000000; -LandscapeTileNear_min = 20.000000; -LandscapeTileNear_max = 100.000000; +LandscapeTileNear_min = 5.000000; +LandscapeTileNear_max = 200.000000; LandscapeTileNear_step = 10.0; -LandscapeTileNear_ps0 = 20.0; +LandscapeTileNear_ps0 = 5.0; LandscapeTileNear_ps1 = 40.0; LandscapeTileNear_ps2 = 50.0; -LandscapeTileNear_ps3 = 80.0; +LandscapeTileNear_ps3 = 120.0; // NB: threshold is inverted ULandscape::setThreshold(), to be more intelligible LandscapeThreshold = 1000.0; -LandscapeThreshold_min = 100.0; // Low quality => 0.01 threshold -LandscapeThreshold_max = 2000.0; // High quality => 0.0005 threshold -LandscapeThreshold_step = 100.0; -LandscapeThreshold_ps0 = 100.0; +LandscapeThreshold_min = 50.0; // Low quality => 0.01 threshold +LandscapeThreshold_max = 3000.0; // High quality => 0.0005 threshold +LandscapeThreshold_step = 50.0; +LandscapeThreshold_ps0 = 50.0; LandscapeThreshold_ps1 = 500.0; LandscapeThreshold_ps2 = 1000.0; LandscapeThreshold_ps3 = 2000.0; -Vision = 500.000000; -Vision_min = 200.000000; -Vision_max = 800.000000; -Vision_step = 100.000000; -Vision_ps0 = 200.0; +Vision = 500.000000; +Vision_min = 100.000000; +Vision_max = 1500.000000; +Vision_step = 100.000000; +Vision_ps0 = 100.0; Vision_ps1 = 400.0; Vision_ps2 = 500.0; -Vision_ps3 = 800.0; +Vision_ps3 = 1000.0; -MicroVeget = 1; // Enable/Disable MicroVeget. +MicroVeget = 1; // Enable/Disable MicroVeget. MicroVeget_ps0 = 0; MicroVeget_ps1 = 1; MicroVeget_ps2 = 1; MicroVeget_ps3 = 1; -MicroVegetDensity = 80.0; +MicroVegetDensity = 80.0; MicroVegetDensity_min = 10.0; MicroVegetDensity_max = 100.0; -MicroVegetDensity_step = 10.0; +MicroVegetDensity_step = 10.0; MicroVegetDensity_ps0 = 10.0; // not used since disabled! MicroVegetDensity_ps1 = 30.0; MicroVegetDensity_ps2 = 80.0; @@ -184,46 +184,46 @@ MicroVegetDensity_ps3 = 100.0; // *** FX -FxNbMaxPoly = 20000; -FxNbMaxPoly_min = 2000; +FxNbMaxPoly = 20000; +FxNbMaxPoly_min = 1000; FxNbMaxPoly_max = 50000; -FxNbMaxPoly_step= 2000; -FxNbMaxPoly_ps0 = 2000; +FxNbMaxPoly_step = 1000; +FxNbMaxPoly_ps0 = 1000; FxNbMaxPoly_ps1 = 10000; FxNbMaxPoly_ps2 = 20000; FxNbMaxPoly_ps3 = 50000; -Cloud = 1; -Cloud_ps0 = 0 ; -Cloud_ps1 = 1 ; -Cloud_ps2 = 1 ; -Cloud_ps3 = 1 ; +Cloud = 1; +Cloud_ps0 = 0; +Cloud_ps1 = 1; +Cloud_ps2 = 1; +Cloud_ps3 = 1; -CloudQuality = 160.0; +CloudQuality = 160.0; CloudQuality_min = 80.0; CloudQuality_max = 320.0; -CloudQuality_step = 20.0; +CloudQuality_step = 20.0; CloudQuality_ps0 = 80.0; // not used since disabled! CloudQuality_ps1 = 80.0; CloudQuality_ps2 = 160.0; CloudQuality_ps3 = 320.0; -CloudUpdate = 1; +CloudUpdate = 1; CloudUpdate_min = 1; CloudUpdate_max = 8; -CloudUpdate_step= 1; +CloudUpdate_step = 1; CloudUpdate_ps0 = 1; // not used since disabled! CloudUpdate_ps1 = 1; CloudUpdate_ps2 = 1; CloudUpdate_ps3 = 3; -Shadows = 1; +Shadows = 1; Shadows_ps0 = 0; Shadows_ps1 = 1; Shadows_ps2 = 1; Shadows_ps3 = 1; -FXAA = 1; +FXAA = 1; FXAA_ps0 = 0; FXAA_ps1 = 1; FXAA_ps2 = 1; @@ -231,52 +231,52 @@ FXAA_ps3 = 1; AnisotropicFilter = 0; -Bloom = 1; +Bloom = 1; Bloom_ps0 = 0; -Bloom_ps1 = 1; +Bloom_ps1 = 0; Bloom_ps2 = 1; Bloom_ps3 = 1; SquareBloom = 1; SquareBloom_ps0 = 0; -SquareBloom_ps1 = 1; +SquareBloom_ps1 = 0; SquareBloom_ps2 = 1; SquareBloom_ps3 = 1; -DensityBloom = 255.0; +DensityBloom = 150.0; DensityBloom_min = 0.0; DensityBloom_max = 255.0; -DensityBloom_step = 1.0; -DensityBloom_ps0 = 255.0; -DensityBloom_ps1 = 255.0; -DensityBloom_ps2 = 255.0; -DensityBloom_ps3 = 255.0; +DensityBloom_step = 1.0; +DensityBloom_ps0 = 0; +DensityBloom_ps1 = 0; +DensityBloom_ps2 = 150.0; +DensityBloom_ps3 = 150.0; // *** CHARACTERS -SkinNbMaxPoly = 100000; +SkinNbMaxPoly = 100000; SkinNbMaxPoly_min = 5000; -SkinNbMaxPoly_max = 250000; -SkinNbMaxPoly_step = 5000; -SkinNbMaxPoly_ps0 = 10000; +SkinNbMaxPoly_max = 300000; +SkinNbMaxPoly_step = 5000; +SkinNbMaxPoly_ps0 = 5000; SkinNbMaxPoly_ps1 = 70000; SkinNbMaxPoly_ps2 = 100000; SkinNbMaxPoly_ps3 = 200000; -NbMaxSkeletonNotCLod = 125; +NbMaxSkeletonNotCLod = 125; NbMaxSkeletonNotCLod_min = 5; -NbMaxSkeletonNotCLod_max = 255; -NbMaxSkeletonNotCLod_step = 5; -NbMaxSkeletonNotCLod_ps0 = 10; -NbMaxSkeletonNotCLod_ps1 = 50; +NbMaxSkeletonNotCLod_max = 400; +NbMaxSkeletonNotCLod_step = 5; +NbMaxSkeletonNotCLod_ps0 = 5; +NbMaxSkeletonNotCLod_ps1 = 20; NbMaxSkeletonNotCLod_ps2 = 125; NbMaxSkeletonNotCLod_ps3 = 255; -CharacterFarClip = 200.0; -CharacterFarClip_min = 50.0; -CharacterFarClip_max = 500.0; -CharacterFarClip_step = 10.0; -CharacterFarClip_ps0 = 50.0; +CharacterFarClip = 200.0; +CharacterFarClip_min = 25.0; +CharacterFarClip_max = 1000.0; +CharacterFarClip_step = 10.0; +CharacterFarClip_ps0 = 25.0; CharacterFarClip_ps1 = 100.0; CharacterFarClip_ps2 = 200.0; CharacterFarClip_ps3 = 500.0; @@ -286,67 +286,67 @@ EnableRacialAnimation = 1; // *** MISC // This is the actual aspect ratio of your screen (no relation with the resolution!!). Set 1.7777 if you got a 16/9 screen for instance ScreenAspectRatio = 0.0; -ForceDXTC = 1; // Enable/Disable DXTC. -DivideTextureSizeBy2= 0; // Divide texture size -DisableVtxProgram = 0; // Disable Hardware Vertex Program. -DisableVtxAGP = 0; // Disable Hardware Vertex AGP. -DisableTextureShdr = 0; // Disable Hardware Texture Shader. -HDEntityTexture = 1; -HDTextureInstalled = 1; -WaitVBL = 0; // 0 or 1 to wait Vertical Sync. +ForceDXTC = 1; // Enable/Disable DXTC. +DivideTextureSizeBy2 = 0; // Divide texture size +DisableVtxProgram = 0; // Disable Hardware Vertex Program. +DisableVtxAGP = 0; // Disable Hardware Vertex AGP. +DisableTextureShdr = 0; // Disable Hardware Texture Shader. +HDEntityTexture = 1; +HDTextureInstalled = 1; +WaitVBL = 0; // 0 or 1 to wait Vertical Sync. ////////////////// // GAME OPTIONS // ////////////////// -SelectWithRClick = 1; -DisplayWeapons = 1; -RotKeySpeedMax = 2.0; +SelectWithRClick = 1; +DisplayWeapons = 1; +RotKeySpeedMax = 2.0; RotKeySpeedMax_min = 1.0; RotKeySpeedMax_max = 4.0; -RotKeySpeedMin = 1.0; +RotKeySpeedMin = 1.0; RotKeySpeedMin_min = 0.5; RotKeySpeedMin_max = 2.0; -RotAccel = 3.0; -FollowOnAtk = 0; -AtkOnSelect = 0; -ZCPacsPrim = "gen_bt_col_ext.pacs_prim"; +RotAccel = 3.0; +FollowOnAtk = 0; +AtkOnSelect = 0; +ZCPacsPrim = "gen_bt_col_ext.pacs_prim"; ///////////////// // PREFERENCES // ///////////////// -FPV = 0; // FPV(First Person View) : default is false (Third Person View). -CameraHeight = 2.2; // Camera Height (in meter) from the ground (for the Third Person View). +FPV = 0; // FPV(First Person View) : default is false (Third Person View). +CameraHeight = 2.2; // Camera Height (in meter) from the ground (for the Third Person View). CameraDistance = 3.0; // Camera Distance(in meter) from the user (for the Third Person View). CameraDistStep = 1.0; -CameraDistMin = 1.0; -CameraDistMax = 250.0; -CameraAccel = 5.0; +CameraDistMin = 1.0; +CameraDistMax = 250.0; +CameraAccel = 5.0; CameraSpeedMin = 2.0; CameraSpeedMax = 100.0; -CameraResetSpeed = 10.0; // Speed in radian/s +CameraResetSpeed = 10.0; // Speed in radian/s ////////////////// // SOUND CONFIG // ////////////////// -SoundForceSoftwareBuffer= 1; -SoundOn = 1; -UseEax = 0; +SoundForceSoftwareBuffer = 1; +SoundOn = 1; +UseEax = 0; -MaxTrack = 32; -MaxTrack_min = 4; -MaxTrack_max = 32; +MaxTrack = 32; +MaxTrack_min = 4; +MaxTrack_max = 32; MaxTrack_step = 4; // This is the volume for "InGame" sound FXs -SoundSFXVolume = 1.0; -SoundSFXVolume_min = 0.0; -SoundSFXVolume_max = 1.0; +SoundSFXVolume = 1.0; +SoundSFXVolume_min = 0.0; +SoundSFXVolume_max = 1.0; SoundSFXVolume_step = 0.001; // This is volume for "InGame" music. Does not affect the MP3 player -SoundGameMusicVolume = 0.5; -SoundGameMusicVolume_min = 0.0; -SoundGameMusicVolume_max = 1.0; +SoundGameMusicVolume = 0.5; +SoundGameMusicVolume_min = 0.0; +SoundGameMusicVolume_max = 1.0; SoundGameMusicVolume_step = 0.001; // MISC @@ -359,15 +359,15 @@ NegFiltersInfo = { "CLIMPD:", "CPath::lookup" , "LNET" }; NegFiltersWarning = { "'basics.Equipment Slot'.", "_usercolor.tga", "PACS" }; // Big screen shot -ScreenShotWidth = 0; +ScreenShotWidth = 0; ScreenShotHeight = 0; -ScreenShotFullDetail = 1; // 1 to switch full detail mode for characters (both standard & big screenshots) +ScreenShotFullDetail = 1; // 1 to switch full detail mode for characters (both standard & big screenshots) // Read : "ID", "R G B A MODE [FX]" SystemInfoColors = { // OLD STUFF Here for compatibility -"RG", "0 0 0 255 normal", // Black to see when there is an error +"RG", "0 0 0 255 normal", // Black to see when there is an error "BC", "0 0 0 255 normal", // Black to see when there is an error "JA", "0 0 0 255 normal", // Black to see when there is an error "BL", "0 0 0 255 normal", // Black to see when there is an error @@ -431,18 +431,18 @@ PrintfCommandsFreeTrial = { DisplayMissingAnimFile = 0; -LoadingStringCount = 54; +LoadingStringCount = 54; // Some R2 parameters ... -R2Mode = 1; -R2EDEnabled = 1; -R2EDExtendedDebug = 0; -R2EDLightPalette = 0; -R2ClientGw = "r2linux01"; -LoadLuaDebugger = 0; -CheckR2ScenarioMD5 = 1; +R2Mode = 1; +R2EDEnabled = 1; +R2EDExtendedDebug = 0; +R2EDLightPalette = 0; +R2ClientGw = "r2linux01"; +LoadLuaDebugger = 0; +CheckR2ScenarioMD5 = 1; LevelDesignEnabled = 0; DmCameraDistMax = 25; @@ -463,36 +463,37 @@ R2EDReloadFiles = { }; XMLInterfaceFiles = { - "config.xml", - "widgets.xml", + "config.xml", + "widgets.xml", "webig_widgets.xml", "appzone.xml", - "player.xml", - "inventory.xml", - "interaction.xml", + "player.xml", + "inventory.xml", + "interaction.xml", "phrase.xml", - "harvest.xml", - "macros.xml", - "info_player.xml", - "outpost.xml", - "guild.xml", - "taskbar.xml", + "harvest.xml", + "macros.xml", + "info_player.xml", + "outpost.xml", + "guild.xml", + "taskbar.xml", "game_config.xml", - "game_context_menu.xml", - "player_trade.xml", - "bot_chat_v4.xml", - "compass.xml", - "map.xml", + "game_context_menu.xml", + "player_trade.xml", + "bot_chat_v4.xml", + "compass.xml", + "map.xml", "hierarchy.xml", - "reset.xml", - "actions.xml", - "help.xml", - "encyclopedia.xml", - "commands.xml", - "commands2.xml", - "ring_access_point_filter.xml", - "ring_window.xml", + "reset.xml", + "actions.xml", + "help.xml", + "encyclopedia.xml", + "commands.xml", + "commands2.xml", + "ring_access_point_filter.xml", + "ring_window.xml", "bg_downloader.xml", + "ryzhome_toolbar.xml" }; XMLR2EDInterfaceFiles = @@ -587,7 +588,7 @@ HelpPages = WebIgMainDomain = "app.lirria.khaganat.net"; WebIgTrustedDomains = { - "api.lirria.khaganat.net", "app.lirria.khaganat.net", "lirria.khaganat.net" + "api.lirria.khaganat.net", "app.lirria.khaganat.net", "lirria.khaganat.net", "www.khaganat.net" }; //PatchletUrl = ""; diff --git a/client/exedll_osx/client_default.cfg b/client/exedll_osx/client_default.cfg old mode 100644 new mode 100755 index baf39813..7bae6bd3 --- a/client/exedll_osx/client_default.cfg +++ b/client/exedll_osx/client_default.cfg @@ -40,19 +40,19 @@ Gamma_max = 1.0; ///////////// Application = { "Lirria", "./client_ryzom_r.exe", "./" }; -BackgroundDownloader = 1; -PatchWanted = 0; +BackgroundDownloader = 0; +PatchWanted = 1; PatchUrl = "http://lirria.khaganat.net:43435"; RingReleaseNotePath = "http://lirria.khaganat.net/patch/index.php"; StartupHost = "lirria.khaganat.net:40916"; StartupPage = "/login/r2_login.php"; -InstallStatsUrl = "https://lirria.khaganat.net:50000/stats/stats.php"; +InstallStatsUrl = "http://lirria.khaganat.net:50000/stats/stats.php"; -CreateAccountURL = "https://lirria.khaganat.net/ams/?page=register"; -EditAccountURL = "https://lirria.khaganat.net/"; -ForgetPwdURL = "https://lirria.khaganat.net/ams/index.php?page=forgot_password"; +CreateAccountURL = "http://lirria.khaganat.net/ams/?page=register"; +EditAccountURL = "http://lirria.khaganat.net/"; +ForgetPwdURL = "http://lirria.khaganat.net/ams/index.php?page=forgot_password"; //FreeTrialURL = "https://lirria.khaganat.net/"; -LoginSupportURL = "https://www.khaganat.net/irc"; +LoginSupportURL = "http://www.khaganat.net/irc"; ConditionsTermsURL = "khaganat.net/wikhan/fr:charte"; @@ -106,27 +106,27 @@ VerboseLog = 1; /////////// HardwareCursor = 1; -CursorSpeed = 1.0; // In pixels per mickey -CursorSpeed_min = 0.5; -CursorSpeed_max = 2.0; +CursorSpeed = 1.0; // In pixels per mickey +CursorSpeed_min = 0.5; +CursorSpeed_max = 2.0; -CursorAcceleration = 40; // Threshold in mickey +CursorAcceleration = 40; // Threshold in mickey CursorAcceleration_min = 20; CursorAcceleration_max = 80; -FreeLookSpeed = 0.004; // In radian per mickey -FreeLookSpeed_min = 0.0001; -FreeLookSpeed_max = 0.01; +FreeLookSpeed = 0.004; // In radian per mickey +FreeLookSpeed_min = 0.0001; +FreeLookSpeed_max = 0.01; -FreeLookAcceleration = 40; // Threshold in mickey -FreeLookAcceleration_min = 20; -FreeLookAcceleration_max = 80; +FreeLookAcceleration = 40; // Threshold in mickey +FreeLookAcceleration_min = 20; +FreeLookAcceleration_max = 80; -FreeLookInverted = 0; -FreeLookTablet = 0; -AutomaticCamera = 0; -DblClickMode = 1; -AutoEquipTool = 1; +FreeLookInverted = 0; +FreeLookTablet = 0; +AutomaticCamera = 0; +DblClickMode = 1; +AutoEquipTool = 1; /////////////////// // RENDER CONFIG // @@ -140,43 +140,43 @@ AutoEquipTool = 1; // *** LANDSCAPE LandscapeTileNear = 50.000000; -LandscapeTileNear_min = 20.000000; -LandscapeTileNear_max = 100.000000; +LandscapeTileNear_min = 5.000000; +LandscapeTileNear_max = 200.000000; LandscapeTileNear_step = 10.0; -LandscapeTileNear_ps0 = 20.0; +LandscapeTileNear_ps0 = 5.0; LandscapeTileNear_ps1 = 40.0; LandscapeTileNear_ps2 = 50.0; -LandscapeTileNear_ps3 = 80.0; +LandscapeTileNear_ps3 = 120.0; // NB: threshold is inverted ULandscape::setThreshold(), to be more intelligible LandscapeThreshold = 1000.0; -LandscapeThreshold_min = 100.0; // Low quality => 0.01 threshold -LandscapeThreshold_max = 2000.0; // High quality => 0.0005 threshold -LandscapeThreshold_step = 100.0; -LandscapeThreshold_ps0 = 100.0; +LandscapeThreshold_min = 50.0; // Low quality => 0.01 threshold +LandscapeThreshold_max = 3000.0; // High quality => 0.0005 threshold +LandscapeThreshold_step = 50.0; +LandscapeThreshold_ps0 = 50.0; LandscapeThreshold_ps1 = 500.0; LandscapeThreshold_ps2 = 1000.0; LandscapeThreshold_ps3 = 2000.0; -Vision = 500.000000; -Vision_min = 200.000000; -Vision_max = 800.000000; -Vision_step = 100.000000; -Vision_ps0 = 200.0; +Vision = 500.000000; +Vision_min = 100.000000; +Vision_max = 1500.000000; +Vision_step = 100.000000; +Vision_ps0 = 100.0; Vision_ps1 = 400.0; Vision_ps2 = 500.0; -Vision_ps3 = 800.0; +Vision_ps3 = 1000.0; -MicroVeget = 1; // Enable/Disable MicroVeget. +MicroVeget = 1; // Enable/Disable MicroVeget. MicroVeget_ps0 = 0; MicroVeget_ps1 = 1; MicroVeget_ps2 = 1; MicroVeget_ps3 = 1; -MicroVegetDensity = 80.0; +MicroVegetDensity = 80.0; MicroVegetDensity_min = 10.0; MicroVegetDensity_max = 100.0; -MicroVegetDensity_step = 10.0; +MicroVegetDensity_step = 10.0; MicroVegetDensity_ps0 = 10.0; // not used since disabled! MicroVegetDensity_ps1 = 30.0; MicroVegetDensity_ps2 = 80.0; @@ -184,46 +184,46 @@ MicroVegetDensity_ps3 = 100.0; // *** FX -FxNbMaxPoly = 20000; -FxNbMaxPoly_min = 2000; +FxNbMaxPoly = 20000; +FxNbMaxPoly_min = 1000; FxNbMaxPoly_max = 50000; -FxNbMaxPoly_step= 2000; -FxNbMaxPoly_ps0 = 2000; +FxNbMaxPoly_step = 1000; +FxNbMaxPoly_ps0 = 1000; FxNbMaxPoly_ps1 = 10000; FxNbMaxPoly_ps2 = 20000; FxNbMaxPoly_ps3 = 50000; -Cloud = 1; -Cloud_ps0 = 0 ; -Cloud_ps1 = 1 ; -Cloud_ps2 = 1 ; -Cloud_ps3 = 1 ; +Cloud = 1; +Cloud_ps0 = 0; +Cloud_ps1 = 1; +Cloud_ps2 = 1; +Cloud_ps3 = 1; -CloudQuality = 160.0; +CloudQuality = 160.0; CloudQuality_min = 80.0; CloudQuality_max = 320.0; -CloudQuality_step = 20.0; +CloudQuality_step = 20.0; CloudQuality_ps0 = 80.0; // not used since disabled! CloudQuality_ps1 = 80.0; CloudQuality_ps2 = 160.0; CloudQuality_ps3 = 320.0; -CloudUpdate = 1; +CloudUpdate = 1; CloudUpdate_min = 1; CloudUpdate_max = 8; -CloudUpdate_step= 1; +CloudUpdate_step = 1; CloudUpdate_ps0 = 1; // not used since disabled! CloudUpdate_ps1 = 1; CloudUpdate_ps2 = 1; CloudUpdate_ps3 = 3; -Shadows = 1; +Shadows = 1; Shadows_ps0 = 0; Shadows_ps1 = 1; Shadows_ps2 = 1; Shadows_ps3 = 1; -FXAA = 1; +FXAA = 1; FXAA_ps0 = 0; FXAA_ps1 = 1; FXAA_ps2 = 1; @@ -231,52 +231,52 @@ FXAA_ps3 = 1; AnisotropicFilter = 0; -Bloom = 1; +Bloom = 1; Bloom_ps0 = 0; -Bloom_ps1 = 1; +Bloom_ps1 = 0; Bloom_ps2 = 1; Bloom_ps3 = 1; SquareBloom = 1; SquareBloom_ps0 = 0; -SquareBloom_ps1 = 1; +SquareBloom_ps1 = 0; SquareBloom_ps2 = 1; SquareBloom_ps3 = 1; -DensityBloom = 255.0; +DensityBloom = 150.0; DensityBloom_min = 0.0; DensityBloom_max = 255.0; -DensityBloom_step = 1.0; -DensityBloom_ps0 = 255.0; -DensityBloom_ps1 = 255.0; -DensityBloom_ps2 = 255.0; -DensityBloom_ps3 = 255.0; +DensityBloom_step = 1.0; +DensityBloom_ps0 = 0; +DensityBloom_ps1 = 0; +DensityBloom_ps2 = 150.0; +DensityBloom_ps3 = 150.0; // *** CHARACTERS -SkinNbMaxPoly = 100000; +SkinNbMaxPoly = 100000; SkinNbMaxPoly_min = 5000; -SkinNbMaxPoly_max = 250000; -SkinNbMaxPoly_step = 5000; -SkinNbMaxPoly_ps0 = 10000; +SkinNbMaxPoly_max = 300000; +SkinNbMaxPoly_step = 5000; +SkinNbMaxPoly_ps0 = 5000; SkinNbMaxPoly_ps1 = 70000; SkinNbMaxPoly_ps2 = 100000; SkinNbMaxPoly_ps3 = 200000; -NbMaxSkeletonNotCLod = 125; +NbMaxSkeletonNotCLod = 125; NbMaxSkeletonNotCLod_min = 5; -NbMaxSkeletonNotCLod_max = 255; -NbMaxSkeletonNotCLod_step = 5; -NbMaxSkeletonNotCLod_ps0 = 10; -NbMaxSkeletonNotCLod_ps1 = 50; +NbMaxSkeletonNotCLod_max = 400; +NbMaxSkeletonNotCLod_step = 5; +NbMaxSkeletonNotCLod_ps0 = 5; +NbMaxSkeletonNotCLod_ps1 = 20; NbMaxSkeletonNotCLod_ps2 = 125; NbMaxSkeletonNotCLod_ps3 = 255; -CharacterFarClip = 200.0; -CharacterFarClip_min = 50.0; -CharacterFarClip_max = 500.0; -CharacterFarClip_step = 10.0; -CharacterFarClip_ps0 = 50.0; +CharacterFarClip = 200.0; +CharacterFarClip_min = 25.0; +CharacterFarClip_max = 1000.0; +CharacterFarClip_step = 10.0; +CharacterFarClip_ps0 = 25.0; CharacterFarClip_ps1 = 100.0; CharacterFarClip_ps2 = 200.0; CharacterFarClip_ps3 = 500.0; @@ -286,67 +286,67 @@ EnableRacialAnimation = 1; // *** MISC // This is the actual aspect ratio of your screen (no relation with the resolution!!). Set 1.7777 if you got a 16/9 screen for instance ScreenAspectRatio = 0.0; -ForceDXTC = 1; // Enable/Disable DXTC. -DivideTextureSizeBy2= 0; // Divide texture size -DisableVtxProgram = 0; // Disable Hardware Vertex Program. -DisableVtxAGP = 0; // Disable Hardware Vertex AGP. -DisableTextureShdr = 0; // Disable Hardware Texture Shader. -HDEntityTexture = 1; -HDTextureInstalled = 1; -WaitVBL = 0; // 0 or 1 to wait Vertical Sync. +ForceDXTC = 1; // Enable/Disable DXTC. +DivideTextureSizeBy2 = 0; // Divide texture size +DisableVtxProgram = 0; // Disable Hardware Vertex Program. +DisableVtxAGP = 0; // Disable Hardware Vertex AGP. +DisableTextureShdr = 0; // Disable Hardware Texture Shader. +HDEntityTexture = 1; +HDTextureInstalled = 1; +WaitVBL = 0; // 0 or 1 to wait Vertical Sync. ////////////////// // GAME OPTIONS // ////////////////// -SelectWithRClick = 1; -DisplayWeapons = 1; -RotKeySpeedMax = 2.0; +SelectWithRClick = 1; +DisplayWeapons = 1; +RotKeySpeedMax = 2.0; RotKeySpeedMax_min = 1.0; RotKeySpeedMax_max = 4.0; -RotKeySpeedMin = 1.0; +RotKeySpeedMin = 1.0; RotKeySpeedMin_min = 0.5; RotKeySpeedMin_max = 2.0; -RotAccel = 3.0; -FollowOnAtk = 0; -AtkOnSelect = 0; -ZCPacsPrim = "gen_bt_col_ext.pacs_prim"; +RotAccel = 3.0; +FollowOnAtk = 0; +AtkOnSelect = 0; +ZCPacsPrim = "gen_bt_col_ext.pacs_prim"; ///////////////// // PREFERENCES // ///////////////// -FPV = 0; // FPV(First Person View) : default is false (Third Person View). -CameraHeight = 2.2; // Camera Height (in meter) from the ground (for the Third Person View). +FPV = 0; // FPV(First Person View) : default is false (Third Person View). +CameraHeight = 2.2; // Camera Height (in meter) from the ground (for the Third Person View). CameraDistance = 3.0; // Camera Distance(in meter) from the user (for the Third Person View). CameraDistStep = 1.0; -CameraDistMin = 1.0; -CameraDistMax = 250.0; -CameraAccel = 5.0; +CameraDistMin = 1.0; +CameraDistMax = 250.0; +CameraAccel = 5.0; CameraSpeedMin = 2.0; CameraSpeedMax = 100.0; -CameraResetSpeed = 10.0; // Speed in radian/s +CameraResetSpeed = 10.0; // Speed in radian/s ////////////////// // SOUND CONFIG // ////////////////// -SoundForceSoftwareBuffer= 1; -SoundOn = 1; -UseEax = 0; +SoundForceSoftwareBuffer = 1; +SoundOn = 1; +UseEax = 0; -MaxTrack = 32; -MaxTrack_min = 4; -MaxTrack_max = 32; +MaxTrack = 32; +MaxTrack_min = 4; +MaxTrack_max = 32; MaxTrack_step = 4; // This is the volume for "InGame" sound FXs -SoundSFXVolume = 1.0; -SoundSFXVolume_min = 0.0; -SoundSFXVolume_max = 1.0; +SoundSFXVolume = 1.0; +SoundSFXVolume_min = 0.0; +SoundSFXVolume_max = 1.0; SoundSFXVolume_step = 0.001; // This is volume for "InGame" music. Does not affect the MP3 player -SoundGameMusicVolume = 0.5; -SoundGameMusicVolume_min = 0.0; -SoundGameMusicVolume_max = 1.0; +SoundGameMusicVolume = 0.5; +SoundGameMusicVolume_min = 0.0; +SoundGameMusicVolume_max = 1.0; SoundGameMusicVolume_step = 0.001; // MISC @@ -359,15 +359,15 @@ NegFiltersInfo = { "CLIMPD:", "CPath::lookup" , "LNET" }; NegFiltersWarning = { "'basics.Equipment Slot'.", "_usercolor.tga", "PACS" }; // Big screen shot -ScreenShotWidth = 0; +ScreenShotWidth = 0; ScreenShotHeight = 0; -ScreenShotFullDetail = 1; // 1 to switch full detail mode for characters (both standard & big screenshots) +ScreenShotFullDetail = 1; // 1 to switch full detail mode for characters (both standard & big screenshots) // Read : "ID", "R G B A MODE [FX]" SystemInfoColors = { // OLD STUFF Here for compatibility -"RG", "0 0 0 255 normal", // Black to see when there is an error +"RG", "0 0 0 255 normal", // Black to see when there is an error "BC", "0 0 0 255 normal", // Black to see when there is an error "JA", "0 0 0 255 normal", // Black to see when there is an error "BL", "0 0 0 255 normal", // Black to see when there is an error @@ -431,18 +431,18 @@ PrintfCommandsFreeTrial = { DisplayMissingAnimFile = 0; -LoadingStringCount = 54; +LoadingStringCount = 54; // Some R2 parameters ... -R2Mode = 1; -R2EDEnabled = 1; -R2EDExtendedDebug = 0; -R2EDLightPalette = 0; -R2ClientGw = "r2linux01"; -LoadLuaDebugger = 0; -CheckR2ScenarioMD5 = 1; +R2Mode = 1; +R2EDEnabled = 1; +R2EDExtendedDebug = 0; +R2EDLightPalette = 0; +R2ClientGw = "r2linux01"; +LoadLuaDebugger = 0; +CheckR2ScenarioMD5 = 1; LevelDesignEnabled = 0; DmCameraDistMax = 25; @@ -463,36 +463,37 @@ R2EDReloadFiles = { }; XMLInterfaceFiles = { - "config.xml", - "widgets.xml", + "config.xml", + "widgets.xml", "webig_widgets.xml", "appzone.xml", - "player.xml", - "inventory.xml", - "interaction.xml", + "player.xml", + "inventory.xml", + "interaction.xml", "phrase.xml", - "harvest.xml", - "macros.xml", - "info_player.xml", - "outpost.xml", - "guild.xml", - "taskbar.xml", + "harvest.xml", + "macros.xml", + "info_player.xml", + "outpost.xml", + "guild.xml", + "taskbar.xml", "game_config.xml", - "game_context_menu.xml", - "player_trade.xml", - "bot_chat_v4.xml", - "compass.xml", - "map.xml", + "game_context_menu.xml", + "player_trade.xml", + "bot_chat_v4.xml", + "compass.xml", + "map.xml", "hierarchy.xml", - "reset.xml", - "actions.xml", - "help.xml", - "encyclopedia.xml", - "commands.xml", - "commands2.xml", - "ring_access_point_filter.xml", - "ring_window.xml", + "reset.xml", + "actions.xml", + "help.xml", + "encyclopedia.xml", + "commands.xml", + "commands2.xml", + "ring_access_point_filter.xml", + "ring_window.xml", "bg_downloader.xml", + "ryzhome_toolbar.xml" }; XMLR2EDInterfaceFiles = @@ -587,7 +588,7 @@ HelpPages = WebIgMainDomain = "app.lirria.khaganat.net"; WebIgTrustedDomains = { - "api.lirria.khaganat.net", "app.lirria.khaganat.net", "lirria.khaganat.net" + "api.lirria.khaganat.net", "app.lirria.khaganat.net", "lirria.khaganat.net", "www.khaganat.net" }; //PatchletUrl = ""; diff --git a/client/exedll_win32/client_default.cfg b/client/exedll_win32/client_default.cfg old mode 100644 new mode 100755 index d54b489f..7bae6bd3 --- a/client/exedll_win32/client_default.cfg +++ b/client/exedll_win32/client_default.cfg @@ -46,13 +46,13 @@ PatchUrl = "http://lirria.khaganat.net:43435"; RingReleaseNotePath = "http://lirria.khaganat.net/patch/index.php"; StartupHost = "lirria.khaganat.net:40916"; StartupPage = "/login/r2_login.php"; -InstallStatsUrl = "https://lirria.khaganat.net:50000/stats/stats.php"; +InstallStatsUrl = "http://lirria.khaganat.net:50000/stats/stats.php"; -CreateAccountURL = "https://lirria.khaganat.net/ams/?page=register"; -EditAccountURL = "https://lirria.khaganat.net/"; -ForgetPwdURL = "https://lirria.khaganat.net/ams/index.php?page=forgot_password"; +CreateAccountURL = "http://lirria.khaganat.net/ams/?page=register"; +EditAccountURL = "http://lirria.khaganat.net/"; +ForgetPwdURL = "http://lirria.khaganat.net/ams/index.php?page=forgot_password"; //FreeTrialURL = "https://lirria.khaganat.net/"; -LoginSupportURL = "https://www.khaganat.net/irc"; +LoginSupportURL = "http://www.khaganat.net/irc"; ConditionsTermsURL = "khaganat.net/wikhan/fr:charte"; @@ -106,27 +106,27 @@ VerboseLog = 1; /////////// HardwareCursor = 1; -CursorSpeed = 1.0; // In pixels per mickey -CursorSpeed_min = 0.5; -CursorSpeed_max = 2.0; +CursorSpeed = 1.0; // In pixels per mickey +CursorSpeed_min = 0.5; +CursorSpeed_max = 2.0; -CursorAcceleration = 40; // Threshold in mickey +CursorAcceleration = 40; // Threshold in mickey CursorAcceleration_min = 20; CursorAcceleration_max = 80; -FreeLookSpeed = 0.004; // In radian per mickey -FreeLookSpeed_min = 0.0001; -FreeLookSpeed_max = 0.01; +FreeLookSpeed = 0.004; // In radian per mickey +FreeLookSpeed_min = 0.0001; +FreeLookSpeed_max = 0.01; -FreeLookAcceleration = 40; // Threshold in mickey -FreeLookAcceleration_min = 20; -FreeLookAcceleration_max = 80; +FreeLookAcceleration = 40; // Threshold in mickey +FreeLookAcceleration_min = 20; +FreeLookAcceleration_max = 80; -FreeLookInverted = 0; -FreeLookTablet = 0; -AutomaticCamera = 0; -DblClickMode = 1; -AutoEquipTool = 1; +FreeLookInverted = 0; +FreeLookTablet = 0; +AutomaticCamera = 0; +DblClickMode = 1; +AutoEquipTool = 1; /////////////////// // RENDER CONFIG // @@ -140,43 +140,43 @@ AutoEquipTool = 1; // *** LANDSCAPE LandscapeTileNear = 50.000000; -LandscapeTileNear_min = 20.000000; -LandscapeTileNear_max = 100.000000; +LandscapeTileNear_min = 5.000000; +LandscapeTileNear_max = 200.000000; LandscapeTileNear_step = 10.0; -LandscapeTileNear_ps0 = 20.0; +LandscapeTileNear_ps0 = 5.0; LandscapeTileNear_ps1 = 40.0; LandscapeTileNear_ps2 = 50.0; -LandscapeTileNear_ps3 = 80.0; +LandscapeTileNear_ps3 = 120.0; // NB: threshold is inverted ULandscape::setThreshold(), to be more intelligible LandscapeThreshold = 1000.0; -LandscapeThreshold_min = 100.0; // Low quality => 0.01 threshold -LandscapeThreshold_max = 2000.0; // High quality => 0.0005 threshold -LandscapeThreshold_step = 100.0; -LandscapeThreshold_ps0 = 100.0; +LandscapeThreshold_min = 50.0; // Low quality => 0.01 threshold +LandscapeThreshold_max = 3000.0; // High quality => 0.0005 threshold +LandscapeThreshold_step = 50.0; +LandscapeThreshold_ps0 = 50.0; LandscapeThreshold_ps1 = 500.0; LandscapeThreshold_ps2 = 1000.0; LandscapeThreshold_ps3 = 2000.0; -Vision = 500.000000; -Vision_min = 200.000000; -Vision_max = 800.000000; -Vision_step = 100.000000; -Vision_ps0 = 200.0; +Vision = 500.000000; +Vision_min = 100.000000; +Vision_max = 1500.000000; +Vision_step = 100.000000; +Vision_ps0 = 100.0; Vision_ps1 = 400.0; Vision_ps2 = 500.0; -Vision_ps3 = 800.0; +Vision_ps3 = 1000.0; -MicroVeget = 1; // Enable/Disable MicroVeget. +MicroVeget = 1; // Enable/Disable MicroVeget. MicroVeget_ps0 = 0; MicroVeget_ps1 = 1; MicroVeget_ps2 = 1; MicroVeget_ps3 = 1; -MicroVegetDensity = 80.0; +MicroVegetDensity = 80.0; MicroVegetDensity_min = 10.0; MicroVegetDensity_max = 100.0; -MicroVegetDensity_step = 10.0; +MicroVegetDensity_step = 10.0; MicroVegetDensity_ps0 = 10.0; // not used since disabled! MicroVegetDensity_ps1 = 30.0; MicroVegetDensity_ps2 = 80.0; @@ -184,46 +184,46 @@ MicroVegetDensity_ps3 = 100.0; // *** FX -FxNbMaxPoly = 20000; -FxNbMaxPoly_min = 2000; +FxNbMaxPoly = 20000; +FxNbMaxPoly_min = 1000; FxNbMaxPoly_max = 50000; -FxNbMaxPoly_step= 2000; -FxNbMaxPoly_ps0 = 2000; +FxNbMaxPoly_step = 1000; +FxNbMaxPoly_ps0 = 1000; FxNbMaxPoly_ps1 = 10000; FxNbMaxPoly_ps2 = 20000; FxNbMaxPoly_ps3 = 50000; -Cloud = 1; -Cloud_ps0 = 0 ; -Cloud_ps1 = 1 ; -Cloud_ps2 = 1 ; -Cloud_ps3 = 1 ; +Cloud = 1; +Cloud_ps0 = 0; +Cloud_ps1 = 1; +Cloud_ps2 = 1; +Cloud_ps3 = 1; -CloudQuality = 160.0; +CloudQuality = 160.0; CloudQuality_min = 80.0; CloudQuality_max = 320.0; -CloudQuality_step = 20.0; +CloudQuality_step = 20.0; CloudQuality_ps0 = 80.0; // not used since disabled! CloudQuality_ps1 = 80.0; CloudQuality_ps2 = 160.0; CloudQuality_ps3 = 320.0; -CloudUpdate = 1; +CloudUpdate = 1; CloudUpdate_min = 1; CloudUpdate_max = 8; -CloudUpdate_step= 1; +CloudUpdate_step = 1; CloudUpdate_ps0 = 1; // not used since disabled! CloudUpdate_ps1 = 1; CloudUpdate_ps2 = 1; CloudUpdate_ps3 = 3; -Shadows = 1; +Shadows = 1; Shadows_ps0 = 0; Shadows_ps1 = 1; Shadows_ps2 = 1; Shadows_ps3 = 1; -FXAA = 1; +FXAA = 1; FXAA_ps0 = 0; FXAA_ps1 = 1; FXAA_ps2 = 1; @@ -231,52 +231,52 @@ FXAA_ps3 = 1; AnisotropicFilter = 0; -Bloom = 1; +Bloom = 1; Bloom_ps0 = 0; -Bloom_ps1 = 1; +Bloom_ps1 = 0; Bloom_ps2 = 1; Bloom_ps3 = 1; SquareBloom = 1; SquareBloom_ps0 = 0; -SquareBloom_ps1 = 1; +SquareBloom_ps1 = 0; SquareBloom_ps2 = 1; SquareBloom_ps3 = 1; -DensityBloom = 255.0; +DensityBloom = 150.0; DensityBloom_min = 0.0; DensityBloom_max = 255.0; -DensityBloom_step = 1.0; -DensityBloom_ps0 = 255.0; -DensityBloom_ps1 = 255.0; -DensityBloom_ps2 = 255.0; -DensityBloom_ps3 = 255.0; +DensityBloom_step = 1.0; +DensityBloom_ps0 = 0; +DensityBloom_ps1 = 0; +DensityBloom_ps2 = 150.0; +DensityBloom_ps3 = 150.0; // *** CHARACTERS -SkinNbMaxPoly = 100000; +SkinNbMaxPoly = 100000; SkinNbMaxPoly_min = 5000; -SkinNbMaxPoly_max = 250000; -SkinNbMaxPoly_step = 5000; -SkinNbMaxPoly_ps0 = 10000; +SkinNbMaxPoly_max = 300000; +SkinNbMaxPoly_step = 5000; +SkinNbMaxPoly_ps0 = 5000; SkinNbMaxPoly_ps1 = 70000; SkinNbMaxPoly_ps2 = 100000; SkinNbMaxPoly_ps3 = 200000; -NbMaxSkeletonNotCLod = 125; +NbMaxSkeletonNotCLod = 125; NbMaxSkeletonNotCLod_min = 5; -NbMaxSkeletonNotCLod_max = 255; -NbMaxSkeletonNotCLod_step = 5; -NbMaxSkeletonNotCLod_ps0 = 10; -NbMaxSkeletonNotCLod_ps1 = 50; +NbMaxSkeletonNotCLod_max = 400; +NbMaxSkeletonNotCLod_step = 5; +NbMaxSkeletonNotCLod_ps0 = 5; +NbMaxSkeletonNotCLod_ps1 = 20; NbMaxSkeletonNotCLod_ps2 = 125; NbMaxSkeletonNotCLod_ps3 = 255; -CharacterFarClip = 200.0; -CharacterFarClip_min = 50.0; -CharacterFarClip_max = 500.0; -CharacterFarClip_step = 10.0; -CharacterFarClip_ps0 = 50.0; +CharacterFarClip = 200.0; +CharacterFarClip_min = 25.0; +CharacterFarClip_max = 1000.0; +CharacterFarClip_step = 10.0; +CharacterFarClip_ps0 = 25.0; CharacterFarClip_ps1 = 100.0; CharacterFarClip_ps2 = 200.0; CharacterFarClip_ps3 = 500.0; @@ -286,67 +286,67 @@ EnableRacialAnimation = 1; // *** MISC // This is the actual aspect ratio of your screen (no relation with the resolution!!). Set 1.7777 if you got a 16/9 screen for instance ScreenAspectRatio = 0.0; -ForceDXTC = 1; // Enable/Disable DXTC. -DivideTextureSizeBy2= 0; // Divide texture size -DisableVtxProgram = 0; // Disable Hardware Vertex Program. -DisableVtxAGP = 0; // Disable Hardware Vertex AGP. -DisableTextureShdr = 0; // Disable Hardware Texture Shader. -HDEntityTexture = 1; -HDTextureInstalled = 1; -WaitVBL = 0; // 0 or 1 to wait Vertical Sync. +ForceDXTC = 1; // Enable/Disable DXTC. +DivideTextureSizeBy2 = 0; // Divide texture size +DisableVtxProgram = 0; // Disable Hardware Vertex Program. +DisableVtxAGP = 0; // Disable Hardware Vertex AGP. +DisableTextureShdr = 0; // Disable Hardware Texture Shader. +HDEntityTexture = 1; +HDTextureInstalled = 1; +WaitVBL = 0; // 0 or 1 to wait Vertical Sync. ////////////////// // GAME OPTIONS // ////////////////// -SelectWithRClick = 1; -DisplayWeapons = 1; -RotKeySpeedMax = 2.0; +SelectWithRClick = 1; +DisplayWeapons = 1; +RotKeySpeedMax = 2.0; RotKeySpeedMax_min = 1.0; RotKeySpeedMax_max = 4.0; -RotKeySpeedMin = 1.0; +RotKeySpeedMin = 1.0; RotKeySpeedMin_min = 0.5; RotKeySpeedMin_max = 2.0; -RotAccel = 3.0; -FollowOnAtk = 0; -AtkOnSelect = 0; -ZCPacsPrim = "gen_bt_col_ext.pacs_prim"; +RotAccel = 3.0; +FollowOnAtk = 0; +AtkOnSelect = 0; +ZCPacsPrim = "gen_bt_col_ext.pacs_prim"; ///////////////// // PREFERENCES // ///////////////// -FPV = 0; // FPV(First Person View) : default is false (Third Person View). -CameraHeight = 2.2; // Camera Height (in meter) from the ground (for the Third Person View). +FPV = 0; // FPV(First Person View) : default is false (Third Person View). +CameraHeight = 2.2; // Camera Height (in meter) from the ground (for the Third Person View). CameraDistance = 3.0; // Camera Distance(in meter) from the user (for the Third Person View). CameraDistStep = 1.0; -CameraDistMin = 1.0; -CameraDistMax = 250.0; -CameraAccel = 5.0; +CameraDistMin = 1.0; +CameraDistMax = 250.0; +CameraAccel = 5.0; CameraSpeedMin = 2.0; CameraSpeedMax = 100.0; -CameraResetSpeed = 10.0; // Speed in radian/s +CameraResetSpeed = 10.0; // Speed in radian/s ////////////////// // SOUND CONFIG // ////////////////// -SoundForceSoftwareBuffer= 1; -SoundOn = 1; -UseEax = 0; +SoundForceSoftwareBuffer = 1; +SoundOn = 1; +UseEax = 0; -MaxTrack = 32; -MaxTrack_min = 4; -MaxTrack_max = 32; +MaxTrack = 32; +MaxTrack_min = 4; +MaxTrack_max = 32; MaxTrack_step = 4; // This is the volume for "InGame" sound FXs -SoundSFXVolume = 1.0; -SoundSFXVolume_min = 0.0; -SoundSFXVolume_max = 1.0; +SoundSFXVolume = 1.0; +SoundSFXVolume_min = 0.0; +SoundSFXVolume_max = 1.0; SoundSFXVolume_step = 0.001; // This is volume for "InGame" music. Does not affect the MP3 player -SoundGameMusicVolume = 0.5; -SoundGameMusicVolume_min = 0.0; -SoundGameMusicVolume_max = 1.0; +SoundGameMusicVolume = 0.5; +SoundGameMusicVolume_min = 0.0; +SoundGameMusicVolume_max = 1.0; SoundGameMusicVolume_step = 0.001; // MISC @@ -359,15 +359,15 @@ NegFiltersInfo = { "CLIMPD:", "CPath::lookup" , "LNET" }; NegFiltersWarning = { "'basics.Equipment Slot'.", "_usercolor.tga", "PACS" }; // Big screen shot -ScreenShotWidth = 0; +ScreenShotWidth = 0; ScreenShotHeight = 0; -ScreenShotFullDetail = 1; // 1 to switch full detail mode for characters (both standard & big screenshots) +ScreenShotFullDetail = 1; // 1 to switch full detail mode for characters (both standard & big screenshots) // Read : "ID", "R G B A MODE [FX]" SystemInfoColors = { // OLD STUFF Here for compatibility -"RG", "0 0 0 255 normal", // Black to see when there is an error +"RG", "0 0 0 255 normal", // Black to see when there is an error "BC", "0 0 0 255 normal", // Black to see when there is an error "JA", "0 0 0 255 normal", // Black to see when there is an error "BL", "0 0 0 255 normal", // Black to see when there is an error @@ -431,18 +431,18 @@ PrintfCommandsFreeTrial = { DisplayMissingAnimFile = 0; -LoadingStringCount = 54; +LoadingStringCount = 54; // Some R2 parameters ... -R2Mode = 1; -R2EDEnabled = 1; -R2EDExtendedDebug = 0; -R2EDLightPalette = 0; -R2ClientGw = "r2linux01"; -LoadLuaDebugger = 0; -CheckR2ScenarioMD5 = 1; +R2Mode = 1; +R2EDEnabled = 1; +R2EDExtendedDebug = 0; +R2EDLightPalette = 0; +R2ClientGw = "r2linux01"; +LoadLuaDebugger = 0; +CheckR2ScenarioMD5 = 1; LevelDesignEnabled = 0; DmCameraDistMax = 25; @@ -463,36 +463,37 @@ R2EDReloadFiles = { }; XMLInterfaceFiles = { - "config.xml", - "widgets.xml", + "config.xml", + "widgets.xml", "webig_widgets.xml", "appzone.xml", - "player.xml", - "inventory.xml", - "interaction.xml", + "player.xml", + "inventory.xml", + "interaction.xml", "phrase.xml", - "harvest.xml", - "macros.xml", - "info_player.xml", - "outpost.xml", - "guild.xml", - "taskbar.xml", + "harvest.xml", + "macros.xml", + "info_player.xml", + "outpost.xml", + "guild.xml", + "taskbar.xml", "game_config.xml", - "game_context_menu.xml", - "player_trade.xml", - "bot_chat_v4.xml", - "compass.xml", - "map.xml", + "game_context_menu.xml", + "player_trade.xml", + "bot_chat_v4.xml", + "compass.xml", + "map.xml", "hierarchy.xml", - "reset.xml", - "actions.xml", - "help.xml", - "encyclopedia.xml", - "commands.xml", - "commands2.xml", - "ring_access_point_filter.xml", - "ring_window.xml", + "reset.xml", + "actions.xml", + "help.xml", + "encyclopedia.xml", + "commands.xml", + "commands2.xml", + "ring_access_point_filter.xml", + "ring_window.xml", "bg_downloader.xml", + "ryzhome_toolbar.xml" }; XMLR2EDInterfaceFiles = @@ -587,7 +588,7 @@ HelpPages = WebIgMainDomain = "app.lirria.khaganat.net"; WebIgTrustedDomains = { - "api.lirria.khaganat.net", "app.lirria.khaganat.net", "lirria.khaganat.net" + "api.lirria.khaganat.net", "app.lirria.khaganat.net", "lirria.khaganat.net", "www.khaganat.net" }; //PatchletUrl = ""; diff --git a/client/exedll_win64/client_default.cfg b/client/exedll_win64/client_default.cfg old mode 100644 new mode 100755 index d54b489f..7bae6bd3 --- a/client/exedll_win64/client_default.cfg +++ b/client/exedll_win64/client_default.cfg @@ -46,13 +46,13 @@ PatchUrl = "http://lirria.khaganat.net:43435"; RingReleaseNotePath = "http://lirria.khaganat.net/patch/index.php"; StartupHost = "lirria.khaganat.net:40916"; StartupPage = "/login/r2_login.php"; -InstallStatsUrl = "https://lirria.khaganat.net:50000/stats/stats.php"; +InstallStatsUrl = "http://lirria.khaganat.net:50000/stats/stats.php"; -CreateAccountURL = "https://lirria.khaganat.net/ams/?page=register"; -EditAccountURL = "https://lirria.khaganat.net/"; -ForgetPwdURL = "https://lirria.khaganat.net/ams/index.php?page=forgot_password"; +CreateAccountURL = "http://lirria.khaganat.net/ams/?page=register"; +EditAccountURL = "http://lirria.khaganat.net/"; +ForgetPwdURL = "http://lirria.khaganat.net/ams/index.php?page=forgot_password"; //FreeTrialURL = "https://lirria.khaganat.net/"; -LoginSupportURL = "https://www.khaganat.net/irc"; +LoginSupportURL = "http://www.khaganat.net/irc"; ConditionsTermsURL = "khaganat.net/wikhan/fr:charte"; @@ -106,27 +106,27 @@ VerboseLog = 1; /////////// HardwareCursor = 1; -CursorSpeed = 1.0; // In pixels per mickey -CursorSpeed_min = 0.5; -CursorSpeed_max = 2.0; +CursorSpeed = 1.0; // In pixels per mickey +CursorSpeed_min = 0.5; +CursorSpeed_max = 2.0; -CursorAcceleration = 40; // Threshold in mickey +CursorAcceleration = 40; // Threshold in mickey CursorAcceleration_min = 20; CursorAcceleration_max = 80; -FreeLookSpeed = 0.004; // In radian per mickey -FreeLookSpeed_min = 0.0001; -FreeLookSpeed_max = 0.01; +FreeLookSpeed = 0.004; // In radian per mickey +FreeLookSpeed_min = 0.0001; +FreeLookSpeed_max = 0.01; -FreeLookAcceleration = 40; // Threshold in mickey -FreeLookAcceleration_min = 20; -FreeLookAcceleration_max = 80; +FreeLookAcceleration = 40; // Threshold in mickey +FreeLookAcceleration_min = 20; +FreeLookAcceleration_max = 80; -FreeLookInverted = 0; -FreeLookTablet = 0; -AutomaticCamera = 0; -DblClickMode = 1; -AutoEquipTool = 1; +FreeLookInverted = 0; +FreeLookTablet = 0; +AutomaticCamera = 0; +DblClickMode = 1; +AutoEquipTool = 1; /////////////////// // RENDER CONFIG // @@ -140,43 +140,43 @@ AutoEquipTool = 1; // *** LANDSCAPE LandscapeTileNear = 50.000000; -LandscapeTileNear_min = 20.000000; -LandscapeTileNear_max = 100.000000; +LandscapeTileNear_min = 5.000000; +LandscapeTileNear_max = 200.000000; LandscapeTileNear_step = 10.0; -LandscapeTileNear_ps0 = 20.0; +LandscapeTileNear_ps0 = 5.0; LandscapeTileNear_ps1 = 40.0; LandscapeTileNear_ps2 = 50.0; -LandscapeTileNear_ps3 = 80.0; +LandscapeTileNear_ps3 = 120.0; // NB: threshold is inverted ULandscape::setThreshold(), to be more intelligible LandscapeThreshold = 1000.0; -LandscapeThreshold_min = 100.0; // Low quality => 0.01 threshold -LandscapeThreshold_max = 2000.0; // High quality => 0.0005 threshold -LandscapeThreshold_step = 100.0; -LandscapeThreshold_ps0 = 100.0; +LandscapeThreshold_min = 50.0; // Low quality => 0.01 threshold +LandscapeThreshold_max = 3000.0; // High quality => 0.0005 threshold +LandscapeThreshold_step = 50.0; +LandscapeThreshold_ps0 = 50.0; LandscapeThreshold_ps1 = 500.0; LandscapeThreshold_ps2 = 1000.0; LandscapeThreshold_ps3 = 2000.0; -Vision = 500.000000; -Vision_min = 200.000000; -Vision_max = 800.000000; -Vision_step = 100.000000; -Vision_ps0 = 200.0; +Vision = 500.000000; +Vision_min = 100.000000; +Vision_max = 1500.000000; +Vision_step = 100.000000; +Vision_ps0 = 100.0; Vision_ps1 = 400.0; Vision_ps2 = 500.0; -Vision_ps3 = 800.0; +Vision_ps3 = 1000.0; -MicroVeget = 1; // Enable/Disable MicroVeget. +MicroVeget = 1; // Enable/Disable MicroVeget. MicroVeget_ps0 = 0; MicroVeget_ps1 = 1; MicroVeget_ps2 = 1; MicroVeget_ps3 = 1; -MicroVegetDensity = 80.0; +MicroVegetDensity = 80.0; MicroVegetDensity_min = 10.0; MicroVegetDensity_max = 100.0; -MicroVegetDensity_step = 10.0; +MicroVegetDensity_step = 10.0; MicroVegetDensity_ps0 = 10.0; // not used since disabled! MicroVegetDensity_ps1 = 30.0; MicroVegetDensity_ps2 = 80.0; @@ -184,46 +184,46 @@ MicroVegetDensity_ps3 = 100.0; // *** FX -FxNbMaxPoly = 20000; -FxNbMaxPoly_min = 2000; +FxNbMaxPoly = 20000; +FxNbMaxPoly_min = 1000; FxNbMaxPoly_max = 50000; -FxNbMaxPoly_step= 2000; -FxNbMaxPoly_ps0 = 2000; +FxNbMaxPoly_step = 1000; +FxNbMaxPoly_ps0 = 1000; FxNbMaxPoly_ps1 = 10000; FxNbMaxPoly_ps2 = 20000; FxNbMaxPoly_ps3 = 50000; -Cloud = 1; -Cloud_ps0 = 0 ; -Cloud_ps1 = 1 ; -Cloud_ps2 = 1 ; -Cloud_ps3 = 1 ; +Cloud = 1; +Cloud_ps0 = 0; +Cloud_ps1 = 1; +Cloud_ps2 = 1; +Cloud_ps3 = 1; -CloudQuality = 160.0; +CloudQuality = 160.0; CloudQuality_min = 80.0; CloudQuality_max = 320.0; -CloudQuality_step = 20.0; +CloudQuality_step = 20.0; CloudQuality_ps0 = 80.0; // not used since disabled! CloudQuality_ps1 = 80.0; CloudQuality_ps2 = 160.0; CloudQuality_ps3 = 320.0; -CloudUpdate = 1; +CloudUpdate = 1; CloudUpdate_min = 1; CloudUpdate_max = 8; -CloudUpdate_step= 1; +CloudUpdate_step = 1; CloudUpdate_ps0 = 1; // not used since disabled! CloudUpdate_ps1 = 1; CloudUpdate_ps2 = 1; CloudUpdate_ps3 = 3; -Shadows = 1; +Shadows = 1; Shadows_ps0 = 0; Shadows_ps1 = 1; Shadows_ps2 = 1; Shadows_ps3 = 1; -FXAA = 1; +FXAA = 1; FXAA_ps0 = 0; FXAA_ps1 = 1; FXAA_ps2 = 1; @@ -231,52 +231,52 @@ FXAA_ps3 = 1; AnisotropicFilter = 0; -Bloom = 1; +Bloom = 1; Bloom_ps0 = 0; -Bloom_ps1 = 1; +Bloom_ps1 = 0; Bloom_ps2 = 1; Bloom_ps3 = 1; SquareBloom = 1; SquareBloom_ps0 = 0; -SquareBloom_ps1 = 1; +SquareBloom_ps1 = 0; SquareBloom_ps2 = 1; SquareBloom_ps3 = 1; -DensityBloom = 255.0; +DensityBloom = 150.0; DensityBloom_min = 0.0; DensityBloom_max = 255.0; -DensityBloom_step = 1.0; -DensityBloom_ps0 = 255.0; -DensityBloom_ps1 = 255.0; -DensityBloom_ps2 = 255.0; -DensityBloom_ps3 = 255.0; +DensityBloom_step = 1.0; +DensityBloom_ps0 = 0; +DensityBloom_ps1 = 0; +DensityBloom_ps2 = 150.0; +DensityBloom_ps3 = 150.0; // *** CHARACTERS -SkinNbMaxPoly = 100000; +SkinNbMaxPoly = 100000; SkinNbMaxPoly_min = 5000; -SkinNbMaxPoly_max = 250000; -SkinNbMaxPoly_step = 5000; -SkinNbMaxPoly_ps0 = 10000; +SkinNbMaxPoly_max = 300000; +SkinNbMaxPoly_step = 5000; +SkinNbMaxPoly_ps0 = 5000; SkinNbMaxPoly_ps1 = 70000; SkinNbMaxPoly_ps2 = 100000; SkinNbMaxPoly_ps3 = 200000; -NbMaxSkeletonNotCLod = 125; +NbMaxSkeletonNotCLod = 125; NbMaxSkeletonNotCLod_min = 5; -NbMaxSkeletonNotCLod_max = 255; -NbMaxSkeletonNotCLod_step = 5; -NbMaxSkeletonNotCLod_ps0 = 10; -NbMaxSkeletonNotCLod_ps1 = 50; +NbMaxSkeletonNotCLod_max = 400; +NbMaxSkeletonNotCLod_step = 5; +NbMaxSkeletonNotCLod_ps0 = 5; +NbMaxSkeletonNotCLod_ps1 = 20; NbMaxSkeletonNotCLod_ps2 = 125; NbMaxSkeletonNotCLod_ps3 = 255; -CharacterFarClip = 200.0; -CharacterFarClip_min = 50.0; -CharacterFarClip_max = 500.0; -CharacterFarClip_step = 10.0; -CharacterFarClip_ps0 = 50.0; +CharacterFarClip = 200.0; +CharacterFarClip_min = 25.0; +CharacterFarClip_max = 1000.0; +CharacterFarClip_step = 10.0; +CharacterFarClip_ps0 = 25.0; CharacterFarClip_ps1 = 100.0; CharacterFarClip_ps2 = 200.0; CharacterFarClip_ps3 = 500.0; @@ -286,67 +286,67 @@ EnableRacialAnimation = 1; // *** MISC // This is the actual aspect ratio of your screen (no relation with the resolution!!). Set 1.7777 if you got a 16/9 screen for instance ScreenAspectRatio = 0.0; -ForceDXTC = 1; // Enable/Disable DXTC. -DivideTextureSizeBy2= 0; // Divide texture size -DisableVtxProgram = 0; // Disable Hardware Vertex Program. -DisableVtxAGP = 0; // Disable Hardware Vertex AGP. -DisableTextureShdr = 0; // Disable Hardware Texture Shader. -HDEntityTexture = 1; -HDTextureInstalled = 1; -WaitVBL = 0; // 0 or 1 to wait Vertical Sync. +ForceDXTC = 1; // Enable/Disable DXTC. +DivideTextureSizeBy2 = 0; // Divide texture size +DisableVtxProgram = 0; // Disable Hardware Vertex Program. +DisableVtxAGP = 0; // Disable Hardware Vertex AGP. +DisableTextureShdr = 0; // Disable Hardware Texture Shader. +HDEntityTexture = 1; +HDTextureInstalled = 1; +WaitVBL = 0; // 0 or 1 to wait Vertical Sync. ////////////////// // GAME OPTIONS // ////////////////// -SelectWithRClick = 1; -DisplayWeapons = 1; -RotKeySpeedMax = 2.0; +SelectWithRClick = 1; +DisplayWeapons = 1; +RotKeySpeedMax = 2.0; RotKeySpeedMax_min = 1.0; RotKeySpeedMax_max = 4.0; -RotKeySpeedMin = 1.0; +RotKeySpeedMin = 1.0; RotKeySpeedMin_min = 0.5; RotKeySpeedMin_max = 2.0; -RotAccel = 3.0; -FollowOnAtk = 0; -AtkOnSelect = 0; -ZCPacsPrim = "gen_bt_col_ext.pacs_prim"; +RotAccel = 3.0; +FollowOnAtk = 0; +AtkOnSelect = 0; +ZCPacsPrim = "gen_bt_col_ext.pacs_prim"; ///////////////// // PREFERENCES // ///////////////// -FPV = 0; // FPV(First Person View) : default is false (Third Person View). -CameraHeight = 2.2; // Camera Height (in meter) from the ground (for the Third Person View). +FPV = 0; // FPV(First Person View) : default is false (Third Person View). +CameraHeight = 2.2; // Camera Height (in meter) from the ground (for the Third Person View). CameraDistance = 3.0; // Camera Distance(in meter) from the user (for the Third Person View). CameraDistStep = 1.0; -CameraDistMin = 1.0; -CameraDistMax = 250.0; -CameraAccel = 5.0; +CameraDistMin = 1.0; +CameraDistMax = 250.0; +CameraAccel = 5.0; CameraSpeedMin = 2.0; CameraSpeedMax = 100.0; -CameraResetSpeed = 10.0; // Speed in radian/s +CameraResetSpeed = 10.0; // Speed in radian/s ////////////////// // SOUND CONFIG // ////////////////// -SoundForceSoftwareBuffer= 1; -SoundOn = 1; -UseEax = 0; +SoundForceSoftwareBuffer = 1; +SoundOn = 1; +UseEax = 0; -MaxTrack = 32; -MaxTrack_min = 4; -MaxTrack_max = 32; +MaxTrack = 32; +MaxTrack_min = 4; +MaxTrack_max = 32; MaxTrack_step = 4; // This is the volume for "InGame" sound FXs -SoundSFXVolume = 1.0; -SoundSFXVolume_min = 0.0; -SoundSFXVolume_max = 1.0; +SoundSFXVolume = 1.0; +SoundSFXVolume_min = 0.0; +SoundSFXVolume_max = 1.0; SoundSFXVolume_step = 0.001; // This is volume for "InGame" music. Does not affect the MP3 player -SoundGameMusicVolume = 0.5; -SoundGameMusicVolume_min = 0.0; -SoundGameMusicVolume_max = 1.0; +SoundGameMusicVolume = 0.5; +SoundGameMusicVolume_min = 0.0; +SoundGameMusicVolume_max = 1.0; SoundGameMusicVolume_step = 0.001; // MISC @@ -359,15 +359,15 @@ NegFiltersInfo = { "CLIMPD:", "CPath::lookup" , "LNET" }; NegFiltersWarning = { "'basics.Equipment Slot'.", "_usercolor.tga", "PACS" }; // Big screen shot -ScreenShotWidth = 0; +ScreenShotWidth = 0; ScreenShotHeight = 0; -ScreenShotFullDetail = 1; // 1 to switch full detail mode for characters (both standard & big screenshots) +ScreenShotFullDetail = 1; // 1 to switch full detail mode for characters (both standard & big screenshots) // Read : "ID", "R G B A MODE [FX]" SystemInfoColors = { // OLD STUFF Here for compatibility -"RG", "0 0 0 255 normal", // Black to see when there is an error +"RG", "0 0 0 255 normal", // Black to see when there is an error "BC", "0 0 0 255 normal", // Black to see when there is an error "JA", "0 0 0 255 normal", // Black to see when there is an error "BL", "0 0 0 255 normal", // Black to see when there is an error @@ -431,18 +431,18 @@ PrintfCommandsFreeTrial = { DisplayMissingAnimFile = 0; -LoadingStringCount = 54; +LoadingStringCount = 54; // Some R2 parameters ... -R2Mode = 1; -R2EDEnabled = 1; -R2EDExtendedDebug = 0; -R2EDLightPalette = 0; -R2ClientGw = "r2linux01"; -LoadLuaDebugger = 0; -CheckR2ScenarioMD5 = 1; +R2Mode = 1; +R2EDEnabled = 1; +R2EDExtendedDebug = 0; +R2EDLightPalette = 0; +R2ClientGw = "r2linux01"; +LoadLuaDebugger = 0; +CheckR2ScenarioMD5 = 1; LevelDesignEnabled = 0; DmCameraDistMax = 25; @@ -463,36 +463,37 @@ R2EDReloadFiles = { }; XMLInterfaceFiles = { - "config.xml", - "widgets.xml", + "config.xml", + "widgets.xml", "webig_widgets.xml", "appzone.xml", - "player.xml", - "inventory.xml", - "interaction.xml", + "player.xml", + "inventory.xml", + "interaction.xml", "phrase.xml", - "harvest.xml", - "macros.xml", - "info_player.xml", - "outpost.xml", - "guild.xml", - "taskbar.xml", + "harvest.xml", + "macros.xml", + "info_player.xml", + "outpost.xml", + "guild.xml", + "taskbar.xml", "game_config.xml", - "game_context_menu.xml", - "player_trade.xml", - "bot_chat_v4.xml", - "compass.xml", - "map.xml", + "game_context_menu.xml", + "player_trade.xml", + "bot_chat_v4.xml", + "compass.xml", + "map.xml", "hierarchy.xml", - "reset.xml", - "actions.xml", - "help.xml", - "encyclopedia.xml", - "commands.xml", - "commands2.xml", - "ring_access_point_filter.xml", - "ring_window.xml", + "reset.xml", + "actions.xml", + "help.xml", + "encyclopedia.xml", + "commands.xml", + "commands2.xml", + "ring_access_point_filter.xml", + "ring_window.xml", "bg_downloader.xml", + "ryzhome_toolbar.xml" }; XMLR2EDInterfaceFiles = @@ -587,7 +588,7 @@ HelpPages = WebIgMainDomain = "app.lirria.khaganat.net"; WebIgTrustedDomains = { - "api.lirria.khaganat.net", "app.lirria.khaganat.net", "lirria.khaganat.net" + "api.lirria.khaganat.net", "app.lirria.khaganat.net", "lirria.khaganat.net", "www.khaganat.net" }; //PatchletUrl = ""; diff --git a/data/ryz/ryz_zzz_bazaar/appzone.lua b/data/kh/kh_interfaces/appzone.lua similarity index 99% rename from data/ryz/ryz_zzz_bazaar/appzone.lua rename to data/kh/kh_interfaces/appzone.lua index 1332eb3d..c97cfedc 100644 --- a/data/ryz/ryz_zzz_bazaar/appzone.lua +++ b/data/kh/kh_interfaces/appzone.lua @@ -12,7 +12,7 @@ AppZone = { -- use client.cfg value when available local uri getClientCfg("AppZoneUrl") if uri == nil or uri == '' then - uri = 'http://app.ryzom.com/' + uri = 'http://app.liria.khaganat.net/' end AppZone.homeuri = uri .. AppZone.homeuri diff --git a/data/ryz/ryz_zzz_bazaar/ryzhome_toolbar.lua b/data/kh/kh_interfaces/ryzhome_toolbar.lua similarity index 88% rename from data/ryz/ryz_zzz_bazaar/ryzhome_toolbar.lua rename to data/kh/kh_interfaces/ryzhome_toolbar.lua index 21b035f4..8c7d6fdb 100644 --- a/data/ryz/ryz_zzz_bazaar/ryzhome_toolbar.lua +++ b/data/kh/kh_interfaces/ryzhome_toolbar.lua @@ -1,6 +1,6 @@ RyzhomeBar = { id = "ui:interface:webig_ryzhome_toolbar", - saveuri = "http://app.ryzom.com/app_ryzhome/index.php?action=toolbar_save", + saveuri = "http://app.lirria.khaganat.net/app_ryzhome/index.php?action=toolbar_save", selectedPage = 1 } @@ -11,22 +11,22 @@ function RyzhomeBar:close() end function RyzhomeBar:addItems() - local url = "http://app.ryzom.com/app_arcc/index.php?action=player_ryzhome_LuaListItems&command=add" + local url = "http://app.lirria.khaganat.net/app_arcc/index.php?action=player_ryzhome_LuaListItems&command=add" getUI("ui:interface:web_transactions:content:html"):browse(url) end function RyzhomeBar:moveItems() - local url = "http://app.ryzom.com/app_arcc/index.php?action=player_ryzhome_LuaListItems&command=move" + local url = "http://app.lirria.khaganat.net/app_arcc/index.php?action=player_ryzhome_LuaListItems&command=move" getUI("ui:interface:web_transactions:content:html"):browse(url) end function RyzhomeBar:removeItems() - local url = "http://app.ryzom.com/app_arcc/index.php?action=player_ryzhome_LuaListItems&command=remove" + local url = "http://app.lirria.khaganat.net/app_arcc/index.php?action=player_ryzhome_LuaListItems&command=remove" getUI("ui:interface:web_transactions:content:html"):browse(url) end function RyzhomeBar:inviteFriend() - local url = "http://app.ryzom.com/app_arcc/index.php?action=player_ryzhome_InviteFriend" + local url = "http://app.lirria.khaganat.net/app_arcc/index.php?action=player_ryzhome_InviteFriend" getUI("ui:interface:web_transactions:content:html"):browse(url) end @@ -128,7 +128,7 @@ function RyzhomeBar:useItem(id) end function RyzhomeBar:addItem(id) - local url = "http://app.ryzom.com/app_arcc/index.php?action=player_ryzhome_Place&command=add&id="..id + local url = "http://app.lirria.khaganat.net/app_arcc/index.php?action=player_ryzhome_Place&command=add&id="..id getUI("ui:interface:web_transactions:content:html"):browse(url) end @@ -137,12 +137,12 @@ function RyzhomeBar:removeItem(id) RyzhomeBar:spawnItems() local v = RyzhomeBar.spawnedItems[id] runAH(nil,"add_shape", "shape=sp_mort.ps|x="..v[2].."|y="..v[3].."|z="..v[4].."|angle="..v[5].."|scale="..tostring(tonumber(v[6])*4)..v[7]..v[8]..v[9]) - local url = "http://app.ryzom.com/app_arcc/index.php?action=player_ryzhome_Remove&id="..id + local url = "http://app.lirria.khaganat.net/app_arcc/index.php?action=player_ryzhome_Remove&id="..id getUI("ui:interface:web_transactions:content:html"):browse(url) end function RyzhomeBar:moveItem(id) - local url = "http://app.ryzom.com/app_arcc/index.php?action=player_ryzhome_Place&command=move&id="..id + local url = "http://app.lirria.khaganat.net/app_arcc/index.php?action=player_ryzhome_Place&command=move&id="..id getUI("ui:interface:web_transactions:content:html"):browse(url) end @@ -162,7 +162,7 @@ function RyzhomeBar:highlightItem(id) end function RyzhomeBar:callFriendUrl(action, target) - local url = "http://app.ryzom.com/app_arcc/index.php?action=player_ryzhome_"..action.."&target="..target + local url = "http://app.lirria.khaganat.net/app_arcc/index.php?action=player_ryzhome_"..action.."&target="..target getUI("ui:interface:web_transactions:content:html"):browse(url) end