diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg
index 0b52b584a..cdd7dee45 100644
--- a/code/ryzom/client/client_default.cfg
+++ b/code/ryzom/client/client_default.cfg
@@ -211,6 +211,8 @@ FXAA_ps1 = 1;
FXAA_ps2 = 1;
FXAA_ps3 = 1;
+AnisotropicFilter = 0;
+
Bloom = 1;
Bloom_ps0 = 0;
Bloom_ps1 = 1;
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
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/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
diff --git a/code/ryzom/client/src/init_main_loop.cpp b/code/ryzom/client/src/init_main_loop.cpp
index bc43cd39c..95e2a9caa 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)");
curl_easy_setopt(curl, CURLOPT_REFERER, string("http://www.ryzom.com/" + 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 bff77eb7f..644722511 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,24 +3527,22 @@ 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;
}
}
-
if (ClientCfg.AnisotropicFilter != anisotropic)
{
ClientCfg.AnisotropicFilter = anisotropic;
- ClientCfg.writeInt("AnisotropicFilter", anisotropic);
+ ClientCfg.writeInt("AnisotropicFilter", ClientCfg.AnisotropicFilter);
requestReboot = true;
}
}
-
// *** Apply the Screen AR
// since already set in the config file, need only to bkup the current version
CHandlerGameConfigInit::BkupScreenAspectRatio= ClientCfg.ScreenAspectRatio;
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)
{