Merge branch 'develop'

This commit is contained in:
fed 2022-12-24 00:29:56 +01:00
commit 2dc2298bba
15 changed files with 50 additions and 18 deletions

View File

@ -1,5 +1,6 @@
{
"LUA_MENU_SERVERLIST": "LISTE DES SERVEURS",
"LUA_MENU_SERVERLIST": "Liste des serveurs",
"PLATFORM_SYSTEM_LINK_TITLE": "LISTE DES SERVEURS",
"MENU_NUMPLAYERS": "Joueurs",
"MENU_PING": "Latence",
"SERVERLIST_PLAYER_COUNT": "&&1 Joueurs",
@ -27,7 +28,5 @@
"UPDATER_POPUP_AVAILABLE_UPDATE_TEXT": "Une mise à jour est disponible,\npoursuivre l'installation ?",
"UPDATER_POPUP_SUCCESSFUL": "Mise à jour réussie",
"UPDATER_POPUP_RESTART_POPUP_TEXT": "La mise à jour nécessite un redémarrage",
"UPDATER_POPUP_CHECKING_FOR_UPDATES": "Vérification des mises à jour...",
"PLATFORM_SYSTEM_LINK_TITLE": "LISTE DES SERVEURS"
"UPDATER_POPUP_CHECKING_FOR_UPDATES": "Vérification des mises à jour..."
}

View File

@ -27,11 +27,14 @@
"PLATFORM_SHADER_PRECACHE_ASK": "Would you like to populate the shader cache? It may cause crashes with certain GPUs (e.g. RTX cards) but will improve performance if successful.",
"MENU_NO_DONT_ASK": "No, don't ask me again",
"LUA_MENU_SERVERLIST": "SERVER LIST",
"LUA_MENU_SERVERLIST": "Server list",
"PLATFORM_SYSTEM_LINK_TITLE": "SERVER LIST",
"MENU_NUMPLAYERS": "Players",
"MENU_PING": "Ping",
"SERVERLIST_PLAYER_COUNT": "&&1 Players",
"SERVERLIST_SERVER_COUNT": "&&1 Servers",
"EXE_SAY": "^3Match^7",
"EXE_SAYTEAM": "^5Team^7",
"LUA_MENU_STATS": "Stats",
"LUA_MENU_STATS_DESC": "Edit player stats settings.",

View File

