diff --git a/ryzom/client/data/gamedev/interfaces_v3/config.xml b/ryzom/client/data/gamedev/interfaces_v3/config.xml index 29c7c74aa..2f7b6d0f4 100644 --- a/ryzom/client/data/gamedev/interfaces_v3/config.xml +++ b/ryzom/client/data/gamedev/interfaces_v3/config.xml @@ -919,7 +919,7 @@ This MUST follow the Enum MISSION_DESC::TIconId - + diff --git a/ryzom/client/data/gamedev/interfaces_v3/login_config.xml b/ryzom/client/data/gamedev/interfaces_v3/login_config.xml index 844f98050..f9be0aa43 100644 --- a/ryzom/client/data/gamedev/interfaces_v3/login_config.xml +++ b/ryzom/client/data/gamedev/interfaces_v3/login_config.xml @@ -428,7 +428,7 @@ This MUST follow the Enum MISSION_DESC::TIconId - + diff --git a/ryzom/client/data/gamedev/interfaces_v3/out_v2_config.xml b/ryzom/client/data/gamedev/interfaces_v3/out_v2_config.xml index c16c96d72..28edb2e98 100644 --- a/ryzom/client/data/gamedev/interfaces_v3/out_v2_config.xml +++ b/ryzom/client/data/gamedev/interfaces_v3/out_v2_config.xml @@ -13,7 +13,7 @@ - + diff --git a/ryzom/client/data/gamedev/interfaces_v3/outgame_config.xml b/ryzom/client/data/gamedev/interfaces_v3/outgame_config.xml index e38fb6720..210313745 100644 --- a/ryzom/client/data/gamedev/interfaces_v3/outgame_config.xml +++ b/ryzom/client/data/gamedev/interfaces_v3/outgame_config.xml @@ -13,7 +13,7 @@ - + diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp index 18568c7ed..dbedd3b80 100644 --- a/ryzom/client/src/connection.cpp +++ b/ryzom/client/src/connection.cpp @@ -512,7 +512,7 @@ bool connection (const string &cookie, const string &fsaddr) Actions.enable(false); EditActions.enable(false); - resetTextContext("noto_sans_display.ttf", true); + resetTextContext("noto_sans.ttf", true); if (InterfaceState == GOGOGO_IN_THE_GAME) { @@ -651,7 +651,7 @@ bool reconnection() Actions.enable(false); EditActions.enable(false); - resetTextContext("noto_sans_display.ttf", true); + resetTextContext("noto_sans.ttf", true); if (InterfaceState == GOGOGO_IN_THE_GAME) { diff --git a/ryzom/client/src/init.cpp b/ryzom/client/src/init.cpp index cd130ed76..2e7469b4b 100644 --- a/ryzom/client/src/init.cpp +++ b/ryzom/client/src/init.cpp @@ -1342,7 +1342,7 @@ void prelogInit() // Create a text context. We need to put the full path because we not already add search path - resetTextContext("noto_sans_display.ttf", true); + resetTextContext("noto_sans.ttf", true); CInterfaceManager::getInstance(); diff --git a/ryzom/server/src/entity_view_service/entity_view_service.cpp b/ryzom/server/src/entity_view_service/entity_view_service.cpp index 44161a4f7..0dd870ffc 100644 --- a/ryzom/server/src/entity_view_service/entity_view_service.cpp +++ b/ryzom/server/src/entity_view_service/entity_view_service.cpp @@ -371,7 +371,7 @@ void CEntityViewService::init() // Text context pDriver->setDisplay (UDriver::CMode(640, 480, 0)); pDriver->setFontManagerMaxMemory (2000000); - textContext=pDriver->createTextContext ("R:\\code\\ryzom\\data\\3d\\common\\fonts\\arialuni.ttf"); + textContext=pDriver->createTextContext ("R:\\graphics\\fonts\\noto_sans.ttf"); textContext->setHotSpot (UTextContext::TopLeft); textContext->setColor (CRGBA (255,255,255)); textContext->setFontSize (12); diff --git a/ryzom/tools/client/ryzom_installer/src/configfile.cpp b/ryzom/tools/client/ryzom_installer/src/configfile.cpp index bff6fb795..cddd45c65 100644 --- a/ryzom/tools/client/ryzom_installer/src/configfile.cpp +++ b/ryzom/tools/client/ryzom_installer/src/configfile.cpp @@ -598,7 +598,7 @@ bool CConfigFile::areRyzomDataInstalledIn(const QString &directory) const if (dir.entryList(QStringList() << "*.bnp", QDir::Files).size() < 200) return false; // ryzom.ttf or fonts.bnp is required - if (!dir.exists("fonts/ryzom.ttf") && !dir.exists("fonts.bnp")) return false; + if (!dir.exists("fonts/noto_sans.ttf") && !dir.exists("fonts.bnp")) return false; // gamedev.bnp is required if (!dir.exists("gamedev.bnp")) return false; diff --git a/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.cpp b/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.cpp index ead8dd53d..abcaf8ede 100644 --- a/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.cpp +++ b/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.cpp @@ -1289,7 +1289,7 @@ struct CViewerConfig ShapePath = "./"; MapsPath = "./"; Bank = "bank.bank"; - FontPath = "\\\\server\\code\\fonts\\arialuni.ttf"; + FontPath = "R:\\graphics\\fonts\\noto_sans.ttf"; ZFar = 1000; LandscapeTileNear = 50.0f; LandscapeThreshold = 0.001f; diff --git a/studio/src/plugins/gui_editor/nelgui_ctrl.cpp b/studio/src/plugins/gui_editor/nelgui_ctrl.cpp index 1f9091ae4..6b4517304 100644 --- a/studio/src/plugins/gui_editor/nelgui_ctrl.cpp +++ b/studio/src/plugins/gui_editor/nelgui_ctrl.cpp @@ -71,7 +71,7 @@ namespace GUIEditor NLMISC::CPath::remapExtension( "png", "tga", true ); w->init(); - w->createTextContext( "Ryzom.ttf" ); + w->createTextContext("noto_sans.ttf"); NLGUI::CAHManager::setEditorMode( true ); NLGUI::CLuaManager::setEditorMode( true ); diff --git a/studio/src/plugins/object_viewer/object_viewer.cpp b/studio/src/plugins/object_viewer/object_viewer.cpp index 240a0d9e9..528d34bc6 100644 --- a/studio/src/plugins/object_viewer/object_viewer.cpp +++ b/studio/src/plugins/object_viewer/object_viewer.cpp @@ -460,7 +460,7 @@ void CObjectViewer::loadConfig() #endif _CameraFocal = settings->value("CameraFocal", 75).toInt(); - _FontName = settings->value(Constants::FONT, "andbasr.ttf").toString().toUtf8().constData(); + _FontName = settings->value(Constants::FONT, "noto_sans.ttf").toString().toUtf8().constData(); _BloomEffect = settings->value(Constants::ENABLE_BLOOM, false).toBool(); _BloomDensity = settings->value(Constants::BLOOM_DENSITY, 0).toInt(); _BloomSquare = settings->value(Constants::ENABLE_SQUARE_BLOOM, false).toBool();