From 3dafe1ff1f17ff723e32131e39bd163d7ce91bee Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 3 Dec 2015 14:33:32 +0100 Subject: [PATCH 1/6] Fixed: Anisotropic Filtering 2x didn't work --HG-- branch : develop --- code/ryzom/client/src/interface_v3/action_handler_game.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/action_handler_game.cpp b/code/ryzom/client/src/interface_v3/action_handler_game.cpp index bff77eb7f..e92db8e44 100644 --- a/code/ryzom/client/src/interface_v3/action_handler_game.cpp +++ b/code/ryzom/client/src/interface_v3/action_handler_game.cpp @@ -3517,6 +3517,7 @@ class CHandlerGameConfigApply : public IActionHandler } // **** Apply Anisotropic Filtering + // read value from DB, it's a combo so value is the index of text sint nAnisotropic = NLGUI::CDBManager::getInstance()->getDbProp( GAME_CONFIG_ANISOTROPIC_DB )->getValue32(); if (nAnisotropic >= 0) @@ -3526,9 +3527,9 @@ class CHandlerGameConfigApply : public IActionHandler // compute the real anisotropic value if (nAnisotropic > 0) { - anisotropic = 1; + anisotropic = 2; - for(size_t i = 0; i < nAnisotropic; ++i) + for(size_t i = 1; i < nAnisotropic; ++i) { anisotropic <<= 1; } @@ -3538,7 +3539,7 @@ class CHandlerGameConfigApply : public IActionHandler if (ClientCfg.AnisotropicFilter != anisotropic) { ClientCfg.AnisotropicFilter = anisotropic; - ClientCfg.writeInt("AnisotropicFilter", anisotropic); + ClientCfg.writeInt("AnisotropicFilter", ClientCfg.AnisotropicFilter); requestReboot = true; } } From a0c6c9096cf60ffabc87e6e4604db9a5ab53004d Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 3 Dec 2015 14:34:16 +0100 Subject: [PATCH 2/6] Changed: Change Anisotropic Filtering for next uploaded textures --HG-- branch : develop --- code/ryzom/client/src/main_loop_utilities.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/ryzom/client/src/main_loop_utilities.cpp b/code/ryzom/client/src/main_loop_utilities.cpp index cdd3f8394..81a52b2d3 100644 --- a/code/ryzom/client/src/main_loop_utilities.cpp +++ b/code/ryzom/client/src/main_loop_utilities.cpp @@ -237,6 +237,12 @@ void updateFromClientCfg() } } + //--------------------------------------------------- + if (ClientCfg.AnisotropicFilter != LastClientCfg.AnisotropicFilter) + { + Driver->setAnisotropicFilter(ClientCfg.AnisotropicFilter); + } + //--------------------------------------------------- if (ClientCfg.FXAA != LastClientCfg.FXAA) { From c2c30b4b962276cf37858f5104f12a87527dbdbc Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 3 Dec 2015 14:34:45 +0100 Subject: [PATCH 3/6] Changed: Minor changes --HG-- branch : develop --- code/ryzom/client/data/gamedev/interfaces_v3/player.xml | 2 +- code/ryzom/client/src/init_main_loop.cpp | 1 - code/ryzom/client/src/interface_v3/action_handler_game.cpp | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/player.xml b/code/ryzom/client/data/gamedev/interfaces_v3/player.xml index dc3d8598a..997d151fc 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/player.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/player.xml @@ -218,7 +218,7 @@ - + diff --git a/code/ryzom/client/src/init_main_loop.cpp b/code/ryzom/client/src/init_main_loop.cpp index ccab8b337..63bad66c4 100644 --- a/code/ryzom/client/src/init_main_loop.cpp +++ b/code/ryzom/client/src/init_main_loop.cpp @@ -182,7 +182,6 @@ struct CStatThread : public NLMISC::IRunnable CURL *curl = curl_easy_init(); if(!curl) return; curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1); -// curl_easy_setopt(curl, CURLOPT_USERAGENT, "unknown"); curl_easy_setopt(curl, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)"); // FIXME curl_easy_setopt(curl, CURLOPT_REFERER, string("http://www.ryzomcore.org/" + referer).c_str()); curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); diff --git a/code/ryzom/client/src/interface_v3/action_handler_game.cpp b/code/ryzom/client/src/interface_v3/action_handler_game.cpp index e92db8e44..644722511 100644 --- a/code/ryzom/client/src/interface_v3/action_handler_game.cpp +++ b/code/ryzom/client/src/interface_v3/action_handler_game.cpp @@ -3535,7 +3535,6 @@ class CHandlerGameConfigApply : public IActionHandler } } - if (ClientCfg.AnisotropicFilter != anisotropic) { ClientCfg.AnisotropicFilter = anisotropic; @@ -3544,7 +3543,6 @@ class CHandlerGameConfigApply : public IActionHandler } } - // *** Apply the Screen AR // since already set in the config file, need only to bkup the current version CHandlerGameConfigInit::BkupScreenAspectRatio= ClientCfg.ScreenAspectRatio; From 092fad98c9ab220e51e45b156be8d6894e35d649 Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 3 Dec 2015 14:35:02 +0100 Subject: [PATCH 4/6] Changed: Define default value for AnisotropicFilter --HG-- branch : develop --- code/ryzom/client/client_default.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg index 55e56b012..421d7b73c 100644 --- a/code/ryzom/client/client_default.cfg +++ b/code/ryzom/client/client_default.cfg @@ -220,6 +220,8 @@ FXAA_ps1 = 1; FXAA_ps2 = 1; FXAA_ps3 = 1; +AnisotropicFilter = 0; + Bloom = 0; Bloom_ps0 = 0; Bloom_ps1 = 1; From 7988232bcd5c1b865e9aa832db933b3dfc42d280 Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 3 Dec 2015 14:37:50 +0100 Subject: [PATCH 5/6] Fixed: Define right value for Russian and Spanish in UI:TEMP:LANGUAGE --HG-- branch : develop --- code/ryzom/client/data/gamedev/interfaces_v3/game_config.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/game_config.lua b/code/ryzom/client/data/gamedev/interfaces_v3/game_config.lua index 36584bcdf..dc39f93a1 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/game_config.lua +++ b/code/ryzom/client/data/gamedev/interfaces_v3/game_config.lua @@ -151,6 +151,10 @@ function game:configInit() langNb = 2; elseif (lang == 'fr') then langNb = 1; + elseif (lang == 'ru') then + langNb = 3; + elseif (lang == 'es') then + langNb = 4; end -- force observers call From 14f0f3454cfc92d559f0cef36804a81101442616 Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 3 Dec 2015 14:38:16 +0100 Subject: [PATCH 6/6] Changed: Define supportted languages in Info.plist --HG-- branch : develop --- code/ryzom/client/macosx/Info.plist | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/code/ryzom/client/macosx/Info.plist b/code/ryzom/client/macosx/Info.plist index 8072a90c1..199996f07 100644 --- a/code/ryzom/client/macosx/Info.plist +++ b/code/ryzom/client/macosx/Info.plist @@ -2,6 +2,8 @@ + CFBundleDevelopmentRegion + English CFBundleExecutable ${MACOSX_BUNDLE_EXECUTABLE_NAME} CFBundleGetInfoString @@ -27,13 +29,21 @@ NSHumanReadableCopyright ${MACOSX_BUNDLE_COPYRIGHT} LSMinimumSystemVersion - ${CMAKE_OSX_DEPLOYMENT_TARGET}.0 + ${CMAKE_OSX_DEPLOYMENT_TARGET} LSFileQuarantineEnabled CSResourcesFileMapped LSRequiresCarbon + CFBundleLocalizations + + en + fr + de + ru + es + LSApplicationCategoryType public.app-category.role-playing-games