@ -1,4 +1,8 @@
{
"LUA_MENU_SERVERLIST": "Serverliste",
"PLATFORM_SYSTEM_LINK_TITLE": "SERVERLISTE",
"MENU_NUMPLAYERS": "Spieler",
"MENU_PING": "Ping",
"LOCALE_ENGLISH": "Englisch",
"LOCALE_ENGLISH_SAFE": "Englisch (Sicher)",
"LOCALE_FRENCH": "Französisch",

View File

@ -1,4 +1,8 @@
{
"LUA_MENU_SERVERLIST": "Elenco dei server",
"PLATFORM_SYSTEM_LINK_TITLE": "ELENCO DEI SERVER",
"MENU_NUMPLAYERS": "Giocatori",
"MENU_PING": "Ping",
"LUA_MENU_CAMPAIGN_UNLOCKED_ALL_TITLE": "Sblocca tutte le missioni",
"LUA_MENU_CANCEL_UNLOCK_CAPS": "Annulla sblocco",

View File

@ -1,4 +1,8 @@
{
"LUA_MENU_SERVERLIST": "サーバーリスト",
"PLATFORM_SYSTEM_LINK_TITLE": "サーバーリスト",
"MENU_NUMPLAYERS": "プレイヤー",
"MENU_PING": "Ping",
"LOCALE_ENGLISH": "英語",
"LOCALE_ENGLISH_SAFE": "英語(検閲)",
"LOCALE_FRENCH": "フランス語",

View File

@ -1,4 +1,8 @@
{
"LUA_MENU_SERVERLIST": "서버 목록",
"PLATFORM_SYSTEM_LINK_TITLE": "서버 목록",
"MENU_NUMPLAYERS": "플레이어",
"MENU_PING": "핑",
"LOCALE_ENGLISH": "영어",
"LOCALE_ENGLISH_SAFE": "영어(검열)",
"LOCALE_FRENCH": "프랑스어",

View File

@ -1,4 +1,8 @@
{
"LUA_MENU_SERVERLIST": "Lista serwerów",
"PLATFORM_SYSTEM_LINK_TITLE": "LISTA SERWERÓW",
"MENU_NUMPLAYERS": "Gracze",
"MENU_PING": "Ping",
"LOCALE_ENGLISH": "Angielski",
"LOCALE_ENGLISH_SAFE": "Angielski (cenzuralny)",
"LOCALE_FRENCH": "Francuski",

View File

@ -1,4 +1,8 @@
{
"LUA_MENU_SERVERLIST": "Lista de servidores",
"PLATFORM_SYSTEM_LINK_TITLE": "LISTA DE SERVIDORES",
"MENU_NUMPLAYERS": "Jogadores",
"MENU_PING": "Ping",
"LOCALE_ENGLISH": "Inglês",
"LOCALE_ENGLISH_SAFE": "Inglês (Censurado)",
"LOCALE_FRENCH": "Français",

View File

@ -1,4 +1,8 @@
{
"LUA_MENU_SERVERLIST": "服务器列表",
"PLATFORM_SYSTEM_LINK_TITLE": "服务器列表",
"MENU_NUMPLAYERS": "玩家",
"MENU_PING": "Ping",
"LOCALE_ENGLISH": "英语",
"LOCALE_ENGLISH_SAFE": "英语 (审查制度)",
"LOCALE_FRENCH": "法语",

View File

@ -1,4 +1,8 @@
{
"LUA_MENU_SERVERLIST": "Lista de servidores",
"PLATFORM_SYSTEM_LINK_TITLE": "LISTA DE SERVIDORES",
"MENU_NUMPLAYERS": "Jugadores",
"MENU_PING": "Ping",
"LOCALE_ENGLISH": "Inglés",
"LOCALE_ENGLISH_SAFE": "Inglés (censura)",
"LOCALE_FRENCH": "Français",

View File

@ -1,4 +1,9 @@
{
"LUA_MENU_SERVERLIST": "伺服器列表",
"PLATFORM_SYSTEM_LINK_TITLE": "伺服器列表",
"MENU_NUMPLAYERS": "玩家",
"MENU_PING": "網路延遲",
"MENU_TYPE1": "類型",
"LOCALE_ENGLISH": "英文",
"LOCALE_ENGLISH_SAFE": "英文 (審查制度)",
"LOCALE_FRENCH": "法文",

View File

@ -7,10 +7,13 @@
"CUSTOM_DEPOT_EULA_6": "Команда H1-mod.",
"LUA_MENU_SERVERLIST": "Список серверов",
"PLATFORM_SYSTEM_LINK_TITLE": "СПИСОК СЕРВЕРОВ",
"MENU_NUMPLAYERS": "Игроки [+боты]",
"MENU_PING": "Пинг",
"SERVERLIST_PLAYER_COUNT": "Игроков: &&1",
"SERVERLIST_SERVER_COUNT": "Серверов: &&1",
"EXE_SAY": "^3Всем^7",
"EXE_SAYTEAM": "^5Команде^7",
"LUA_MENU_STATS": "Статистика",
"LUA_MENU_STATS_DESC": "Изменение статистических показателей игрока.",
@ -32,11 +35,6 @@
"LUA_MENU_3RD_PARTY_CONTENT_DESC": "Согласны загрузить сторонний контент, необходимый для игры на этом сервере? (&&1)",
"PLATFORM_SYSTEM_LINK_TITLE": "СПИСОК СЕРВЕРОВ",
"EXE_SAY": "^3Всем^7",
"EXE_SAYTEAM": "^5Команде^7",
"MENU_SB_TOOLTIP_BTN_REFRESH": "Обновить список",
"MENU_TYPE1": "Режим",
"SERVERLIST_ADD_TO_BLACKLIST": "Добавить в ЧС",

View File

@ -34,9 +34,6 @@ namespace chat
utils::hook::inject(0x18A980_b, reinterpret_cast<void*>(0x2E6F588_b));
utils::hook::call(0x33EDEC_b, ui_get_font_handle_stub);
localized_strings::override("EXE_SAY", "^3Match^7");
localized_strings::override("EXE_SAYTEAM", "^5Team^7");
// move chat position on the screen above menu splashes
dvars::override::register_vec2("cg_hudChatPosition", 5, 200, 0, 640, game::DVAR_FLAG_SAVED);
dvars::override::register_int("cg_chatHeight", 5, 0, 8, game::DVAR_FLAG_SAVED);

View File

@ -423,8 +423,6 @@ namespace server_list
return;
}
localized_strings::override("PLATFORM_SYSTEM_LINK_TITLE", "SERVER LIST");
// hook LUI_OpenMenu to refresh server list for system link menu
lui_open_menu_hook.create(game::LUI_OpenMenu, lui_open_menu_stub);

View File

@ -1042,7 +1042,7 @@ namespace game
DB_ZONE_BASEMAP = 0x20,
DB_ZONE_TRANSIENT_POOL = 0x40,
DB_ZONE_TRANSIENT_MASK = 0x40,
DB_ZONE_CUSTOM = 0x200 // added for custom zone loading
DB_ZONE_CUSTOM = 0x1000 // added for custom zone loading
};
struct XZoneInfo