Merge branch 'master' of https://github.com/coelckers/gzdoom into vulkan2

# Conflicts:
#	wadsrc/static/menudef.txt
This commit is contained in:
Rachael Alexanderson 2019-03-24 09:08:55 -04:00
commit 91dfebd211
18 changed files with 279 additions and 197 deletions

View file

@ -534,28 +534,11 @@ CVAR (Flag, sv_respawnsuper, dmflags2, DF2_RESPAWN_SUPER);
EXTERN_CVAR(Int, compatmode)
static int GetCompatibility(FLevelLocals *Level, int mask)
{
if (Level->info == nullptr) return mask;
else return (mask & ~Level->info->compatmask) | (Level->info->compatflags & Level->info->compatmask);
}
static int GetCompatibility2(FLevelLocals *Level, int mask)
{
return (Level->info == nullptr) ? mask
: (mask & ~Level->info->compatmask2) | (Level->info->compatflags2 & Level->info->compatmask2);
}
CUSTOM_CVAR (Int, compatflags, 0, CVAR_ARCHIVE|CVAR_SERVERINFO | CVAR_NOINITCALL)
{
for (auto Level : AllLevels())
{
int old = Level->i_compatflags;
Level->i_compatflags = GetCompatibility(Level, self) | Level->ii_compatflags;
if ((old ^ Level->i_compatflags) & COMPATF_POLYOBJ)
{
Level->ClearAllSubsectorLinks();
}
Level->ApplyCompatibility();
}
}
@ -563,7 +546,7 @@ CUSTOM_CVAR (Int, compatflags2, 0, CVAR_ARCHIVE|CVAR_SERVERINFO | CVAR_NOINITCAL
{
for (auto Level : AllLevels())
{
Level->i_compatflags2 = GetCompatibility2(Level, self) | Level->ii_compatflags2;
Level->ApplyCompatibility2();
Level->SetCompatLineOnSide(true);
}
}
@ -580,22 +563,23 @@ CUSTOM_CVAR(Int, compatmode, 0, CVAR_ARCHIVE|CVAR_NOINITCALL)
break;
case 1: // Doom2.exe compatible with a few relaxed settings
v = COMPATF_SHORTTEX|COMPATF_STAIRINDEX|COMPATF_USEBLOCKING|COMPATF_NODOORLIGHT|COMPATF_SPRITESORT|
COMPATF_TRACE|COMPATF_MISSILECLIP|COMPATF_SOUNDTARGET|COMPATF_DEHHEALTH|COMPATF_CROSSDROPOFF|
COMPATF_LIGHT|COMPATF_MASKEDMIDTEX;
w= COMPATF2_FLOORMOVE;
v = COMPATF_SHORTTEX | COMPATF_STAIRINDEX | COMPATF_USEBLOCKING | COMPATF_NODOORLIGHT | COMPATF_SPRITESORT |
COMPATF_TRACE | COMPATF_MISSILECLIP | COMPATF_SOUNDTARGET | COMPATF_DEHHEALTH | COMPATF_CROSSDROPOFF |
COMPATF_LIGHT | COMPATF_MASKEDMIDTEX;
w = COMPATF2_FLOORMOVE | COMPATF2_EXPLODE1;
break;
case 2: // same as 1 but stricter (NO_PASSMOBJ and INVISIBILITY are also set)
v = COMPATF_SHORTTEX|COMPATF_STAIRINDEX|COMPATF_USEBLOCKING|COMPATF_NODOORLIGHT|COMPATF_SPRITESORT|
COMPATF_TRACE|COMPATF_MISSILECLIP|COMPATF_SOUNDTARGET|COMPATF_NO_PASSMOBJ|COMPATF_LIMITPAIN|
COMPATF_DEHHEALTH|COMPATF_INVISIBILITY|COMPATF_CROSSDROPOFF|COMPATF_CORPSEGIBS|COMPATF_HITSCAN|
COMPATF_WALLRUN|COMPATF_NOTOSSDROPS|COMPATF_LIGHT|COMPATF_MASKEDMIDTEX;
w = COMPATF2_BADANGLES|COMPATF2_FLOORMOVE|COMPATF2_POINTONLINE;
v = COMPATF_SHORTTEX | COMPATF_STAIRINDEX | COMPATF_USEBLOCKING | COMPATF_NODOORLIGHT | COMPATF_SPRITESORT |
COMPATF_TRACE | COMPATF_MISSILECLIP | COMPATF_SOUNDTARGET | COMPATF_NO_PASSMOBJ | COMPATF_LIMITPAIN |
COMPATF_DEHHEALTH | COMPATF_INVISIBILITY | COMPATF_CROSSDROPOFF | COMPATF_CORPSEGIBS | COMPATF_HITSCAN |
COMPATF_WALLRUN | COMPATF_NOTOSSDROPS | COMPATF_LIGHT | COMPATF_MASKEDMIDTEX;
w = COMPATF2_BADANGLES | COMPATF2_FLOORMOVE | COMPATF2_POINTONLINE | COMPATF2_EXPLODE2;
break;
case 3: // Boom compat mode
v = COMPATF_TRACE|COMPATF_SOUNDTARGET|COMPATF_BOOMSCROLL|COMPATF_MISSILECLIP|COMPATF_MASKEDMIDTEX;
w = COMPATF2_EXPLODE1;
break;
case 4: // Old ZDoom compat mode
@ -604,14 +588,15 @@ CUSTOM_CVAR(Int, compatmode, 0, CVAR_ARCHIVE|CVAR_NOINITCALL)
break;
case 5: // MBF compat mode
v = COMPATF_TRACE|COMPATF_SOUNDTARGET|COMPATF_BOOMSCROLL|COMPATF_MISSILECLIP|COMPATF_MUSHROOM|
COMPATF_MBFMONSTERMOVE|COMPATF_NOBLOCKFRIENDS|COMPATF_MASKEDMIDTEX;
v = COMPATF_TRACE | COMPATF_SOUNDTARGET | COMPATF_BOOMSCROLL | COMPATF_MISSILECLIP | COMPATF_MUSHROOM |
COMPATF_MBFMONSTERMOVE | COMPATF_NOBLOCKFRIENDS | COMPATF_MASKEDMIDTEX;
w = COMPATF2_EXPLODE1;
break;
case 6: // Boom with some added settings to reenable some 'broken' behavior
v = COMPATF_TRACE|COMPATF_SOUNDTARGET|COMPATF_BOOMSCROLL|COMPATF_MISSILECLIP|COMPATF_NO_PASSMOBJ|
COMPATF_INVISIBILITY|COMPATF_CORPSEGIBS|COMPATF_HITSCAN|COMPATF_WALLRUN|COMPATF_NOTOSSDROPS|COMPATF_MASKEDMIDTEX;
w = COMPATF2_POINTONLINE;
v = COMPATF_TRACE | COMPATF_SOUNDTARGET | COMPATF_BOOMSCROLL | COMPATF_MISSILECLIP | COMPATF_NO_PASSMOBJ |
COMPATF_INVISIBILITY | COMPATF_CORPSEGIBS | COMPATF_HITSCAN | COMPATF_WALLRUN | COMPATF_NOTOSSDROPS | COMPATF_MASKEDMIDTEX;
w = COMPATF2_POINTONLINE | COMPATF2_EXPLODE2;
break;
}
@ -659,6 +644,8 @@ CVAR (Flag, compat_multiexit, compatflags2, COMPATF2_MULTIEXIT);
CVAR (Flag, compat_teleport, compatflags2, COMPATF2_TELEPORT);
CVAR (Flag, compat_pushwindow, compatflags2, COMPATF2_PUSHWINDOW);
CVAR (Flag, compat_checkswitchrange, compatflags2, COMPATF2_CHECKSWITCHRANGE);
CVAR (Flag, compat_explode1, compatflags2, COMPATF2_EXPLODE1);
CVAR (Flag, compat_explode2, compatflags2, COMPATF2_EXPLODE2);
CVAR(Bool, vid_activeinbackground, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)

View file

@ -329,6 +329,8 @@ enum : unsigned int
COMPATF2_TELEPORT = 1 << 5, // Don't let indirect teleports trigger sector actions
COMPATF2_PUSHWINDOW = 1 << 6, // Disable the window check in CheckForPushSpecial()
COMPATF2_CHECKSWITCHRANGE = 1 << 7, // Enable buggy CheckSwitchRange behavior
COMPATF2_EXPLODE1 = 1 << 8, // No vertical explosion thrust
COMPATF2_EXPLODE2 = 1 << 9 // Use original explosion code throughout.
};
// Emulate old bugs for select maps. These are not exposed by a cvar

View file

@ -2119,8 +2119,35 @@ int FLevelLocals::GetInfighting()
void FLevelLocals::SetCompatLineOnSide(bool state)
{
int on = (state && (i_compatflags2 & COMPATF2_POINTONLINE));
if (on) for (auto l : lines) l.flags |= ML_COMPATSIDE;
else for (auto l : lines) l.flags &= ML_COMPATSIDE;
if (on) for (auto &l : lines) l.flags |= ML_COMPATSIDE;
else for (auto &l : lines) l.flags &= ~ML_COMPATSIDE;
}
int FLevelLocals::GetCompatibility(int mask)
{
if (info == nullptr) return mask;
else return (mask & ~info->compatmask) | (info->compatflags & info->compatmask);
}
int FLevelLocals::GetCompatibility2(int mask)
{
return (info == nullptr) ? mask
: (mask & ~info->compatmask2) | (info->compatflags2 & info->compatmask2);
}
void FLevelLocals::ApplyCompatibility()
{
int old = i_compatflags;
i_compatflags = GetCompatibility(compatflags) | ii_compatflags;
if ((old ^ i_compatflags) & COMPATF_POLYOBJ)
{
ClearAllSubsectorLinks();
}
}
void FLevelLocals::ApplyCompatibility2()
{
i_compatflags2 = GetCompatibility2(compatflags2) | ii_compatflags2;
}
//==========================================================================

View file

@ -141,6 +141,11 @@ struct FLevelLocals
int FindNode (const FStrifeDialogueNode *node);
int GetInfighting();
void SetCompatLineOnSide(bool state);
int GetCompatibility(int mask);
int GetCompatibility2(int mask);
void ApplyCompatibility();
void ApplyCompatibility2();
void Init();
private:

View file

@ -1642,6 +1642,8 @@ MapFlagHandlers[] =
{ "compat_teleport", MITYPE_COMPATFLAG, 0, COMPATF2_TELEPORT },
{ "compat_pushwindow", MITYPE_COMPATFLAG, 0, COMPATF2_PUSHWINDOW },
{ "compat_checkswitchrange", MITYPE_COMPATFLAG, 0, COMPATF2_CHECKSWITCHRANGE },
{ "compat_explode1", MITYPE_COMPATFLAG, 0, COMPATF2_EXPLODE1 },
{ "compat_explode2", MITYPE_COMPATFLAG, 0, COMPATF2_EXPLODE2 },
{ "cd_start_track", MITYPE_EATNEXT, 0, 0 },
{ "cd_end1_track", MITYPE_EATNEXT, 0, 0 },
{ "cd_end2_track", MITYPE_EATNEXT, 0, 0 },

View file

@ -226,7 +226,7 @@ FTexture *FTexture::GetRawTexture()
if (OffsetLess) return OffsetLess;
// Reject anything that cannot have been a single-patch multipatch texture in vanilla.
auto image = static_cast<FMultiPatchTexture *>(GetImage());
if (bMultiPatch != 1 || UseType != ETextureType::Wall || Scale.X != 1 || Scale.Y != 1 || bWorldPanning || image == nullptr || image->NumParts != 1)
if (bMultiPatch != 1 || UseType != ETextureType::Wall || Scale.X != 1 || Scale.Y != 1 || bWorldPanning || image == nullptr || image->NumParts != 1 || _TopOffset[0] == 0)
{
OffsetLess = this;
return this;
@ -234,6 +234,15 @@ FTexture *FTexture::GetRawTexture()
// Set up a new texture that directly references the underlying patch.
// From here we cannot retrieve the original texture made for it, so just create a new one.
FImageSource *source = image->Parts[0].Image;
// Size must match for this to work as intended
if (source->GetWidth() != Width || source->GetHeight() != Height)
{
OffsetLess = this;
return this;
}
OffsetLess = new FImageTexture(source, "");
TexMan.AddTexture(OffsetLess);
return OffsetLess;

View file

@ -165,6 +165,8 @@ static FCompatOption Options[] =
{ "teleport", COMPATF2_TELEPORT, SLOT_COMPAT2 },
{ "disablepushwindowcheck", COMPATF2_PUSHWINDOW, SLOT_COMPAT2 },
{ "checkswitchrange", COMPATF2_CHECKSWITCHRANGE, SLOT_COMPAT2 },
{ "explode1", COMPATF2_EXPLODE1, SLOT_COMPAT2 },
{ "explode2", COMPATF2_EXPLODE2, SLOT_COMPAT2 },
{ NULL, 0, 0 }
};
@ -326,8 +328,8 @@ FName MapLoader::CheckCompatibility(MapData *map)
}
// Reset i_compatflags
compatflags.Callback();
compatflags2.Callback();
Level->ApplyCompatibility();
Level->ApplyCompatibility2();
// Set floatbob compatibility for all maps with an original Hexen MAPINFO.
if (Level->flags2 & LEVEL2_HEXENHACK)
{

View file

@ -157,7 +157,6 @@ bool MapLoader::LoadScriptFile (const char *name, bool include, int type)
auto fn = Wads.GetLumpFile(lumpnum);
auto wadname = Wads.GetWadName(fn);
if (stricmp(wadname, "STRIFE0.WAD") && stricmp(wadname, "STRIFE1.WAD") && stricmp(wadname, "SVE.WAD")) name = nullptr; // Only localize IWAD content.
if (name && !stricmp(name, "SCRIPT00")) name = nullptr; // This only contains random string references which already use the string table.
bool res = LoadScriptFile(name, lumpnum, lump, Wads.LumpLength(lumpnum), include, type);
return res;
@ -285,7 +284,7 @@ FStrifeDialogueNode *MapLoader::ReadRetailNode (const char *name, FileReader &lu
// Convert the rest of the data to our own internal format.
if (name)
if (name && strncmp(speech.Dialogue, "RANDOM_", 7))
{
FStringf label("$TXT_DLG_%s_d%d_%s", name, int(pos), TokenFromString(speech.Dialogue).GetChars());
node->Dialogue = GStrings.exists(label.GetChars()+1)? label : FString(speech.Dialogue);
@ -381,7 +380,7 @@ FStrifeDialogueNode *MapLoader::ReadTeaserNode (const char *name, FileReader &lu
}
// Convert the rest of the data to our own internal format.
if (name)
if (name && strncmp(speech.Dialogue, "RANDOM_", 7))
{
FStringf label("$TXT_DLG_%s_d%d_%s", name, pos, TokenFromString(speech.Dialogue).GetChars());
node->Dialogue = GStrings.exists(label.GetChars() + 1)? label : FString(speech.Dialogue);
@ -407,7 +406,7 @@ FStrifeDialogueNode *MapLoader::ReadTeaserNode (const char *name, FileReader &lu
// The speaker's name, if any.
speech.Dialogue[0] = 0; //speech.Name[16] = 0;
if (name && speech.Name[0])
if ((name && speech.Name[0]))
{
FString label = speech.Name;
label.ReplaceChars(' ', '_');

View file

@ -5889,7 +5889,8 @@ int P_RadiusAttack(AActor *bombspot, AActor *bombsource, int bombdamage, int bom
// them far too "active." BossBrains also use the old code
// because some user levels require they have a height of 16,
// which can make them near impossible to hit with the new code.
if (((flags & RADF_NODAMAGE) || !((bombspot->flags5 | thing->flags5) & MF5_OLDRADIUSDMG)) && !(flags & RADF_OLDRADIUSDAMAGE))
if ((flags & RADF_NODAMAGE) || (!((bombspot->flags5 | thing->flags5) & MF5_OLDRADIUSDMG) &&
!(flags & RADF_OLDRADIUSDAMAGE) && !(thing->Level->i_compatflags2 & COMPATF2_EXPLODE2)))
{
double points = GetRadiusDamage(false, bombspot, thing, bombdamage, bombdistance, fulldamagedistance, bombsource == thing);
double check = int(points) * bombdamage;
@ -5939,7 +5940,10 @@ int P_RadiusAttack(AActor *bombspot, AActor *bombsource, int bombdamage, int bom
}
thing->Thrust(bombspot->AngleTo(thing), thrust);
if (!(flags & RADF_NODAMAGE) || (flags & RADF_THRUSTZ))
thing->Vel.Z += vz; // this really doesn't work well
{
if (!(thing->Level->i_compatflags2 & COMPATF2_EXPLODE1) || (flags & RADF_THRUSTZ))
thing->Vel.Z += vz; // this really doesn't work well
}
}
}
}

View file

@ -197,6 +197,7 @@ BA4860C7A2F5D705DB32A1A38DB77EC4 // pl2.wad map10
EDA5CE7C462BD171BF8110AC56B67857 // pl2.wad map11
A9A9A728E689266939C1B71655F320CA // pl2.wad map25
62CA74092FC88C1E7FE2D0B1A8034E29 // pl2.wad map29
19E1CFD717FC6BBA9371F0F529B4CDFF // ur_final.wad map27
{
rebuildnodes
}

View file

@ -1543,7 +1543,9 @@ appuyez sur une touche.",,"Non puoi caricare una partita durante una net quest!
Premi un tasto.","impossivel carregar, porque
esta em partida online!
aperte uma tecla.",,
aperte uma tecla.","Невозможно загрузить сохранение в сетевой игре!
Нажмите любую клавишу.",
"Quicksave over your quest named
'%s'?
@ -1560,7 +1562,11 @@ Appuyez sur Y ou N.",,"Sovrascrivere il salvataggio
'%s'?
Premi Y oppure N.",,,
Premi Y oppure N.",,"Перезаписать быстрое сохранение
«%s»?
Нажмите Y или N.",
"You can't quickload during a netquest!
Press a key.",QLOADNET,chex,,,"Du kannst während eines Netzwerkspiels nicht schnellladen.
@ -1572,7 +1578,9 @@ vous êtes en ligne!
appuyez sur une touche.",,"Non puoi fare un quickload durante una netquest!
Premi un tasto.",,,
Premi un tasto.",,"Невозможно загрузить быстрое сохранение в сетевой игре!
Нажмите любую клавишу.",
"Do you want to quickload the quest named
'%s'?
@ -1589,7 +1597,11 @@ Appuyez sur Y ou N.",,"Vuoi fare un quickload della quest
'%s'?
Premi Y oppure N.",,,
Premi Y oppure N.",,"""Желите брзо учитавање за игру под именом
„%s“?
Притисните Y или N.""",
"You can't start a new quest
while in a network quest.
@ -1606,7 +1618,10 @@ durante una network quest.
Premi un tasto.","impossivel iniciar um novo jogo
enquanto se esta online.
aperte uma tecla.",,
aperte uma tecla.","You can't start a new game
while in a network game.
Press a key.",
"Careful, this will be tough.
Do you wish to continue?
@ -1779,7 +1794,7 @@ Go to console,OPTMNU_CONSOLE,,,,Öffne Konsole,Ir a la consola,,Ouvrir la consol
Reverb environment editor,OPTMNU_REVERB,,,,Hall-Editor,Editor de Amb. de Reverb.,,Editeur environement de révérb.,Visszhang-környezet szerkesztő,Editor ambiente reverb,,Редактор реверберации,Уредник одјека у околини
Language,OPTMNU_LANGUAGE,,,,Sprache,Idioma,,Langage,Nyelv,Lingua,,Язык,Језик
Customize Controls,CNTRLMNU_TITLE,,,,Steuerung einstellen,Personalizar Controles ,,Modifier contrôles,Irányítás Testreszabása,Personalizza i controlli,,Настройки управления,Подешавање контрола
"ENTER to change, BACKSPACE to clear",CNTRLMNU_SWITCHTEXT1,,,,ENTER: Editieren BACKSPACE: Löschen,"ENTER para cambiar, BACKSPACE para limpiar",,"ENTREE pour changer, RET. ARRIERE pour effacer.","ENTER a változtatáshoz, BACKSPACE a törléshez","INVIO per cambiare, BACKSPACE per pulire",,"ENTER — изменить, BACKSPACE — очистить","ENTER за промену, BACKSPACE за чишћење"
"ENTER to change, BACKSPACE to clear",CNTRLMNU_SWITCHTEXT1,,,,ENTER: Editieren BACKSPACE: Löschen,"ENTER para cambiar, BACKSPACE para limpiar",,"ENTREE pour changer, RET. ARRIERE pour effacer.","ENTER a változtatáshoz, BACKSPACE a törléshez","INVIO per modificare, BACKSPACE per ripulire",,"ENTER — изменить, BACKSPACE — очистить","ENTER за промену, BACKSPACE за чишћење"
"Press new key for control, ESC to cancel",CNTRLMNU_SWITCHTEXT2,,,,Drücke eine Taste oder ESC um abzubrechen,"Presiona una tecla para el control, ESC para cancelar",,"Appuyez sur la nouvelle touche pour l'assigner,
Appuyez sur ECHAP pour annuler.","Nyomj meg egy gombot, ESC a törléshez","Premi un nuovo tasto per il controllo, ESC per cancellare",,"Нажмите клавишу управления, ESC для отмены","Притисните ново дугме за одређивање контроле, ESC за отказивање"
Controls,CNTRLMNU_CONTROLS,,,,Steuerung,Controles,,Contrôles,Irányítás Testreszabása,Controlli,,Управление,Контроле
@ -1903,7 +1918,7 @@ Gender,PLYRMNU_PLAYERGENDER,,,,Geschlecht,Género,,Genre,Nem,Sesso,,Пол,По
Autoaim,PLYRMNU_AUTOAIM,,,,Automatisch zielen,Autoapuntar,,Auto-visée,Auto célzás,Mira automatica,,Автоприцеливание,Аутоматско циљање
Switch on pickup,PLYRMNU_SWITCHONPICKUP,,,,Beim aufnehmen Waffe selektieren,Cambiar arma al recoger,,Dernière arme,Felvételkor váltás,Cambia arma al momento della raccolta,,Перекл. оружия при подборе,Пребаци на покупљ.
Always Run,PLYRMNU_ALWAYSRUN,,,,Immer Laufen,Siempre correr,,Toujours courir,Mindig fusson,Corri sempre,,Постоянный бег,Увек трчи
PRESS \cjSPACE,PLYRMNU_PRESSSPACE,,,,\cjLeertaste,Presiona \cjEspacio,,\cjEspace,,PREMI \cjSPAZIO,,Нажмите \cjSPACE,ПРИТИСНИТЕ \cjSPACE
PRESS \cjSPACE,PLYRMNU_PRESSSPACE,,,,\cjLeertaste,Presiona \cjEspacio,,\cjEspace,,PREMI \cjSPAZIO,,Нажмите \cjПРОБЕЛ,ПРИТИСНИТЕ \cjSPACE
TO SEE FRONT,PLYRMNU_SEEFRONT,,,,für Frontansicht,Para ver de Frente,,Pour L'Avant,,PER VEDERE AVANTI,,Повернуть,ДА ВИДИТЕ СПРЕДА
TO SEE BACK,PLYRMNU_SEEBACK,,"Same as SEEFRONT in Russian. Intentional?
@ -2009,7 +2024,7 @@ Miscellaneous Options,MISCMNU_TITLE,,,,Verschiedene Optionen,Opciones Misceláne
Merge left+right Alt/Ctrl/Shift,MISCMNU_MERGEKEYS,,,,Linke und rechte Umschalt/Strg/Alt zusammenfassen,Combinar izq.+der. Alt/Ctrl/Mayús,,Combiner Alt/Ctrl/maj gauche & droite,,Unisci sinistra+destra Alt/Control/Maiusc,,Не разделять левый/правый ALT/CTRL/SHIFT,
Alt-Enter toggles fullscreen,MISCMNU_WINFULLSCREENTOGGLE,,,,Alt-Enter schaltet Vollbild an/aus,Alt+Enter alterna pantalla completa,,Alt-Entrée alterne plein écran,,Alt-Invio attiva/disattiva lo schermo pieno,,Переключение полного экрана по ALT+ENTER,
Command-F toggles fullscreen,MISCMNU_MACFULLSCREENTOGGLE,,,,Cmd-F schaltet Vollbild an/aus,Cmd-F alterna pantalla completa,,Command-F alterne plein écran,,Command-F attiva/disattiva lo schermo pieno,,Переключение полного экрана по Command+F,
Show IWAD selection dialog,MISCMNU_QUERYIWAD,,,,Zeige IWAD-Auswahl,Mostrar diálogo de selección de IWAD,,Afficher la séléction d'IWAD,,Mostra la schermata della selezione IWAD,,Выбор IWAD при запуске,
Show IWAD selection dialog,MISCMNU_QUERYIWAD,,,,Zeige IWAD-Auswahl,Mostrar diálogo de selección de IWAD,,Afficher la séléction d'IWAD,,Mostra la schermata della selezione IWAD,,Выбор IWAD-файла при запуске,
Enable cheats from all games,MISCMNU_ALLCHEATS,,,,Ermögliche Cheats aus allen Spielen,Activar trucos de todos los juegos,,Activer cheats de tous les jeux,,Abilita tutti i cheat da tutti i giochi,,Читы из всех игр,
Enable autosaves,MISCMNU_ENABLEAUTOSAVES,,,,Automatisches Speichern,Activar autoguardado,,Activer Sauvegardes auto,,Abilita i salvataggi automatici,,Автосохранения,
Number of autosaves,MISCMNU_AUTOSAVECOUNT,,,,Anzahl von automatischen Speicherständen,Número de autoguardados,,Total de sauvegardes auto,,Numero di salvataggi automatici,,Количество автосохранений,
@ -2056,7 +2071,7 @@ Toggle zoom,MAPCNTRLMNU_TOGGLEZOOM,,,,Zoom an/aus,Alternar zoom,,Alterner zoom,,
Toggle follow,MAPCNTRLMNU_TOGGLEFOLLOW,,,,Folgen an/aus,Alternar seguimiento,,Alterner suivi,,Abilita/disabilita scorrimento mappa,,Переключить слежение,
Toggle grid,MAPCNTRLMNU_TOGGLEGRID,,,,Gitter an/aus,Alternar cuadrícula,Alternar rejilla,Alterner grille,,Abilita/disabilita la griglia,,Переключить сетку,
Toggle texture,MAPCNTRLMNU_TOGGLETEXTURE,,,,Texturen an/aus,Alternar textura,,Alterner texture,,Abilita/disabilita le texture,,Переключить текстуры,
Set mark,MAPCNTRLMNU_SETMARK,,,,Setze Markierung,Fijar marca,,Placer repère,,Segna il posto,,Поставить отметку,
Set mark,MAPCNTRLMNU_SETMARK,,,,Setze Markierung,Fijar marca,,Placer repère,,Aggiungi segnaposto,,Поставить отметку,
Clear mark,MAPCNTRLMNU_CLEARMARK,,,,Lösche Markierung,Limpiar marca,,Enlever repères,,Pulisci il segnaposto,,Убрать отметку,
Customize Map Colors,MAPCOLORMNU_TITLE,,,Customize Map Colours,Automapfarben einstellen,Personalizar colores (mapa),,Couleurs Carte Personnalisées,,Personalizza i colori della mappa,,Настройки цветов автокарты,
Restore default custom colors,MAPCOLORMNU_DEFAULTMAPCOLORS,,,Restore default custom colours,Standardfarben wiederherstellen,Restaurar colores personalizados,,Couleurs par défaut,,Reimposta i colori personalizzati al default,,Вернуть стандартные цвета,
@ -2065,7 +2080,7 @@ You,MAPCOLORMNU_YOURCOLOR,,,,Du,Tú,,Votre couleur,,Tu,,Игрок,
1-sided walls,MAPCOLORMNU_WALLCOLOR,,,,Einseitige Wände,Paredes de 1 lado,,Murs à 1 côté,,Muri unilaterali,,Односторонние стены,
2-sided walls with different floors,MAPCOLORMNU_FDWALLCOLOR,,,,Zweiseitige Wände mit unterschiedlicher Bodenhöhe,Paredes de 2 lados con pisos distintos,,Murs à 2 côtés avec différents sols,,Muri bilaterali con pavimenti diversi,,Двусторонние стены,
2-sided walls with different ceilings,MAPCOLORMNU_CDWALLCOLOR,,,,Zweiseitige Wände mit unterschiedlicher Deckenhöhe,Paredes de 2 lados con techos distintos,,Murs à 2 côtés avec différents plafonds,,Muri bilaterali con soffitti diversi,,Двусторонние стены с разными потолками,
2-sided walls with 3D floors,MAPCOLORMNU_EFWALLCOLOR,,,,Zweiseitige Wände mit 3D-Ebenen,Paredes de 2 lados con suelos 3D,,Murs à 2 côtés avec sols 3d,,Muri bilaterali con floor 3D,,Двусторонние стены с разными полами,
2-sided walls with 3D floors,MAPCOLORMNU_EFWALLCOLOR,,,,Zweiseitige Wände mit 3D-Ebenen,Paredes de 2 lados con suelos 3D,,Murs à 2 côtés avec sols 3d,,Muri bilaterali con 3D floor,,Двусторонние стены с разными полами,
Map grid,MAPCOLORMNU_GRIDCOLOR,,,,Kartengitter,Cuadrícula del mapa,Rejilla del mapa,Quadrillage,,Griglia mappa,,Цвет сетки,
Center point,MAPCOLORMNU_XHAIRCOLOR,,,Centre point,Mittelpunkt,Punto central,,Point Central,,Punto centrale,,Курсор,
Not-yet-seen walls,MAPCOLORMNU_NOTSEENCOLOR,,,,Ungesehene Wände,Paredes sin ver,,Murs non découvers,,Muri ancora da scoprire,,Необнаруженные стены,
@ -2333,8 +2348,8 @@ Axis Configuration,JOYMNU_AXIS,,,,Achsenkonfiguration,Configuración del eje,,Co
Invert,JOYMNU_INVERT,,,,Invertieren,Invertir,,Inverser,,Inverti,,Инвертировать,
Dead zone,JOYMNU_DEADZONE,,,,Totzone,Zona muerta,,Zone neutre,,Zona cieca,,Мёртвая зона,
No configurable axes,JOYMNU_NOAXES,,,,Keine konfigurierbaren Achsen,No hay ejes configurables,,Aucun axe à configurer,,Nessun asse configurabile,,Нет настраиваемых осей,
Off,OPTVAL_OFF,,,,Aus,Desactivado,,,,Spento,,Откл.,
On,OPTVAL_ON,,,,An,Activado,,,,Acceso,,Вкл.,
Off,OPTVAL_OFF,,,,Aus,Desactivado,,,,Disattivo,,Откл.,
On,OPTVAL_ON,,,,An,Activado,,,,Attivo,,Вкл.,
Auto,OPTVAL_AUTO,,,,,,,,,Automatico,,Авто,
Male,OPTVAL_MALE,,,,Männlich,Masculino,,Masculin,,Maschio,,Мужской,
Female,OPTVAL_FEMALE,,,,Weiblich,Femenino,,Féminin,,Femmina,,Женский,
@ -2358,8 +2373,8 @@ Optimized,OPTVAL_OPTIMIZED,,,,Optimiert,Optimizado,,Optimisé,,Ottimizzato,,Оп
Classic (Faster),OPTVAL_CLASSIC,,,,Klassisch (schneller),Clásico (Más rápido),,Classique (+ Rapide),,Classico (più veloce),,Классический (Быстрее),
Precise,OPTVAL_PRECISE,,,,Genau,Preciso,,Précis,,Preciso,,Точный,
Normal,OPTVAL_NORMAL,,,,,,,,,Normale,,Обычный,
Stretch,OPTVAL_STRETCH,,,,Strecken,Estrechado,Estrecho,Etirer,,,,Растянутый,
Capped,OPTVAL_CAPPED,,,,Limitiert,Limitado,,Limité,,,,Ограниченный,
Stretch,OPTVAL_STRETCH,,,,Strecken,Estrechado,Estrecho,Etirer,,Disteso,,Растянутый,
Capped,OPTVAL_CAPPED,,,,Limitiert,Limitado,,Limité,,Limitato,,Ограниченный,
Particles,OPTVAL_PARTICLES,,,,Partikel,Partículas,,Particules,,Particelle,,Частицы,
Sprites,OPTVAL_SPRITES,,,,Sprites,,,,,Sprite,,Спрайты,
Sprites & Particles,OPTVAL_SPRITESPARTICLES,,,,Sprites und Partikel,Sprites y partículas,,Sprites & Particules,,Sprite e particelle,,Спрайты и частицы,
@ -2484,7 +2499,7 @@ Errors,OPTVAL_ERRORS,,,,Fehler,Errores,,Erreurs,,Errori,,Ошибки,
Warnings,OPTVAL_WARNINGS,,,,Warnungen,Advertencias,,Avertissements,,Avvisi,,Предупреждения,
Notifications,OPTVAL_NOTIFICATIONS,,,,Benachrichtigungen,Notificaciones,,,,Notifiche,,Уведомления,
Everything,OPTVAL_EVERYTHING,,,,Alles,Todo,,Tout,,Tutti,,Все,
OpenGL-Accelerated,OPTVAL_HWPOLY,,,,OpenGL hardwarebeschleunigt,Acelerado por OpenGL,,Accéléré par OpenGL,,Accelerazione OpenGL,,Аппаратный (OpenGL),
Hardware accelerated,OPTVAL_HWPOLY,,,,Hardwarebeschleunigt,Acelerado por Hardware,,Accéléré par Hardware,,Accelerazione Hardware,,Аппаратный,
Doom Software Renderer,OPTVAL_SWDOOM,,,,,Renderizado por Software de Doom,,Rendu Software Doom,,Motore grafico Doom software,,Программный,
True Color SW Renderer,OPTVAL_SWDOOMTC,,,,,Renderizado SW Color Verdadero,Renderizado SW True Color,Rendu Software Couleurs Réeles,,Motore grafico software a pieni colori,,Полноцветный програмный,
Softpoly Renderer,OPTVAL_SWPOLY,,,,,Renderizado Softpoly,,Rendu Softpoly,,Motore grafico Softpoly,,Полирендер,
@ -2544,12 +2559,12 @@ Quad,OPTSTR_QUAD,,,,,,,,,,,Четырёхместный,
No interpolation,OPTSTR_NOINTERPOLATION,,,,Keine Interpolation,Sin interpolación,,Pas d'interpolation,,No interpolazione,,Без интерполяции,
Spline,OPTSTR_SPLINE,,,,,,,,,,,Сплайн,
OpenAL,OPTSTR_OPENAL,,,,,,,,,,,,
OpenGL Renderer,DSPLYMNU_GLOPT,,,,,Renderizado OpenGL,,Moteur de Rendu OpenGL,,Motore grafico OpenGL,,Рендерер OpenGL,
Hardware Renderer,DSPLYMNU_GLOPT,,,,,Renderizado por Hardware,,Moteur de Rendu Hardware,,Motore grafico Hardware,,Рендерер OpenGL,
Software Renderer,DSPLYMNU_SWOPT,,,,,Renderizado por Software,,Moteur de Rendu Software,,Motore grafico Software,,Программный рендерер,
Gamma correction,DSPLYMNU_GAMMA,,,,Gammakorrektur,Corrección gamma,,Correction Gamma,,Correzione gamma,,Гамма-коррекция,
Contrast,DSPLYMNU_CONTRAST,,,,Kontrast,Contraste,,Contraste,,Contrasto,,Контраст,
Saturation,DSPLYMNU_SATURATION,,,,Sättigung,Saturación,,,,Saturazione,,Насыщенность,
OpenGL Options,GLMNU_TITLE,,,,OpenGL Optionen,Opciones de OpenGL,,Options OpenGL,,Opzioni OpenGL,,Настройки OpenGL,
Hardware Rendering Options,GLMNU_TITLE,,,,Hardware-Renderer Optionen,Opciones de OpenGL,,Options OpenGL,,Opzioni OpenGL,,Настройки OpenGL,
Dynamic Light Options,GLMNU_DYNLIGHT,,,,Dynamisches-Licht-Optionen,Opc. de luz dinámica,,Options Lumières Dynamiques,,Opzioni Luci Dinamiche,,Динамическое освещение,
Texture Options,GLMNU_TEXOPT,,,,Texturoptionen,Opc. de texturas,,Options Textures,,Opzioni Texture,,Настройки текстур,
Preferences,GLMNU_PREFS,,,,Einstellungen,Preferencias,,Préférences,,Preferenze,,Предпочтения,
@ -2569,14 +2584,14 @@ Precache GL textures,GLTEXMNU_PRECACHETEX,,,,GL Texturen zwischenspeichern,Preca
Trim sprite edges,GLTEXMNU_TRIMSPREDGE,,,,Leerraum in Sprites wegschneiden,Recortar líneas de sprite,,Nettoyer le bord des sprites,,Taglia gli spigoli agli sprite,,Обрезание краёв спрайтов,
Sort draw lists by texture,GLTEXMNU_SORTDRAWLIST,,,,Renderlisten nach Textur sortieren,Ordenar tablas por textura,,Ordonner liste de rendu par texture,,Ordina la lista draw per texture,,Сортировать списки текстур,
Dynamic Lights,GLLIGHTMNU_TITLE,,,,Dynamische Lichter,Luces dinámicas,,Lumières Dynamiques,,Luci Dinamiche,,Динамическое освещение,
Dynamic Lights (OpenGL),GLLIGHTMNU_LIGHTSENABLED,,,,Dynamische Lichter (OpenGL),Luces dinámicas (OpenGL),,Lumières Dynamiques (OpenGL),,Luci Dinamiche (OpenGL),,Динамическое освещение (OpenGL),
Enable light definitions,GLLIGHTMNU_LIGHTDEFS,,,,Lichtdefinitionen an,Activar definiciones de luz,,Activer les définitions GLDEFS,,Abilita le definizioni GLDEFS,,Включить определения света,
Dynamic Lights (Hardware),GLLIGHTMNU_LIGHTSENABLED,,,,Dynamische Lichter (Hardware),Luces dinámicas (Hardware),,Lumières Dynamiques (Hardware),,Luci Dinamiche (Hardware),,Динамическое освещение (OpenGL),
Enable light definitions,GLLIGHTMNU_LIGHTDEFS,,,Activer les définitions GLDEFS,Lichtdefinitionen an,Activar definiciones de luz,,,,Abilita le definizioni GLDEFS,,Включить определения света,
Lights affect sprites,GLLIGHTMNU_LIGHTSPRITES,,,,Sprites werden beleuchtet,Las luces afectan a los sprites,,Lumières affectent les sprites,,Le luci influiscono sugli sprite,,Освещение спрайтов,
Lights affect particles,GLLIGHTMNU_LIGHTPARTICLES,,,,Partikel werden beleuchtet,Las luces afectan a las partículas,,Lumières affectent les particules,,Le luci influiscono sulle particelle,,Освещение частиц,
Light shadowmaps,GLLIGHTMNU_LIGHTSHADOWMAP,,,,Shadowmaps für Lichter,Mapeo de sombra de Luz,,Shadowmaps,,Mappe shadow,,Свет на теневых картах,
Shadowmap quality,GLLIGHTMNU_LIGHTSHADOWMAPQUALITY,,,,Shadowmap Qualität,Calidad de Mapeo de Sombrad,,Qualité Shadowmap,,Qualità mappe shadow,,Качество теневых карт,
Shadowmap filter,GLLIGHTMNU_LIGHTSHADOWMAPFILTER,,,,Shadowmap Filter,Filtro de Mapeo de Sombras,,Filtre de Shadowmaps,,Filtro mappe shadow,,Фильтр теневых карт,
OpenGL Preferences,GLPREFMNU_TITLE,,,,OpenGL Einstellungen,Preferencias de OpenGL,,Préférences OpenGL,,Preferenze OpenGL,,Настройки OpenGL,
Hardware Rendering Options,GLPREFMNU_TITLE,,UNUSED!,,,,,,,,,,
Sector light mode,GLPREFMNU_SECLIGHTMODE,,,,Sektorlichtmodus,Modo de luz de sector,,Mode de lumière Secteur,,Modalità luce di settore,,Режим освещения секторов,
Fog mode,GLPREFMNU_FOGMODE,,,,Nebelmodus,Modo de niebla,,Mode du broullard,,Modalità nebbia,,Режим тумана,
Fog forces fullbright,GLPREFMNU_FOGFORCEFULLBRIGHT,,,,Nebel erzwingt volle Helligkeit,Forzar brillo completo en niebla,,Brouillard force fullbright,,La nebbia forza piena luce,,Туман увеличивает яркость,
@ -2694,7 +2709,7 @@ Linear filter when downscaling,TCMNU_MINFILTER,,,,Linearer Filter beim Herunters
Linear filter when upscaling,TCMNU_MAGFILTER,,,,Linearer Filter beim Hochskalieren,Filtro lineal por escalado,,Filtrage linéaire en agrandissement,,Filtro lineare per l'aumento,,Линейная фильтрация при увеличении,
Use mipmapped textures,TCMNU_MIPMAP,,,,Benutze Textur-Mipmaps,Usar texturas con mipmap,,Utiliser textures mipmappées,,Usa le texture mipmapped,,Мип-маппинг для текстур,
Dynamic lights (Software),TCMNU_DYNLIGHTS,,,,Dynamisches Licht (Software),Luces dinámicas (Software),,Lumières Dynamiques (Software),,Luci Dinamiche (Software),,Динамическое освещение (Программное),
Option Search,OS_TITLE,,,,Optionssuche,Buscar Opciones,,Recherche Option,,Opzioni di ricerca,,,
Option Search,OS_TITLE,,,,Optionssuche,Buscar Opciones,,Recherche Option,,Opzioni di ricerca,,Поиск настройки:,
Search for any term,OS_ANY,,,,Suche nach beliebigem Begriff,Buscar cualquier término,,N'importe quel mot,,Cerca per ciascun termine,,Искать любое из слов,
Search for all terms,OS_ALL,,,,Suche nach allen Begriffen,Buscar todos los términos,,Tous les mots,,Cerca per tutti i termini,,Искать все слова,
No results found.,OS_NO_RESULTS,,,,Keine Resultate,Ningun resultado.,,Pas de résultat trouvé,,Nessun risultato trovato.,,,
@ -2751,4 +2766,9 @@ High Dynamic Range,VKMNU_HDR,,,,,Alto Rango Dinámico,,,,,,,
Warning: The Vulkan renderer is highly experimental!,VK_WARNING,,,,Achtung: Der Vulkan Renderer ist noch sehr experimentell!,Advertencia: ¡El renderizado por Vulkan es altamente experimental!,,Attention: Le moteur de rendu Vulkan est très expérimental!,,Attenzione: il motore grafico Vulkan è altamente sperimentale!,,,
These options will require a restart to take effect.,VK_RESTART,,,,Diese Option erfordert einen Neustart!,Estas opciones requieren reiniciar para tener efecto.,,Ces options nécessitent un redémarrage.,,Queste opzioni richiedono il riavvio per avere effetto.,,,
Select Vulkan Device,VKMNU_DEVICESELECT,,This is not yet implemented - but it is planned,,Vulkan Gerät auswählen,Seleccionar Dispositivo Vulkan,,Sélectionner périphérique Vulkan,,Seleziona il Dispositivo Vulkan,,,
Press any key or click anywhere in the window to quit.,TXT_QUITENDOOM,,,,Drücke eine Taste oder klicke mit der Maus ins Fenster zum Beenden.,Presiona una tecla o haz click en cualquier lugar de la ventana para salir.,Presiona una tecla o da click en cualquier lugar de la ventana para salir.,Appuyez sur une touche ou cliquez pour quitter.,,,,,
Press any key or click anywhere in the window to quit.,TXT_QUITENDOOM,,,,Drücke eine Taste oder klicke mit der Maus ins Fenster zum Beenden.,Presiona una tecla o haz click en cualquier lugar de la ventana para salir.,Presiona una tecla o da click en cualquier lugar de la ventana para salir.,Appuyez sur une touche ou cliquez pour quitter.,,Premi un qualunque tasto o fai un click ovunque nella finestra per uscire.,,,
No vertical thrust from explosions,CMPTMNU_EXPLODE1,,,,Keine vertikale Bewegung durch Explosionen,,,,,Nessuna spinta verticale dalle esplosioni,,,
Use original Doom explosion behavior,CMPTMNU_EXPLODE2,,,Use original Doom explosion behaviour,Benutze Original Doom Explosionsverhalten,,,,,Usa l'originale comportamento dell'esplosione di Doom,,,
Screen Blend Options,HUDMNU_FLASH,,,,Überblendoptionen,,,,,,,,
Postprocessing,GLMNU_POSTPROCESS,,,,,,,,,,,,
3D mode,GLMNU_3DMODE,,,,3D Modus,Modo 3D,,Mode 3D,,Modalità 3D,,,
1 default Identifier Filter Remarks eng enc ena enz eni ens enj enb enl ent enw de es esa esb esc esd ese esf esg esh esi esl esm esn eso esr ess esu esv esy esz fr hu it pt ru sr
1543 Advanced options SNDMNU_ADVANCED Erweiterte Optionen Opciones avanzadas Options avancées Opzioni avanzate Расширенные настройки Напредне опције
1544 Module replayer options SNDMNU_MODREPLAYER Modul-Spieler-Optionen Opc. reproductor de módulos Options lecteur de module Opzioni Module replayer Параметры воспроизведения модулей Опције модулног риплејера
1545 Midi player options SNDMNU_MIDIPLAYER MIDI-Spieler-Optionen Opc. de reproductor MIDI Option lecteur MIDI Opzioni Midi player Настройки MIDI-проигрывателя MIDI плејер опције
1546 OpenAL Options OPENALMNU_TITLE OpenAL Optionen Opciones de OpenAL Options OpenAL Opzioni OpenAL Настройки OpenAL OpenAL опције
1547 Playback device OPENALMNU_PLAYBACKDEVICE Wiedergabegerät Dispositivo de reproducción Sortie sonore Dispositivo di playback Устройство воспроизведения
1548 Enable EFX OPENALMNU_ENABLEEFX EFX aktiv Permitir EFX Activer EFX Abilita EFX Включить EFX Укључи EFX
1549 Playback device Resampler OPENALMNU_PLAYBACKDEVICE OPENALMNU_RESAMPLER Wiedergabegerät Dispositivo de reproducción Sortie sonore Dispositivo di playback Устройство воспроизведения Ресемплер Ресемплер
1550 Enable EFX Advanced Sound Options OPENALMNU_ENABLEEFX ADVSNDMNU_TITLE EFX aktiv Erweiterte Soundoptionen Permitir EFX Opciones avanzadas de sonido Activer EFX Options Sonores Avancées Abilita EFX Opzioni avanzate dei suoni Включить EFX Расширенные настройки Укључи EFX
1551 Resampler Sample rate OPENALMNU_RESAMPLER ADVSNDMNU_SAMPLERATE Samplerate Frecuencia de muestreo Cadence de Sampling Ресемплер Частота дискретизации Ресемплер Фреквенција узорковања
1562 MIDI voices GUS memory size ADVSNDMNU_MIDIVOICES ADVSNDMNU_GUSMEMSIZE MIDI Stimmen GUS Speichergröße Voces MIDI Tamaño de memoria de GUS Voix MIDI Taille mémoire GUS Voci MIDI Dimensione della memoria per GUS MIDI-голоса Размер памяти GUS MIDI гласови GUS величина памћења
1563 Read DMXGUS lumps FluidSynth ADVSNDMNU_DMXGUS ADVSNDMNU_FLUIDSYNTH Lese DMXGUS Leer archivos DMXGUS Lire fichiers DMXGUS Leggi i lump DMXGUS Читать файлы DMXGUS Читај DMXGUS лумпове FluidSynth
1564 GUS memory size Patch set ADVSNDMNU_GUSMEMSIZE ADVSNDMNU_FLUIDPATCHSET GUS Speichergröße Patch-Set Tamaño de memoria de GUS Set de parche Taille mémoire GUS Banque de Sons Dimensione della memoria per GUS Размер памяти GUS Патч-набор GUS величина памћења Печ сет
1565 FluidSynth Gain ADVSNDMNU_FLUIDSYNTH ADVSNDMNU_FLUIDGAIN Relative Lautstärke Ganancia Усиление FluidSynth Појачање
1566 Reverb ADVSNDMNU_REVERB Hall Reverberación Réverbération Реверберация Одјек
1567 Reverb Level ADVSNDMNU_REVERB_LEVEL Hallintensität Nivel de Reverberación Niveau Réverb. Уровень реверберации Ниво одјека
1568 Chorus ADVSNDMNU_CHORUS Хорус
1569 Timidity++ ADVSNDMNU_TIMIDITY
1570 Patch set ADLMidi ADVSNDMNU_FLUIDPATCHSET ADVSNDMNU_ADLMIDI Patch-Set Set de parche Banque de Sons Патч-набор Печ сет
1571 Gain OPNMidi ADVSNDMNU_FLUIDGAIN ADVSNDMNU_OPNMIDI Relative Lautstärke Ganancia Усиление Појачање
1572 Reverb Timidity config file ADVSNDMNU_REVERB ADVSNDMNU_TIMIDITYCONFIG Hall Timidity Konfigurationsdatei Reverberación Ruta al archivo config. Timidity Réverbération Fichier de config. TiMidity File Timidity config Реверберация Файл конфигурации Timidity Одјек Timidity конфигурациона датотека
1578 Timidity config file Freeverb ADVSNDMNU_TIMIDITYCONFIG ADVSNDMNU_FREEVERB Timidity Konfigurationsdatei Ruta al archivo config. Timidity Fichier de config. TiMidity File Timidity config Файл конфигурации Timidity Timidity конфигурациона датотека
1579 Relative volume Global Freeverb ADVSNDMNU_TIMIDITYVOLUME ADVSNDMNU_GLOBAL_FREEVERB Relative Lautstärke Globales Freeverb Volumen relativo Freeverb Global Volume Relatif Freeverb Global Volume relativo Freeverb globale Относительная громкость Глобальный Freeverb Релативна јачина
1580 WildMidi Advanced Resampling ADVSNDMNU_WILDMIDI ADVSNDMNU_ADVRESAMPLING Erweitertes Resampling Resampleo Avanzado Resampling Avancé Resampling avanzato Продвинутый ресемплинг
1581 WildMidi config file OPL Bank ADVSNDMNU_WILDMIDICONFIG ADVSNDMNU_OPLBANK WilfMidi Konfigurationsdatei Archivo de config. WildMidi Banco OPL Fichier config. WildMidi Banque OPL File WildMidi config Файл конфигурации WildMidi WildMidi конфигурациона датотека
1582 OPL Emulator Core ADVSNDMNU_ADLOPLCORES OPL Emulatorkern Núcleos de Emulador OPL Cœur Emulateur OPL
1583 Run emulator at PCM rate ADVSNDMNU_RUNPCMRATE Emulator benutzt PCM Samplerate Ejecutar emulador a velocidad PCM Emulateur utilise cadence PCM Esegui l'emulatore con rate PCM
1584 Select configuration Number of emulated OPL chips ADVSNDMNU_SELCONFIG ADVSNDMNU_ADLNUMCHIPS Konfiguration wählen Anzahl OPL Chips Seleccionar configuración Número de chips OPL emulados Sélectionner configuration Puces OPL émulées Seleziona la configurazione Numero di chip OPL emulati Выбор конфигурации
1585 Global Volume model ADVSNDMNU_GLOBAL ADVSNDMNU_VLMODEL Lautstärkemodell Global Modelo de Volumen Modèle de Volume Globale Modello di volume Общие
1586 Freeverb Number of emulated OPN chips ADVSNDMNU_FREEVERB ADVSNDMNU_OPNNUMCHIPS Anzahl OPN Chips Número de chip OPN emulados Puces OPN émulées Numero di chip OPN emulati
1597 Use custom WOPN bank Module Replayer Options ADVSNDMNU_OPNCUSTOMBANK MODMNU_TITLE Benutzerdefinierte WOPN Bank Modul-Spieler-Optionen Utilizar banco WOPN personalizado Opciones de reproductor de módulos Utiliser Banque WOPL perso Options Lecteur de Module Usa WOPN bank personalizzato Opzioni Module replayer Параметры воспроизведения модулей
1598 WOPN Bank file Master Volume ADVSNDMNU_OPNBANKFILE MODMNU_MASTERVOLUME WOPN Bank-Datei Grundlautstärke Archivo de banco WOPN Volumen maestro Banque WOPL Volume maître File WOPN Bank Volume master Общая громкость
1599 Auto (Use setup of bank) Quality ADLVLMODEL_AUTO MODMNU_QUALITY Auto (Benutze Einstelliung der Bank) Qualität Auto (Usar config. del banco) Calidad Auto (Utiliser paramètre banque) Qualité Automatico (Usa le impostazioni del bank) Qualità Качество
1600 Generic Volume ramping ADLVLMODEL_GENERIC MODMNU_VOLUMERAMPING Allgemein Lautstärkeverhalten Genérico Aumento gradual de Volumen Générique Rampe du volume Generico Ramping volume
1601 Chip-o-matic MODMNU_CHIPOMATIC
1602 Video Mode VIDMNU_TITLE Videomodus Modos de video Mode Vidéo Modalità video Настройки видеорежима
1603 Render Mode VIDMNU_RENDERMODE Rendermodus Modo de Renderizado Mode de Rendu Modalità motore grafico Режим рендеринга
1604 Fullscreen VIDMNU_FULLSCREEN Vollbild Pantalla completa Plein écran Schermata piena Полный экран
1605 OPL Native Retina/HiDPI support ADLVLMODEL_NATIVE VIDMNU_HIDPI OPL Nativ Retina/HDPI-Unterstützung Nativo OPL Soporte para Retina/HiDPI OPL Natif Support Retina/HiDPI Supporto Retina/HiDPi Поддержка Retina/HiDPI
1606 DMX Aspect ratio ADLVLMODEL_DMX VIDMNU_ASPECTRATIO Seitenverhältnis Relación de aspecto Rapport D'Aspect Proporzioni Соотношение сторон
1607 Apogee Force aspect ratio ADLVLMODEL_APOGEE VIDMNU_FORCEASPECT Erzwinge Seitenverhältnis Forzar relación de aspecto Forcer Rapport Forza le proporzioni Принудительное соот. сторон
1618 Aspect ratio Choose Resolution Preset VIDMNU_ASPECTRATIO VIDMNU_RESPRESET Seitenverhältnis Auflösungsvoreinstellung Relación de aspecto Seleccionar Preset de Resolución Rapport D'Aspect Choisir paramètre personalisé Proporzioni Scegli preset di risoluzione Соотношение сторон Выбор пресета разрешения
1619 Force aspect ratio Custom Resolution Presets VIDMNU_FORCEASPECT VIDMNU_RESPRESETTTL Erzwinge Seitenverhältnis Benutzerdefinierte Auflösungsvoreinstellungen Forzar relación de aspecto Seleccionar Preset de Resoluciones Forcer Rapport Résolutions Personalisée Forza le proporzioni Preset di risoluzione personalizzati Принудительное соот. сторон Пользовательские пресеты
1620 Forced ratio style Preset Resolution Modes VIDMNU_CROPASPECT VIDMNU_RESPRESETHEAD Modus für erzwungenes Seitenverhältnis Vordefinierte Auflösungsmodi Relación de aspecto forzada Modos de Preset de Resolución Style de Ratio forcé Choisir mode de Résolution Forza lo stile delle proporzioni Modalità preset di risoluzione Принудительный тип соот. Доступные разрешения
1621 Enable 5:4 aspect ratio 4:3 Aspect VIDMNU_5X4ASPECTRATIO VIDMNU_ASPECT43 Erlaube 5:4 Seitenverhältnis 4:3 Seitenverhältnis Activar relación de aspecto 5:4 Aspecto 4:3 Activer Rapport 5:4 Rapport 4:3 Abilita le proporzioni 5:4 Aspetto 4:3 Включить соотношение сторон 5:4
1622 5:4 Aspect VIDMNU_ASPECT54 5:4 Seitenverhältnis Aspecto 5:4 Rapport 5:4 Aspetto 5:4
1623 16:9 Aspect VIDMNU_ASPECT169 16:9 Seitenverhältnis Aspecto 16:9 Rapport 16:9 Aspetto 16:9
1624 16:10 Aspect VIDMNU_ASPECT1610 16.10 Seitenverhältnis Aspecto 16:10 Rapport 16:10 Aspetto 16:10
1625 Resolution scale Network Options VIDMNU_SCALEMODE NETMNU_TITLE Skalierung Netzwerkeinstellungen Escala de Resolución Opciones de Red Echelle de Résolution Options Réseau Scala di risoluzione Opzioni network Масштабирование Настройки сети
1626 Scale Factor Local options VIDMNU_SCALEFACTOR NETMNU_LOCALOPTIONS Skalierungsfaktor Lokale Einstellungen Factor de Escala Opciones locales Facteur d'échelle Options Locales Fattore di scala Opzioni locali Значение масштаба Локальные настройки
1627 Use Linear Scaling (Fullscreen) Movement prediction VIDMNU_USELINEAR NETMNU_MOVEPREDICTION Lineare Skalierung (Vollbild) Bewegungsvorausberechnung Usar Escalado Linear (Pant. Completa) Predicción de Movimiento Mise à l'échelle Linéaire (Plein écran) Prédiction de Mouvement Usa lo scaling lineare (a schermo pieno) Predizione movimenti Линейное масшт. (полный экран) Предсказание движения
1794 Linear Warnings OPTVAL_LINEAR_3 OPTVAL_WARNINGS Warnungen Lineal Advertencias Linéaire Avertissements Lineare Avvisi Линейный Предупреждения
1795 Nearest Notifications OPTVAL_NEAREST OPTVAL_NOTIFICATIONS Nächster Nachbar Benachrichtigungen Cercano Notificaciones Nearest Il più vicino Notifiche Ближайший Уведомления
1796 PCF (Low) Everything OPTVAL_PCF_LOW OPTVAL_EVERYTHING PCF (niedrig) Alles PCF (Bajo) Todo PCF (Low) Tout PCF (basso) Tutti PCF (Низкий) Все
1797 PCF (Medium) Hardware accelerated OPTVAL_PCF_MEDIUM OPTVAL_HWPOLY PCF (mittel) Hardwarebeschleunigt PCF (Medio) Acelerado por Hardware PCF (Medium) Accéléré par Hardware PCF (medio) Accelerazione Hardware PCF (Средний) Аппаратный
1798 PCF (High) Doom Software Renderer OPTVAL_PCF_HIGH OPTVAL_SWDOOM PCF (hoch) PCF (Alto) Renderizado por Software de Doom PCF (High) Rendu Software Doom PCF (alto) Motore grafico Doom software PCF (Высокий) Программный
1799 Cubic True Color SW Renderer OPTVAL_CUBIC OPTVAL_SWDOOMTC Kubisch Cúbico Renderizado SW Color Verdadero Renderizado SW True Color Cubique Rendu Software Couleurs Réeles Cubico Motore grafico software a pieni colori Кубическое Полноцветный програмный
1800 Band-limited step Softpoly Renderer OPTVAL_BLEP OPTVAL_SWPOLY Bandbegrenzte Schritte Paso limitado por banda Renderizado Softpoly Step limité par bande Rendu Softpoly Passo limitato dalla banda Motore grafico Softpoly Полирендер
1918 Rendering quality Distance Between Your Eyes GLPREFMNU_RENDERQUALITY GLPREFMNU_VRIPD Renderqualität Abstand zwischen den Augen Calidad de Renderizado Distancia entre tus Ojos Qualité du rendu Distance entre vos yeux Qualità resa grafica Distranza tra i tuoi occhi Качество рендеринга Расстояние между глазами
1919 Menu Blur Distance From Your Screen GLPREFMNU_MENUBLUR GLPREFMNU_VRSCREENDIST Menüunschärfe Abstand vom Bildschirm Difuminación de Menú Distancia desde tú Pantalla Flou menu Distance entre vous et l'écran Blur del menu Distanza dal tuo schermo Размытие фона меню Расстояние от экрана
1920 Stereo 3D VR Smart GLPREFMNU_VRMODE OPTVAL_SMART Modo Stereo 3D VR Inteligente 3D VR Stéréo Intelligent Intelligente VR режим Умный
1921 Enable Quad Stereo Smarter GLPREFMNU_VRQUADSTEREO OPTVAL_SMARTER Quad Stereo aktivieren Activar Quad Stereo Más inteligente Activer Quad Stereo + Intelligent Abilita il Quad Stereo Ancora più intelligente 4-канальный звук Умнее
1922 Multisample Infrared only GLPREFMNU_MULTISAMPLE OPTVAL_INFRAREDONLY Nur Infrarot Solo infrarrojo Vis. Noct. Seulement Solo infrarossi Мультисэмплинг Только инфракрасный
1923 Tonemap Mode Infrared and torch GLPREFMNU_TONEMAP OPTVAL_INFRAREDANDTORCH Tonemap Modus Infrarot und Fackel Modo de mapa de tonos Infrarrojo y antorcha Mode Tonemap Iis Noct. & Torche Modalità Tonemap Infrarossi e torcia Режим тоун-мэппинга Инфракрасный и факел
1924 Bloom effect Any fixed colormap GLPREFMNU_BLOOM OPTVAL_ANYFIXEDCOLORMAP Any fixed colourmap Bloom Effekt Alle Lichteffekte Efecto Bloom Cualquier mapa de color fijo Effet surbrillance N'importe quelle colormap Effetto Bloom Ogni colormap fissata Режим блум Любая исправленная цветовая карта
2024 No results found. All Artifacts! OS_NO_RESULTS TXT_ALL_ARTIFACTS Keine Resultate Alle Artefakte! Ningun resultado. ¡Todos los Artefactos! Pas de résultat trouvé Tous les artéfacts! Nessun risultato trovato. Tutti gli Artefatti!
2025 Search: What do you want to kill outside of a game? OS_LABEL TXT_WHAT_KILL Suche: Was willst du eigentlich außerhalb eines Spiels töten? Buscar: ¿Que intentas matar fuera de una partida? Recherche: Que voulez-vous tuer en dehors d'une partie? Trova: Cosa vorresti uccidere fuori dal gioco?
2026 Always show keys Frozen player properties turned off AUTOMAPMNU_SHOWKEYS_ALWAYS TXT_NOT_FROZEN Zeige immer alle Schlüssel Gefrier-Modus abgeschaltet. Mostrar llaves siempre Propiedades de jugador congelado desactivadas Toujour afficher clés Propriété gelée du joueur annulée. Mostra sempre le chiavi Proprietà del giocatore ghiacciato disattivate
2027 %s cheats TXT_X_CHEATS Newly added content This is a gender sensitive message where %s represents the player %s schummelt %s hace trampa %s triche. %s imbroglia
2028 No Target ON Team changing has been disabled! TXT_NOTARGET_ON TXT_NO_TEAM_CHANGE I have no idea how to translate this to German without sounding incredibly stupid. notarget AN Teamwechsel ist deaktiviert! No Objetivo ACTIVADO ¡El cambio de equipo ha sido desactivado! Monstres aveugles et sourds ON Les changements d'équipe sont désactivés! Modalità Mostri ciechi e sordi ATTIVATA È stato disabilitato il cambio di squadra!
2029 No Target OFF %s joined the %t team TXT_NOTARGET_OFF TXT_JOINED_TEAM %s is the player and gender sensitive notarget AUS %s is dem %t Team beigetreten. No Objetivo DESACTIVADO %s se unió al equipo %t Monstres aveugles et sourds OFF %s a rejoint l'équipe %t. Modalità Mostri ciechi e sordi DISATTIVATA %s entra nel team %t
2030 "Quake with fear!" %s is now a loner. TXT_ANUBIS_ON TXT_LONER "Bebe vor Angst!" %s ist jetzt ein@[e_de] Einzelgänger@[in_de]. "¡Estremeceos de miedo!" %s es ahora solitari@[ao_esp] "Tremblez de terreur!" %s joue maintenant tout seul. "Trema con terrore!" %s è da solo
2071
2072
2073
2074
2075
2076
2077
2080
2081
2082
2083
2084
2085
2086
2348
2349
2350
2351
2352
2353
2354
2355
2373
2374
2375
2376
2377
2378
2379
2380
2499
2500
2501
2502
2503
2504
2505
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2709
2710
2711
2712
2713
2714
2715
2766
2767
2768
2769
2770
2771
2772
2773
2774

View file

@ -10,7 +10,7 @@ episode map01
episode level01
{
name = "$TXT_D1E2"
name = "$TXT_D2E2"
key = "n"
optional
}

View file

@ -862,8 +862,8 @@ OptionMenu "VideoOptions" protected
Submenu "$DSPLYMNU_GLOPT", "OpenGLOptions"
Submenu "$DSPLYMNU_SWOPT", "SWROptions"
Submenu "$DSPLYMNU_VKOPT", "VKOptions"
Submenu "$GLMNU_TEXOPT", "GLTextureGLOptions"
Submenu "$GLMNU_DYNLIGHT", "GLLightOptions"
Submenu "$DSPLYMNU_SCOREBOARD", "ScoreboardOptions"
StaticText " "
Slider "$DSPLYMNU_SCREENSIZE", "screenblocks", 3.0, 12.0, 1.0, 0
@ -872,20 +872,6 @@ OptionMenu "VideoOptions" protected
Slider "$DSPLYMNU_CONTRAST", "vid_contrast", 0.1, 3.0, 0.1
Slider "$DSPLYMNU_SATURATION", "vid_saturation", -3.0, 3.0, 0.25, 2
StaticText " "
Option "$DSPLYMNU_VSYNC", "vid_vsync", "OnOff"
Option "$DSPLYMNU_CAPFPS", "cl_capfps", "OffOn"
Slider "$DSPLYMNU_BLOODFADE", "blood_fade_scalar", 0.0, 1.0, 0.05, 2
Slider "$DSPLYMNU_PICKUPFADE", "pickup_fade_scalar", 0.0, 1.0, 0.05, 2
Slider "$DSPLYMNU_WATERFADE", "underwater_fade_scalar", 0.0, 1.0, 0.05, 2
StaticText " "
Option "$DSPLYMNU_WIPETYPE", "wipetype", "Wipes"
IfOption(Windows)
{
Option "$DSPLYMNU_SHOWENDOOM", "showendoom", "Endoom"
}
Option "$DSPLYMNU_DRAWFUZZ", "r_drawfuzz", "Fuzziness"
Option "$DSPLYMNU_OLDTRANS", "r_vanillatrans", "VanillaTrans"
Slider "$DSPLYMNU_TRANSSOUL", "transsouls", 0.25, 1.0, 0.05, 2
@ -900,15 +886,9 @@ OptionMenu "VideoOptions" protected
Option "$DSPLYMNU_TELEZOOM", "telezoom", "OnOff"
Slider "$DSPLYMNU_QUAKEINTENSITY", "r_quakeintensity", 0.0, 1.0, 0.05, 2
Option "$DSPLYMNU_NOMONSTERINTERPOLATION", "nomonsterinterpolation", "NoYes"
Slider "$DSPLYMNU_MENUDIM", "dimamount", 0, 1.0, 0.05, 2
ColorPicker "$DSPLYMNU_DIMCOLOR", "dimcolor"
IfOption(Windows)
{
StaticText " "
Option "$DSPLYMNU_GPUSWITCH", vid_gpuswitch, "GPUSwitch"
}
}
//-------------------------------------------------------------------------------------------
//
// HUD menu
@ -976,6 +956,8 @@ OptionMenu "HUDOptions" protected
Submenu "$HUDMNU_SCALEOPT", "ScalingOptions"
Submenu "$HUDMNU_ALTHUD", "AltHudOptions"
Submenu "$HUDMNU_MESSAGE", "MessageOptions"
Submenu "$HUDMNU_FLASH", "FlashOptions"
Submenu "$DSPLYMNU_SCOREBOARD", "ScoreboardOptions"
StaticText " "
Option "$HUDMNU_CROSSHAIR", "crosshair", "Crosshairs"
Option "$HUDMNU_FORCECROSSHAIR", "crosshairforce", "OnOff"
@ -988,15 +970,26 @@ OptionMenu "HUDOptions" protected
Option "$HUDMNU_NAMETAGCOLOR", "nametagcolor", "TextColors", "displaynametags"
Option "$HUDMNU_OLDOUCH", "st_oldouch", "OnOff"
StaticText " "
Slider "$DSPLYMNU_MOVEBOB", "movebob", 0, 1.0, 0.05, 2
Slider "$DSPLYMNU_STILLBOB", "stillbob", 0, 1.0, 0.05, 2
Slider "$DSPLYMNU_BOBSPEED", "wbobspeed", 0, 2.0, 0.1
StaticText " "
Slider "$DSPLYMNU_MENUDIM", "dimamount", 0, 1.0, 0.05, 2
ColorPicker "$DSPLYMNU_DIMCOLOR", "dimcolor"
}
OptionMenu "FlashOptions" protected
{
Title "$HUDMNU_FLASH"
Option "$HUDMNU_HEXENFLASHES", "pf_hexenweaps", "ZDoomHexen"
Option "$HUDMNU_POISONFLASHES", "pf_poison", "ZDoomHexen"
Option "$HUDMNU_ICEFLASHES", "pf_ice", "ZDoomHexen"
Option "$HUDMNU_HAZARDFLASHES", "pf_hazard", "ZDoomStrife"
StaticText " "
Slider "$DSPLYMNU_MOVEBOB", "movebob", 0, 1.0, 0.05, 2
Slider "$DSPLYMNU_STILLBOB", "stillbob", 0, 1.0, 0.05, 2
Slider "$DSPLYMNU_BOBSPEED", "wbobspeed", 0, 2.0, 0.1
Slider "$DSPLYMNU_BLOODFADE", "blood_fade_scalar", 0.0, 1.0, 0.05, 2
Slider "$DSPLYMNU_PICKUPFADE", "pickup_fade_scalar", 0.0, 1.0, 0.05, 2
Slider "$DSPLYMNU_WATERFADE", "underwater_fade_scalar", 0.0, 1.0, 0.05, 2
}
OptionMenu "ScalingOptions" protected
@ -1144,6 +1137,13 @@ OptionMenu "MiscOptions" protected
SafeCommand "$MISCMNU_CLEARNODECACHE", "clearnodecache"
StaticText " "
Option "$OPTMNU_LANGUAGE", "language", "LanguageOptions"
IfOption(Windows)
{
StaticText " "
Option "$DSPLYMNU_SHOWENDOOM", "showendoom", "Endoom"
}
}
//-------------------------------------------------------------------------------------------
@ -1660,6 +1660,8 @@ OptionMenu "CompatPhysicsMenu" protected
Option "$CMPTMNU_TRACE", "compat_TRACE", "YesNo"
Option "$CMPTMNU_HITSCAN", "compat_HITSCAN", "YesNo"
Option "$CMPTMNU_MISSILECLIP", "compat_MISSILECLIP", "YesNo"
Option "$CMPTMNU_EXPLODE1", "compat_explode1", "YesNo"
Option "$CMPTMNU_EXPLODE2", "compat_explode2", "YesNo"
Class "CompatibilityMenu"
}
@ -1813,7 +1815,7 @@ OptionValue MidiDevices
OptionMenu SoundOptions protected
{
Title "$SNDMNU_TITLE"
Slider "$SNDMNU_MASTERVOLUME", "snd_mastervolume", 0, 1, 0.05, 2
Slider "$MODMNU_MASTERVOLUME", "snd_mastervolume", 0, 1, 0.05, 2
StaticText " "
Slider "$SNDMNU_SFXVOLUME", "snd_sfxvolume", 0, 1, 0.05, 2
Slider "$SNDMNU_MUSICVOLUME", "snd_musicvolume", 0, 1, 0.05, 2
@ -2152,12 +2154,20 @@ OptionMenu VideoModeMenu protected
{
Option "$VIDMNU_HIDPI", "vid_hidpi", "YesNo"
}
IfOption(Windows)
{
Option "$DSPLYMNU_GPUSWITCH", vid_gpuswitch, "GPUSwitch"
}
Option "$VIDMNU_FORCEASPECT", "vid_aspect", "ForceRatios"
Option "$VIDMNU_CROPASPECT", "vid_cropaspect", "CropAspect"
Option "$VIDMNU_SCALEMODE", "vid_scalemode", "ScaleModes"
Slider "$VIDMNU_SCALEFACTOR", "vid_scalefactor", 0.25, 2.0, 0.25, 2
StaticText " "
Option "$DSPLYMNU_VSYNC", "vid_vsync", "OnOff"
Option "$DSPLYMNU_CAPFPS", "cl_capfps", "OffOn"
StaticText ""
StaticText "$VIDMNU_CUSTOMRES"
TextField "$VIDMNU_CUSTOMX", menu_resolution_custom_width
@ -2456,7 +2466,6 @@ OptionValue ShadowMapFilter
OptionMenu "GLTextureGLOptions" protected
{
Title "$GLTEXMNU_TITLE"
Option "$GLTEXMNU_TEXENABLED", gl_texture, "YesNo"
Option "$GLTEXMNU_TEXFILTER", gl_texture_filter, "FilterModes"
Option "$GLTEXMNU_ANISOTROPIC", gl_texture_filter_anisotropic, "Anisotropy"
Option "$GLTEXMNU_ENABLEHIRES", gl_texture_usehires, "YesNo"
@ -2496,7 +2505,8 @@ OptionMenu "GLLightOptions" protected
OptionMenu "OpenGLOptions" protected
{
Title "$GLMNU_TITLE"
Submenu "$GLMNU_TEXOPT", "GLTextureGLOptions"
Submenu "$GLPREFMNU_VRMODE", "VR3DMenu"
Submenu "$GLMNU_POSTPROCESS", "PostProcessMenu"
StaticText " "
Option "$GLPREFMNU_SECLIGHTMODE", gl_lightmode, "LightingModes"
Option "$GLPREFMNU_SWLMBANDED", gl_bandedswlight, "OnOff"
@ -2516,22 +2526,31 @@ OptionMenu "OpenGLOptions" protected
StaticText " "
Slider "$GLPREFMNU_MENUBLUR", gl_menu_blur, 0, 5.0, 0.5, 2
StaticText " "
Option "$GLPREFMNU_VRMODE", vr_mode, "VRMode"
Option "$GLPREFMNU_MULTISAMPLE", gl_multisample, "Multisample"
}
OptionMenu "VR3DMenu" protected
{
Title "GLPREFMNU_VRMODE"
Option "$GLMNU_3DMODE", vr_mode, "VRMode"
IfOption(Windows)
{
Option "$GLPREFMNU_VRQUADSTEREO", vr_enable_quadbuffered, "OnOff"
}
Slider "$GLPREFMNU_VRIPD", vr_ipd, 0.041, 0.073, 0.001, 3
Slider "$GLPREFMNU_VRSCREENDIST", vr_screendist, 0.2, 10.0, 0.1, 1
StaticText " "
Option "$GLPREFMNU_MULTISAMPLE", gl_multisample, "Multisample"
Option "$GLPREFMNU_TONEMAP", gl_tonemap, "TonemapModes"
}
OptionMenu "PostProcessMenu" protected
{
Title "$GLMNU_POSTPROCESS"
Option "$GLPREFMNU_BLOOM", gl_bloom, "OnOff"
Option "$GLPREFMNU_LENS", gl_lens, "OnOff"
Option "$GLPREFMNU_SSAO", gl_ssao, "SSAOModes"
Slider "$GLPREFMNU_SSAO_PORTALS", gl_ssao_portals, 0.0, 4.0, 1.0, 0
Option "$GLPREFMNU_FXAA", gl_fxaa, "FXAAQuality"
Option "$GLPREFMNU_DITHER", gl_dither_bpc, "DitherModes"
Option "$GLPREFMNU_TONEMAP", gl_tonemap, "TonemapModes"
StaticText " "
Slider "$GLPREFMNU_PALTONEMAPPOWER", gl_paltonemap_powtable, 0.2, 3.0, 0.1, 1
Option "$GLPREFMNU_PALTONEMAPORDER", gl_paltonemap_reverselookup, "LookupOrder"

View file

@ -596,6 +596,7 @@ extend class Actor
int pflags = 0;
if (flags & XF_HURTSOURCE) pflags |= RADF_HURTSOURCE;
if (flags & XF_NOTMISSILE) pflags |= RADF_SOURCEISSPOT;
if (flags & XF_THRUSTZ) pflags |= RADF_THRUSTZ;
int count = RadiusAttack (target, damage, distance, damagetype, pflags, fulldamagedistance);
if (!(flags & XF_NOSPLASH)) CheckSplash(distance);

View file

@ -258,6 +258,8 @@ enum EExplodeFlags
XF_NOTMISSILE = 4,
XF_EXPLICITDAMAGETYPE = 8,
XF_NOSPLASH = 16,
XF_THRUSTZ = 32,
};
// Flags for A_RadiusThrust
@ -1338,4 +1340,6 @@ enum ECompatFlags
COMPATF2_TELEPORT = 1 << 5, // Don't let indirect teleports trigger sector actions
COMPATF2_PUSHWINDOW = 1 << 6, // Disable the window check in CheckForPushSpecial()
COMPATF2_CHECKSWITCHRANGE = 1 << 7, // Enable buggy CheckSwitchRange behavior
COMPATF2_EXPLODE1 = 1 << 8, // No vertical explosion thrust
COMPATF2_EXPLODE2 = 1 << 9 // Use original explosion code throughout.
};

View file

@ -245,64 +245,64 @@ AREA 36: Castle Clash,TXT_STRIFE_MAP36,,,,ZONE 36: Burg-Konflikt,ÁREA 36: Ataqu
AREA 37: Killing Grounds,TXT_STRIFE_MAP37,,,,ZONE 37: Kampfgelände,ÁREA 37: Campo de Matanza,,ZONE 37: Zone de Chasse,,AREA 37: Campi di Uccisione,Área 37: Campo de Matança,Местность 37: Секторы обстрела,
AREA 38: Ordered Chaos,TXT_STRIFE_MAP38,,,,ZONE 38: Geordnetes Chaos,ÁREA 38: Caos Ordenado,,ZONE 38: Chaos Ordonné,,AREA 38: Caos Ordinato,Área 38: Caos Ordenado,Местность 38: Управляемый хаос,
,,,Hexen,,,,,,,,,,
Winnowing Hall,TXT_HEXEN_MAP01,,,,Trennungshalle,Sala de los Vientos,,Chambre de la Séparation,,,,Зал отсеивания,Овејан хол
Seven Portals,TXT_HEXEN_MAP02,,,,Sieben Portale,Siete Portales,,Les Sept Portails,,,Sete Portais,Семь порталов,Седам портала
Guardian of Ice,TXT_HEXEN_MAP03,,,,Wächter des Eises,Guardián de Hielo,,Gardien de Glace,,,Guardião de Gelo,Страж льда,Чувар леда
Guardian of Fire,TXT_HEXEN_MAP04,,,,Wächter des Feuers,Guardián de Fuego,,Gardien de Feu,,,Guardião de Fogo,Страж огня,Чувар ватре
Guardian of Steel,TXT_HEXEN_MAP05,,,,Wächter des Stahls,Guardián de Acero,,Gardien d'Acier,,,Guardião de Aço,Страж стали,Чувар челика
Bright Crucible,TXT_HEXEN_MAP06,,,,Glänzende Feuerprobe,Crisol de Luz,,Creuset Radiant,,,,Испытание света,Светлосни лонац
Shadow Wood,TXT_HEXEN_MAP13,,,,Schattenwald,Bosque de la Sombra,,Forêt des Ombres,,,Floresta das Sombras,Лес теней,Шума сена
Darkmere,TXT_HEXEN_MAP08,,,,Düstersee,Pantano,,Marais Noir,,,Pantâno Negro,Болотная топь,Мочваре
Caves of Circe,TXT_HEXEN_MAP09,,,,Circes Höhle,Cuevas de Circe,,Caves de Circé,,,Carvernas de Circe,Пещеры цирцеи,Пећине цирке
Wastelands,TXT_HEXEN_MAP10,,,,Ödland,Yermo,,Terres Ruinées,,,,Пустоши,Пустаре
Sacred Grove,TXT_HEXEN_MAP11,,,,Heiliger Hain,Arboleda Sagrada,,Bosquet Sacré,,,Bosque Sagrado,Священная роща,Свети шумарак
Hypostyle,TXT_HEXEN_MAP12,,,,Säulenhalle,Hipóstila,,Hypostyle,,,Hipostilo,Гипостильный зал,Хипостил
Heresiarch's Seminary,TXT_HEXEN_MAP27,,,,Seminar des Erzketzers,Seminario del Heresiarca,,Séminaire de l'Hérésiarche,,,Seminário do Heresiarca,Семинария Ересиарха,Јересијархов семинар
Dragon Chapel,TXT_HEXEN_MAP28,,,,Drachenkapelle,Capilla Dragón,,Chapelle du Dragon,,,Capela do Dragão,Часовня дракона,Змајева капела
Griffin Chapel,TXT_HEXEN_MAP30,,,,Greifenkapelle,Capilla Grifo,,Chapelle du Grifon,,,Capela do Grifo,Часовня грифона,Грифинова капела
Deathwind Chapel,TXT_HEXEN_MAP31,,,,Todeswindkapelle,Capilla Viento de Muerte,,Chapelle du Vent Tueur,,,Capela do Vento da Morte,Часовня ветра смерти,Капела ветра смрти
Orchard of Lamentations,TXT_HEXEN_MAP32,,,,Garten der Wehklagen,Huerto de los Lamentos,,Verger des Lamentations,,,Pomar das Lamentações,Сады плача,Воћњак тужбалица
Silent Refectory,TXT_HEXEN_MAP33,,,,Stilles Refektorium,Refectorio Silencioso,,Réfectoire Silencieux,,,Refeitório Silencioso,Безмолвная трапезная,Тиха трпезарија
Wolf Chapel,TXT_HEXEN_MAP34,,,,Wolfskapelle,Capilla Lobo,,Chapelle du Loup,,,Capela do Lobo,Часовня волка,Вучја капела
Forsaken Outpost,TXT_HEXEN_MAP21,,,,Verlassener Vorposten,Puesto de Avanzada Abandonado,,Base Abandonnée,,,Posto Abandonado,Покинутая застава,Напуштена постаја
Castle of Grief,TXT_HEXEN_MAP22,,,,Leidensburg,Castillo del Pesar,,Château de la Souffrance,,,Castelo da Aflição,Замок скорби,Замак жалости
Gibbet,TXT_HEXEN_MAP23,,,,Richtstätte,Horca,,Gibet,,,Forca,Виселица,Вешала
Effluvium,TXT_HEXEN_MAP24,,,,Effluvium,Efluvio,,Effluvium,,,Eflúvio,Зловонный сток,Ефлувиум
Dungeons,TXT_HEXEN_MAP25,,,,Kerker,Calabozos,,Donjons,,,Masmorras,Подземелья,Тамнице
Desolate Garden,TXT_HEXEN_MAP26,,,,Verwildeter Garten,Jardín Desolado,,Jardin de la Désolation,,,Jardim Desolado,Заброшенный сад,Пуста башта
Necropolis,TXT_HEXEN_MAP35,,,,Nekropole,Necrópolis,,Nécropole,,,Necrópole,Некрополь,Некрополис
Zedek's Tomb,TXT_HEXEN_MAP36,,,,Zedeks Gruft,Tumba de Zedek,,Tombeau de Zedek,,,Tumba de Zedek,Гробница зедека,Зедеков гроб
Menelkir's Tomb,TXT_HEXEN_MAP37,,,,Menelkirs Gruft,Tumba de Menelkir,,Tombeau de Menelkir,,,Tumba de Menelkir,Гробница менелкира,Менелкиров гроб
Traductus' Tomb,TXT_HEXEN_MAP38,,,,Traductus' Gruft,Tumba de Traductus,,Tombeau de Traductus,,,Tumba de Traductus,Гробница традактуса,Традуктусов гроб
Vivarium,TXT_HEXEN_MAP39,,,,Vivarium,Vivario,,Vivarium,,,Viveiro,Виварий,Зверињак
Dark Crucible,TXT_HEXEN_MAP40,,,,Dunkle Feuerprobe,Crisol de Oscuridad,,Creuset Sombre,,,,Испытание тьмы,Мрачни лонац
Winnowing Hall,TXT_HEXEN_MAP01,,,,Trennungshalle,Sala de los Vientos,,Chambre de la Séparation,,Camera di separazione,,Зал отсеивания,Овејан хол
Seven Portals,TXT_HEXEN_MAP02,,,,Sieben Portale,Siete Portales,,Les Sept Portails,,I Sette Portali,Sete Portais,Семь порталов,Седам портала
Guardian of Ice,TXT_HEXEN_MAP03,,,,Wächter des Eises,Guardián de Hielo,,Gardien de Glace,,Guardiano del Ghiaccio,Guardião de Gelo,Страж льда,Чувар леда
Guardian of Fire,TXT_HEXEN_MAP04,,,,Wächter des Feuers,Guardián de Fuego,,Gardien de Feu,,Guardiano del Fuoco,Guardião de Fogo,Страж огня,Чувар ватре
Guardian of Steel,TXT_HEXEN_MAP05,,,,Wächter des Stahls,Guardián de Acero,,Gardien d'Acier,,Guardiano dell'Acciaio,Guardião de Aço,Страж стали,Чувар челика
Bright Crucible,TXT_HEXEN_MAP06,,,,Glänzende Feuerprobe,Crisol de Luz,,Creuset Radiant,,Crogiolo Luminoso,,Испытание света,Светлосни лонац
Shadow Wood,TXT_HEXEN_MAP13,,,,Schattenwald,Bosque de la Sombra,,Forêt des Ombres,,Foresta Oscura,Floresta das Sombras,Лес теней,Шума сена
Darkmere,TXT_HEXEN_MAP08,,,,Düstersee,Pantano,,Marais Noir,,Palude Nera,Pantâno Negro,Болотная топь,Мочваре
Caves of Circe,TXT_HEXEN_MAP09,,,,Circes Höhle,Cuevas de Circe,,Caves de Circé,,Grotte di Circe,Carvernas de Circe,Пещеры цирцеи,Пећине цирке
Wastelands,TXT_HEXEN_MAP10,,,,Ödland,Yermo,,Terres Ruinées,,Terre in rovina,,Пустоши,Пустаре
Sacred Grove,TXT_HEXEN_MAP11,,,,Heiliger Hain,Arboleda Sagrada,,Bosquet Sacré,,Boschetto Sacro,Bosque Sagrado,Священная роща,Свети шумарак
Hypostyle,TXT_HEXEN_MAP12,,,,Säulenhalle,Hipóstila,,Hypostyle,,Ipostilo,Hipostilo,Гипостильный зал,Хипостил
Heresiarch's Seminary,TXT_HEXEN_MAP27,,,,Seminar des Erzketzers,Seminario del Heresiarca,,Séminaire de l'Hérésiarche,,Seminario dell'Heresiarch,Seminário do Heresiarca,Семинария Ересиарха,Јересијархов семинар
Dragon Chapel,TXT_HEXEN_MAP28,,,,Drachenkapelle,Capilla Dragón,,Chapelle du Dragon,,Cappella del Drago,Capela do Dragão,Часовня дракона,Змајева капела
Griffin Chapel,TXT_HEXEN_MAP30,,,,Greifenkapelle,Capilla Grifo,,Chapelle du Grifon,,Cappella del Grifone,Capela do Grifo,Часовня грифона,Грифинова капела
Deathwind Chapel,TXT_HEXEN_MAP31,,,,Todeswindkapelle,Capilla Viento de Muerte,,Chapelle du Vent Tueur,,Cappella del Vento Assassino,Capela do Vento da Morte,Часовня ветра смерти,Капела ветра смрти
Orchard of Lamentations,TXT_HEXEN_MAP32,,,,Garten der Wehklagen,Huerto de los Lamentos,,Verger des Lamentations,,Frutteto delle Lamentazioni,Pomar das Lamentações,Сады плача,Воћњак тужбалица
Silent Refectory,TXT_HEXEN_MAP33,,,,Stilles Refektorium,Refectorio Silencioso,,Réfectoire Silencieux,,Refettorio silenzioso,Refeitório Silencioso,Безмолвная трапезная,Тиха трпезарија
Wolf Chapel,TXT_HEXEN_MAP34,,,,Wolfskapelle,Capilla Lobo,,Chapelle du Loup,,Cappella del Lupo,Capela do Lobo,Часовня волка,Вучја капела
Forsaken Outpost,TXT_HEXEN_MAP21,,,,Verlassener Vorposten,Puesto de Avanzada Abandonado,,Base Abandonnée,,Avamposto Abbandonato,Posto Abandonado,Покинутая застава,Напуштена постаја
Castle of Grief,TXT_HEXEN_MAP22,,,,Leidensburg,Castillo del Pesar,,Château de la Souffrance,,Castello della Sofferenza,Castelo da Aflição,Замок скорби,Замак жалости
Gibbet,TXT_HEXEN_MAP23,,,,Richtstätte,Horca,,Gibet,,Forca,Forca,Виселица,Вешала
Effluvium,TXT_HEXEN_MAP24,,,,Effluvium,Efluvio,,Effluvium,,Effluvio,Eflúvio,Зловонный сток,Ефлувиум
Dungeons,TXT_HEXEN_MAP25,,,,Kerker,Calabozos,,Donjons,,I Dungeon,Masmorras,Подземелья,Тамнице
Desolate Garden,TXT_HEXEN_MAP26,,,,Verwildeter Garten,Jardín Desolado,,Jardin de la Désolation,,Giardino Desolato,Jardim Desolado,Заброшенный сад,Пуста башта
Necropolis,TXT_HEXEN_MAP35,,,,Nekropole,Necrópolis,,Nécropole,,Necropoli,Necrópole,Некрополь,Некрополис
Zedek's Tomb,TXT_HEXEN_MAP36,,,,Zedeks Gruft,Tumba de Zedek,,Tombeau de Zedek,,Tomba di Zedek,Tumba de Zedek,Гробница зедека,Зедеков гроб
Menelkir's Tomb,TXT_HEXEN_MAP37,,,,Menelkirs Gruft,Tumba de Menelkir,,Tombeau de Menelkir,,Tomba di Menelkir,Tumba de Menelkir,Гробница менелкира,Менелкиров гроб
Traductus' Tomb,TXT_HEXEN_MAP38,,,,Traductus' Gruft,Tumba de Traductus,,Tombeau de Traductus,,Tomba di Traductus,Tumba de Traductus,Гробница традактуса,Традуктусов гроб
Vivarium,TXT_HEXEN_MAP39,,,,Vivarium,Vivario,,Vivarium,,Vivario,Viveiro,Виварий,Зверињак
Dark Crucible,TXT_HEXEN_MAP40,,,,Dunkle Feuerprobe,Crisol de Oscuridad,,Creuset Sombre,,Crogiolo Buio,,Испытание тьмы,Мрачни лонац
,,,Hexen Deathkings,,,,,,,,,,
Ruined Village,TXT_HEXDD_MAP41,,,,Zerstörtes Dorf,Pueblo en Ruinas,,Village en Ruines,,,Aldeia Destruída,Разрушенная деревня,
Blight,TXT_HEXDD_MAP42,,,,Fäule,Decaimiento,,Peste,,,Peste,Упадок,
Sump,TXT_HEXDD_MAP43,,,,Sumpf,Pozo de Barro,,Puisard,,,,Грязеотстойник,
Catacomb,TXT_HEXDD_MAP44,,,,Katakombe,Catacumba,,Catacombe,,,Catacumba,Катакомба,
Badlands,TXT_HEXDD_MAP45,,,,Ödland,Páramos,,Terres Sauvages,,,Ermo,Бесплодные земли,
Brackenwood,TXT_HEXDD_MAP46,,,,Moorwald,Brackenwood,,Forêt de Bracken,,,,Брекенвуд,
Pyre,TXT_HEXDD_MAP47,,,,Scheiterhaufen,Pira Funeraria,,Brasier,,,Pira,Погребальный костёр,
Constable's Gate,TXT_HEXDD_MAP48,,,,Wachtor,Puerta del Alguacil,,Portail du Constable,,,Portão do Condestável,Комендантские врата,
Treasury,TXT_HEXDD_MAP49,,,,Schatzkammer,Tesorería,,Trésorerie,,,Tesouraria,Сокровищница,
Market Place,TXT_HEXDD_MAP50,,,,Marktplatz,Plaza del Mercado,,Place du Marché,,,Feira,Рыночная площадь,
Ruined Village,TXT_HEXDD_MAP41,,,,Zerstörtes Dorf,Pueblo en Ruinas,,Village en Ruines,,Villagio in Rovine,Aldeia Destruída,Разрушенная деревня,
Blight,TXT_HEXDD_MAP42,,,,Fäule,Decaimiento,,Peste,,Peste,Peste,Упадок,
Sump,TXT_HEXDD_MAP43,,,,Sumpf,Pozo de Barro,,Puisard,,Pozzetto,,Грязеотстойник,
Catacomb,TXT_HEXDD_MAP44,,,,Katakombe,Catacumba,,Catacombe,,Catacombe,Catacumba,Катакомба,
Badlands,TXT_HEXDD_MAP45,,,,Ödland,Páramos,,Terres Sauvages,,Terre Selvagge,Ermo,Бесплодные земли,
Brackenwood,TXT_HEXDD_MAP46,,,,Moorwald,Brackenwood,,Forêt de Bracken,,Foresta di Felce,,Брекенвуд,
Pyre,TXT_HEXDD_MAP47,,,,Scheiterhaufen,Pira Funeraria,,Brasier,,Pira,Pira,Погребальный костёр,
Constable's Gate,TXT_HEXDD_MAP48,,,,Wachtor,Puerta del Alguacil,,Portail du Constable,,Porta del Conestabile,Portão do Condestável,Комендантские врата,
Treasury,TXT_HEXDD_MAP49,,,,Schatzkammer,Tesorería,,Trésorerie,,Tesoreria,Tesouraria,Сокровищница,
Market Place,TXT_HEXDD_MAP50,,,,Marktplatz,Plaza del Mercado,,Place du Marché,,Piazza del Mercato,Feira,Рыночная площадь,
Locus Requiescat,TXT_HEXDD_MAP51,,,,Locus Requiescat,Lugar de Descanso Eterno,,Locus Requiescat,,,,Место вечного упокоения,
Ordeal,TXT_HEXDD_MAP52,,,,Heimsuchung,Prueba,,Supplice,,,Ordália,Испытание,
Armory,TXT_HEXDD_MAP53,,,Armoury,Waffenkammer,Armería,,Amurerie,,,Arsenal,Оружейная,
Nave,TXT_HEXDD_MAP54,,,,Kirchenschiff,La Nave,,Nef,,,,Неф,
Chantry,TXT_HEXDD_MAP55,,,,Kantorei,Capilla,,Chapelle,,,Capela,Часовня,
Abattoir,TXT_HEXDD_MAP56,,,,Schlachthaus,Matadero,,Abbatoire,,,Matadouro,Бойня,
Dark Watch,TXT_HEXDD_MAP57,,,,Dunkle Wache,Guardia Oscura,,Garde Noire,,,Guarda Negra,Тёмный страж,
Ordeal,TXT_HEXDD_MAP52,,,,Heimsuchung,Prueba,,Supplice,,Supplizio,Ordália,Испытание,
Armory,TXT_HEXDD_MAP53,,,Armoury,Waffenkammer,Armería,,Amurerie,,Armeria,Arsenal,Оружейная,
Nave,TXT_HEXDD_MAP54,,,,Kirchenschiff,La Nave,,Nef,,Navata,,Неф,
Chantry,TXT_HEXDD_MAP55,,,,Kantorei,Capilla,,Chapelle,,Cappella,Capela,Часовня,
Abattoir,TXT_HEXDD_MAP56,,,,Schlachthaus,Matadero,,Abbatoire,,Mattatoio,Matadouro,Бойня,
Dark Watch,TXT_HEXDD_MAP57,,,,Dunkle Wache,Guardia Oscura,,Garde Noire,,Guardia Oscura,Guarda Negra,Тёмный страж,
Cloaca,TXT_HEXDD_MAP58,,,,Kloake,Cloaca,,Cloaque,,,,Клоака,
Ice Hold,TXT_HEXDD_MAP59,,,,Eiskammer,Tierra de Hielo,,Fort de Glace,,,Fortaleza de Gelo,Ледяная твердь,
Dark Citadel,TXT_HEXDD_MAP60,,,,Dunkle Festung,Fortaleza Oscura,,Citadelle Sombre,,,Citadela Negra,Тёмная цитадель,
Transit,TXT_HEXDD_MAP33,,,,,Sala de Espera,,Transit,,,Trânsito,Комната ожидания,
Over'n Under,TXT_HEXDD_MAP34,,,,Drunter und Drüber,Arriba y Abajo,,Sens Dessus Dessous,,,Sobre e Sob,Выше и ниже,
Deathfog,TXT_HEXDD_MAP35,,,,Todesnebel,Niebla de Muerte,,Brume Mortelle,,,Névoa da Morte,Туман смерти,
Castle of Pain,TXT_HEXDD_MAP36,,,,Burg der Angst,Castillo del Dolor,,Château de la Douleur,,,Castelo da Dor,Замок боли,
Sewer Pit,TXT_HEXDD_MAP37,,,,Kanalgrube,Pozo de Residuos,,Trou d'Egout,,,Fosso de Esgoto,Сточная яма,
The Rose,TXT_HEXDD_MAP38,,,,Die Rose,La Rosa,,La Rose,,,A Rosa,Роза,
Ice Hold,TXT_HEXDD_MAP59,,,,Eiskammer,Tierra de Hielo,,Fort de Glace,,Fortezza di Ghiaccio,Fortaleza de Gelo,Ледяная твердь,
Dark Citadel,TXT_HEXDD_MAP60,,,,Dunkle Festung,Fortaleza Oscura,,Citadelle Sombre,,Cittadella Oscura,Citadela Negra,Тёмная цитадель,
Transit,TXT_HEXDD_MAP33,,,,,Sala de Espera,,Transit,,Passaggio,Trânsito,Комната ожидания,
Over'n Under,TXT_HEXDD_MAP34,,,,Drunter und Drüber,Arriba y Abajo,,Sens Dessus Dessous,,Sopra e Sotto,Sobre e Sob,Выше и ниже,
Deathfog,TXT_HEXDD_MAP35,,,,Todesnebel,Niebla de Muerte,,Brume Mortelle,,Nebbia di Morte,Névoa da Morte,Туман смерти,
Castle of Pain,TXT_HEXDD_MAP36,,,,Burg der Angst,Castillo del Dolor,,Château de la Douleur,,Castello del Dolore,Castelo da Dor,Замок боли,
Sewer Pit,TXT_HEXDD_MAP37,,,,Kanalgrube,Pozo de Residuos,,Trou d'Egout,,Fossa della Fogna,Fosso de Esgoto,Сточная яма,
The Rose,TXT_HEXDD_MAP38,,,,Die Rose,La Rosa,,La Rose,,La Rosa,A Rosa,Роза,
,,,Intermission texts,,,,,,,,,,
"Once you beat the big badasses and
clean out the moon base you're supposed
@ -3992,7 +3992,7 @@ personne à avoir peur d'un défi..",,,,"Когда-то Вы уже владе
искушением и примёте вызов...",
"\n...and other players await.
",TXT_HEXDD_WIN3MSG,,,,\n...und andere Spieler warten.,\n...y otros jugadores esperan.,,\n...Et d'autres joueurs attendent.,,,,"\n...В то время как другие игроки будут
",TXT_HEXDD_WIN3MSG,,,,\n...und andere Spieler warten.,\n...y otros jugadores esperan.,,\n...Et d'autres joueurs attendent.,,\n...e altri giocatori aspettano.,,"\n...В то время как другие игроки будут
ждать своего часа, чтобы совершить
свой ход.",
,,,Hexen script texts,,,,,,,,,,
@ -4258,7 +4258,7 @@ More info.,TXT_RPLY0_SCRIPT02_D28804_MOREI,,,,Mehr Informationen.,Más informaci
There's more to the Order than meets the eye.,TXT_RYES0_SCRIPT02_D28804_THERE,,,,An dem Orden ist mehr dran als man auf den ersten Blick denkt.,Hay más de la Orden de lo que parece.,Hay más de La Orden de lo que parece.,L'Ordre cache bien son jeu.,,,,"Орден — нечто большее, чем кажется.",
We'll talk when you get gold!,TXT_RNO0_SCRIPT02_D28804_WELLT,,,,"Wir werden reden, wenn du Gold hast!",¡Hablaremos cuando traigas oro!,,On parlera quand tu auras des sous!,,,,"Поговорим, когда принесешь золото!",
"That's it friend, the well of knowledge has run dry. I've told you more than I should have anyway. Good luck... And don't come back.",TXT_DLG_SCRIPT02_D30320_THATS,,,,"Das war's mein Freund, der Brunnen der Weisheit ist versiegt. Ich habe dir sowieso mehr erzählt als ich sollte. Viel Glück... und komm nicht zurück.",Ya está amigo. El pozo del conocimiento se ha secado. De todas formas te he dicho más de lo que debería. Buena suerte ... y no vuelvas.,,"Eh bien voilà, mon ami, le puits de la connaîssance s'est enfin asséché.. Je t'en ai dit plus que je n'aurai du, de toutes manières! Bonne chance.. Et ne reviens pas!",,,,"Это всё, дружище. Кладезь мудрости исчерпан. Я и так рассказал тебе больше, чем следовало. Удачи... и не возвращайся.",
"Hey, I'm only here in case of an emergency. If the core breaches, then I make sure no one gets in... Or out.",TXT_DLG_SCRIPT02_D31836_HEYIM,,,,"Hey, ich bin nur für den Fall eines Notfalls hier. Im Falle eines Kernbruchs sorge ich dafür das niemand rein kommt... oder raus.","Oye, sólo estoy aquí en caso de una emergencia. Si el núcleo se rompe, entonces me aseguro de que nadie entre... o salga.",,"Hé, je ne suis là qu'en cas d'urgence. Si le coeur a une brèche, il faut que je fasse en sorte que rien ne rentre.. Ou ne sorte.",,,,"Эй, я тут только на случай аварии. Если реактор даст течь, я должен быть уверен, что никто не войдёт... и не выйдет.",
"Hey, I'm only here in case of an emergency. If the core breaches, then I make sure no one gets in... or out.",TXT_DLG_SCRIPT02_D31836_HEYIM,,,,"Hey, ich bin nur für den Fall eines Notfalls hier. Im Falle eines Kernbruchs sorge ich dafür das niemand rein kommt... oder raus.","Oye, sólo estoy aquí en caso de una emergencia. Si el núcleo se rompe, entonces me aseguro de que nadie entre... o salga.",,"Hé, je ne suis là qu'en cas d'urgence. Si le coeur a une brèche, il faut que je fasse en sorte que rien ne rentre.. Ou ne sorte.",,,,"Эй, я тут только на случай аварии. Если реактор даст течь, я должен быть уверен, что никто не войдёт... и не выйдет.",
"Watch your step, peasant!",TXT_DLG_SCRIPT02_D33352_WATCH,,"Not sure with the translation of ""peasant"" in this case.
[GZ] As long as it is meant as an insult, ""Bauer"" is fine.",,"Pass auf wo du hintrittst, Bauer!","¡Cuida por donde caminas, campesino!",,"Regarde où tu va, paysan!",,,,"Смотри, куда прёшь, рабочий!",
We're going to kill you! ,TXT_DLG_SCRIPT02_D34868_WEREG,,,,Wir werden dich umbringen!,"¡Vamos a matarte!
@ -4337,7 +4337,7 @@ What are you doing here?,TXT_DLG_SCRIPT02_D87928_WHATA,,,,Was machst du hier?,¿
"Blackbird told you the code, huh? Let me shut off the alarm. Macil is one flight down.",TXT_DLG_SCRIPT02_D89444_BLACK,,,,"Blackbird hat dir den Code gegeben, wie? Lass mich mal eben den Alarm abschalten. Macil ist eine Etage tiefer.","Blackbird te dijo el código, ¿eh? Déjame apagar la alarma. Macil está un vuelo hacia abajo.",,"Blackbird t'as donné le code, hein? Bon, laisse moi désactiver l'alarme. Macil est en bas des escaliers.",,,,"Чёрный дрозд сказал тебе пароль, так? Давай я отключу сигнализацию. Мэйсил этажом ниже.",
Thanks.,TXT_RPLY0_SCRIPT02_D89444_THANK,,,,Danke.,Gracias.,,Merci.,,,,Спасибо.,
"Walk away, boy, just walk away.",TXT_DLG_SCRIPT02_D90960_WALKA,,,,"Geh weg Jungchen, geh einfach weg.","Aléjate, muchacho, sólo aléjate.",,"Pars, gamin, pars.",,,,"Проходи, парень. Просто проходи.",
Do you have an appointment with the Governor? ,TXT_DLG_SCRIPT02_D92476_DOYOU,,,,Hast du einen Termin bei dem Gouverneur?,¿Tienes una cita con el gobernador?,,Avez-vous un rendez-vous avec le gouverneur?,,,,У вас назначена встреча с губернатором?,
Do you have an appointment with the Governor? ,TXT_DLG_SCRIPT02_D92476_DOYOU,,,,Hast du einen Termin bei dem Gouverneur?,¿Tienes una cita con el gobernador?,,Avez-vous un rendez-vous avec le gouverneur?,,,,У Вас назначена встреча с губернатором?,
Of course!,TXT_RPLY0_SCRIPT02_D92476_OFCOU,,,,Natürlich!,¡Claro que si!,,Bien sûr!,,,,Конечно!,
"No, and I don't need one!",TXT_RPLY1_SCRIPT02_D92476_NOAND,,,,"Nein, und ich brauche auch keinen!","¡No, y no la necesito!",,"Non, et j'en ai pas besoin!",,,,"Нет, и я в ней не нуждаюсь!",
Sorry! I didn't mean... Please go right up.,TXT_DLG_SCRIPT02_D93992_SORRY,,,,Entschuldigung! Das war nicht so gemeint... Bitte geh durch.,"¡Lo siento! No quise decir ... Por favor, suba.",,"Désolé, je.. Vous pouvez monter, bien sûr.",,,,"Простите! Я не хотел... Пожалуйста, пройдите наверх.",
@ -5190,67 +5190,67 @@ Find the chalice in the sanctuary chapel and bring it to Harris upstairs in the
Find the Governor's mansion and talk to the Governor to get your reward,TXT_ILOG1102,,,,Finde die Villa des Gouverneurs und rede mit ihm über deine Belohnung.,Encuentra la mansión del Gobernador y habla con el Gobernador para obtener tu recompensa,Encuentra la mansión del Gobernador y habla con él para obtener tú recompensa.,Trouve le manoir du Gouverneur et parle-lui pour réclamer ta récompense.,,,,Пройди в особняк губернатора и обсуди с Морелом своё вознаграждение.,
Congratulations! You have earned our gratitude. Visit the medic and weapons trainer and they will get you ready for what lies ahead. Feel free to wander around within the base.,TXT_ILOG1201,,,,"Gratulation. Du hast dir unsere Dankbarkeit verdient. Suche den Sanitäter und den Waffentrainer auf, sie werden dich auf das was vor dir liegt, vorbereiten. Wenn du willst, schau dich in der Basis um.",¡Enhorabuena! Te has ganado nuestra gratitud. Visita al médico y al entrenador de armas y te prepararán para lo que viene en adelante. Sé libre de dar un paseo por la base.,¡Felicitaciones! Te haz ganado nuestra gratitud. Visita al médico y al entrenador de armas y ellos te dejarán listo para lo que sigue. Sientete libre de andar através de la base.,Félicitations! Vous méritez notre gratitude. Allez voir le médecin et le maître d'armes et ils pourront vous préparer pour ce qu'il va suivre. Vous pouvez faire le tour de la base si vous le souhaitez.,,,,"Поздравляем! Ты заслужил нашу благодарность. Зайди к медику и инструктору по стрельбе, и они подготовят тебя к тому, что ждёт тебя впереди. Теперь ты можешь свободно передвигаться по нашей базе.",
,,,Strife characters,,,,,,,,,,
Order Sergeant,TXT_SPEAKER_ORDER_SERGEANT,,,,Soldat des Ordens,Sargento de La Orden,Sargento de La Orden,Sergeant de l'Ordre,,,,Сержант Ордена,
Order Sergeant,TXT_SPEAKER_ORDER_SERGEANT,,,,Soldat des Ordens,Sargento de La Orden,Sargento de La Orden,Sergeant de l'Ordre,,Sergente dell'Ordine,,Сержант Ордена,
Rowan,TXT_SPEAKER_ROWAN,,,,,,,,,,,Роуэн,
Feris,TXT_SPEAKER_FERIS,,,,,,,,,,,Ферис,
Prison Guard,TXT_SPEAKER_PRISON_GUARD,,,,Gefängniswache,Guardia de la Prisión,Guardia de la Prisión,Garde de la Prison,,,,"Страж тюрьмы
Prison Guard,TXT_SPEAKER_PRISON_GUARD,,,,Gefängniswache,Guardia de la Prisión,Guardia de la Prisión,Garde de la Prison,,Guardia della Prigione,,"Страж тюрьмы
",
Justin,TXT_SPEAKER_JUSTIN,,,,,,,,,,,Джастин,
Macil,TXT_SPEAKER_MACIL,,,,,,,,,,,Мэйсил,
Assistant,TXT_SPEAKER_ASSISTANT,,,,Assistent,Asistente,Asistente,,,,,Ассистент,
Key Master,TXT_SPEAKER_KEY_MASTER,,,,Schlüsselmeister,Amo de Llaves,Maestro de Llaves,Maître des Clés,,,,Ключник,
Bodyguard,TXT_SPEAKER_BODYGUARD,,,,Leibwächter,Guardaespaldas,Guardaespaldas,Garde du corps,,,,Телохранитель,
Interrogator,TXT_SPEAKER_INTERROGATOR,,,,Befrager,Interrogador,Interrogador,Interrogateur,,,,Дознаватель,
Warden Montag,TXT_SPEAKER_WARDEN_MONTAG,,,,Direktor Montag,Carcelero Montag,Director Montag,Gardien Montag,,,,Тюремщик Монтаг,
Assistant,TXT_SPEAKER_ASSISTANT,,,,Assistent,Asistente,Asistente,,,Assistente,,Ассистент,
Key Master,TXT_SPEAKER_KEY_MASTER,,,,Schlüsselmeister,Amo de Llaves,Maestro de Llaves,Maître des Clés,,Maestro di chiavi,,Ключник,
Bodyguard,TXT_SPEAKER_BODYGUARD,,,,Leibwächter,Guardaespaldas,Guardaespaldas,Garde du corps,,Guardia del corpo,,Телохранитель,
Interrogator,TXT_SPEAKER_INTERROGATOR,,,,Befrager,Interrogador,Interrogador,Interrogateur,,Interrogatore,,Дознаватель,
Warden Montag,TXT_SPEAKER_WARDEN_MONTAG,,,,Direktor Montag,Carcelero Montag,Director Montag,Gardien Montag,,Guardiano Montag,,Тюремщик Монтаг,
Richter,TXT_SPEAKER_RICHTER,,,,,,,,,,,Рихтер,
Macil's Advisor,TXT_SPEAKER_MACIL_S_ADVISOR,,,,Macils Berater,Consejero de Macil,Consejero de Macil,Conseiller de Macil,,,,Советник Мэйсила,
Judge Wolenick,TXT_SPEAKER_JUDGE_WOLENICK,,,,Richter Wolenick,Juez Wolenick,Juez Wolenick,Juge Wolenick,,,,Судья Уолник,
Macil's Advisor,TXT_SPEAKER_MACIL_S_ADVISOR,,,,Macils Berater,Consejero de Macil,Consejero de Macil,Conseiller de Macil,,Consigliere di Macil,,Советник Мэйсила,
Judge Wolenick,TXT_SPEAKER_JUDGE_WOLENICK,,,,Richter Wolenick,Juez Wolenick,Juez Wolenick,Juge Wolenick,,Giudice Wolenick,,Судья Уолник,
Tevick,TXT_SPEAKER_TEVICK,,,,,,,,,,,Тевик,
Harris,TXT_SPEAKER_HARRIS,,,,,,,,,,,Харрис,
Foreman,TXT_SPEAKER_FOREMAN,,,,Vormann,Capataz,Capataz,Contremaître,,,,Бригадир,
Prisoner,TXT_SPEAKER_PRISONER,,,,Gefangener,Prisionero,Prisionero,Prisonnier,,,,Пленник,
Foreman,TXT_SPEAKER_FOREMAN,,,,Vormann,Capataz,Capataz,Contremaître,,Caposquadra,,Бригадир,
Prisoner,TXT_SPEAKER_PRISONER,,,,Gefangener,Prisionero,Prisionero,Prisonnier,,Prigioniero,,Пленник,
Sammis,TXT_SPEAKER_SAMMIS,,,,,,,,,,,Сэммис,
Weapon Smith,TXT_SPEAKER_WEAPON_SMITH,,,,Waffenschmied,Forjador de Armas,Forjador de Armas,Armurier,,,,Оружейник,
Reactor Guard,TXT_SPEAKER_REACTOR_GUARD,,,,Reaktorwache,Guardia del Reactor,Guardia del Reactor,Garde du réacteur,,,,Страж реактора,
Apprentice,TXT_SPEAKER_APPRENTICE,,,,Lehrling,Aprendiz,Aprendiz,Apprenti,,,,Подмастерье,
Door Guard,TXT_SPEAKER_DOOR_GUARD,,,,Türwache,Guarda de la Puerta,Guarda de la Puerta,Garde de la porte,,,,Страж входа,
Master Smithy,TXT_SPEAKER_MASTER_SMITHY,,,,Meister Smithy,Maestro Herrero,Maestro Herrero,Maîre Forgeron,,,,Мастер-кузнец,
Warehouse Guard,TXT_SPEAKER_WAREHOUSE_GUARD,,,,Lagerhaus-Wache,Guardia del Almacén,Guardia del Almacén,Garde de l'entrepôt,,,,Охранник склада,
Barkeep,TXT_SPEAKER_BARKEEP,,,,Wirt,Tabernero,Barman,Barman,,,,Хозяин таверны,
Weapon Smith,TXT_SPEAKER_WEAPON_SMITH,,,,Waffenschmied,Forjador de Armas,Forjador de Armas,Armurier,,Fabbro d'Armi,,Оружейник,
Reactor Guard,TXT_SPEAKER_REACTOR_GUARD,,,,Reaktorwache,Guardia del Reactor,Guardia del Reactor,Garde du réacteur,,Guardia del Reattore,,Страж реактора,
Apprentice,TXT_SPEAKER_APPRENTICE,,,,Lehrling,Aprendiz,Aprendiz,Apprenti,,Apprendista,,Подмастерье,
Door Guard,TXT_SPEAKER_DOOR_GUARD,,,,Türwache,Guarda de la Puerta,Guarda de la Puerta,Garde de la porte,,Guardia della Porta,,Страж входа,
Master Smithy,TXT_SPEAKER_MASTER_SMITHY,,,,Meister Smithy,Maestro Herrero,Maestro Herrero,Maîre Forgeron,,Maestro della Fucina,,Мастер-кузнец,
Warehouse Guard,TXT_SPEAKER_WAREHOUSE_GUARD,,,,Lagerhaus-Wache,Guardia del Almacén,Guardia del Almacén,Garde de l'entrepôt,,Guardia del Magazzino,,Охранник склада,
Barkeep,TXT_SPEAKER_BARKEEP,,,,Wirt,Tabernero,Barman,Barman,,Barman,,Хозяин таверны,
Timothy,TXT_SPEAKER_TIMOTHY,,,,,,,,,,,Тимоти,
James,TXT_SPEAKER_JAMES,,,,,,,,,,,Джеймс,
Worner,TXT_SPEAKER_WORNER,,,,,,,,,,,Уорнэр,
Bailey Guard,TXT_SPEAKER_BAILEY_GUARD,,,,Vorhof-Wache,Guardia de la Muralla,Guardia Bailey,Garde d'enceinte,,,,Страж крепости,
Bailey Guard,TXT_SPEAKER_BAILEY_GUARD,,,,Vorhof-Wache,Guardia de la Muralla,Guardia Bailey,Garde d'enceinte,,Guardia del Bastione,,Страж крепости,
Drone,TXT_SPEAKER_DRONE,,,,Drohne,Dron,Dron,,,,,Дрон,
Front Guard,TXT_SPEAKER_FRONT_GUARD,,,,Frontwache,Guardia del Frente,Guardia del Frente,Garde du Front,,,,Повстанец,
Front Guard,TXT_SPEAKER_FRONT_GUARD,,,,Frontwache,Guardia del Frente,Guardia del Frente,Garde du Front,,Guardia del Fronte,,Повстанец,
Quincy,TXT_SPEAKER_QUINCY,,,,,,,,,,,Куинси,
Sergeant,TXT_SPEAKER_SERGEANT,,,,Feldwebel,Sargento,Sargento,Sergeant,,,,Сержант,
Temple Guard,TXT_SPEAKER_TEMPLE_GUARD,,,,Tempelwache,Guardia del Templo,Guardia del Templo,Garde du Temple,,,,Страж храма,
Oracle,TXT_SPEAKER_ORACLE,,,,Orakel,Oráculo,Oráculo,,,,,Оракул,
Sergeant,TXT_SPEAKER_SERGEANT,,,,Feldwebel,Sargento,Sargento,Sergeant,,Sergente,,Сержант,
Temple Guard,TXT_SPEAKER_TEMPLE_GUARD,,,,Tempelwache,Guardia del Templo,Guardia del Templo,Garde du Temple,,Guardia del Tempio,,Страж храма,
Oracle,TXT_SPEAKER_ORACLE,,,,Orakel,Oráculo,Oráculo,,,Oracolo,,Оракул,
Ulaine,TXT_SPEAKER_ULAINE,,,,,,,,,,,Улейн,
Front Soldier,TXT_SPEAKER_FRONT_SOLDIER,,,,Front-Soldat,Soldado del Frente,Soldado del Frente,Soldat du Front,,,,Повстанец,
Programmer,TXT_SPEAKER_PROGRAMMER,,,,Programmierer,Programador,Programador,Programmeur,,,,Программист,
Medic,TXT_SPEAKER_MEDIC,,,,Sanitäter,Médico,Médico,Médecin,,,,Медик,
Watchman,TXT_SPEAKER_WATCHMAN,,,,Wächter,Celador,Celador,Vigie,,,,Караульный,
Front Soldier,TXT_SPEAKER_FRONT_SOLDIER,,,,Front-Soldat,Soldado del Frente,Soldado del Frente,Soldat du Front,,Soldato del Fronte,,Повстанец,
Programmer,TXT_SPEAKER_PROGRAMMER,,,,Programmierer,Programador,Programador,Programmeur,,Programmatore,,Программист,
Medic,TXT_SPEAKER_MEDIC,,,,Sanitäter,Médico,Médico,Médecin,,Medico,,Медик,
Watchman,TXT_SPEAKER_WATCHMAN,,,,Wächter,Celador,Celador,Vigie,,Vigilante,,Караульный,
Ketrick,TXT_SPEAKER_KETRICK,,,,,,,,,,,Кетрик,
Weran,TXT_SPEAKER_WERAN,,,,,,,,,,,Уэран,
Advisor,TXT_SPEAKER_ADVISOR,,,,Berater,Consejero,Consejero,Conseiller,,,,Советник,
Advisor,TXT_SPEAKER_ADVISOR,,,,Berater,Consejero,Consejero,Conseiller,,Consigliere,,Советник,
Geoff,TXT_SPEAKER_GEOFF,,,,,,,,,,,Джефф,
Overseer,TXT_SPEAKER_OVERSEER,,,,Aufseher,Superintendente,Superintendente,Superviseur,,,,Надсмотрщик,
Security Complex Guard,TXT_SPEAKER_SECURITY_COMPLE,,,,Wache,Vigía,Vigía,Sécurité,,,,Комплекс охраны,
Computer Tech,TXT_SPEAKER_COMPUTER_TECH,,,,Computertechniker,Ingeniero Informático,Ingeniero Informático,Technicien Informatique,,,,Компьютерный техник,
Overseer,TXT_SPEAKER_OVERSEER,,,,Aufseher,Superintendente,Superintendente,Superviseur,,Supervisore,,Надсмотрщик,
Security Complex Guard,TXT_SPEAKER_SECURITY_COMPLE,,,,Wache,Vigía,Vigía,Sécurité,,Guardia del Complesso di Sicurezza,,Комплекс охраны,
Computer Tech,TXT_SPEAKER_COMPUTER_TECH,,,,Computertechniker,Ingeniero Informático,Ingeniero Informático,Technicien Informatique,,Tecnico Informatico,,Компьютерный техник,
MacGuffin,TXT_SPEAKER_MACGUFFIN,,,,,,,,,,,МакГаффин,
Arion,TXT_SPEAKER_ARION,,,,,,,,,,,Арион,
Dock Worker,TXT_SPEAKER_DOCK_WORKER,,,,Dockarbeiter,Trabajador del Muelle,Trabajador del Muelle,Docker,,,,Рабочий дока,
Dock Worker,TXT_SPEAKER_DOCK_WORKER,,,,Dockarbeiter,Trabajador del Muelle,Trabajador del Muelle,Docker,,Operaio Portuale,,Рабочий дока,
Irale,TXT_SPEAKER_IRALE,,,,,,,,,,,Ирэйл,
Core Guard,TXT_SPEAKER_CORE_GUARD,,,,Wache,Guardia del Núcleo,Guardia del Núcleo,Garde du cœur,,,,Страж ядра,
Sewer Guard,TXT_SPEAKER_SEWER_GUARD,,,,Kanalisationswächter,Guardia de la Alcantarilla,Guardia de la Alcantarilla,Garde des égouts,,,,Страж канализации,
Technician,TXT_SPEAKER_TECHNICIAN,,,,Techniker,Técnico,Técnico,Technicien,,,,Техник,
Guard,TXT_SPEAKER_GUARD,,,,Wache,Guardia,Guardia,Garde,,,,Стражник,
Peasant,TXT_SPEAKER_PEASANT,,,,Einwohner,Campesino,Campesino,Paysan,,,,Работник,
Armorer,TXT_SPEAKER_ARMORER,,,Armourer,Waffenmeister,Armero,Armero,Armurier,,,,Бронник,
Core Guard,TXT_SPEAKER_CORE_GUARD,,,,Wache,Guardia del Núcleo,Guardia del Núcleo,Garde du cœur,,Guardia del Cuore,,Страж ядра,
Sewer Guard,TXT_SPEAKER_SEWER_GUARD,,,,Kanalisationswächter,Guardia de la Alcantarilla,Guardia de la Alcantarilla,Garde des égouts,,Guardia della Fogna,,Страж канализации,
Technician,TXT_SPEAKER_TECHNICIAN,,,,Techniker,Técnico,Técnico,Technicien,,Tecnico,,Техник,
Guard,TXT_SPEAKER_GUARD,,,,Wache,Guardia,Guardia,Garde,,Guardia,,Стражник,
Peasant,TXT_SPEAKER_PEASANT,,,,Einwohner,Campesino,Campesino,Paysan,,Contadino,,Работник,
Armorer,TXT_SPEAKER_ARMORER,,,Armourer,Waffenmeister,Armero,Armero,Armurier,,Armiere,,Бронник,
Beldin,TXT_SPEAKER_BELDIN,,,,,,,,,,,Белдин,
Gerard,TXT_SPEAKER_GERARD,,,,,,,,,,,Джерард,
Governor Mourel,TXT_SPEAKER_GOVERNOR_MOUREL,,,,Gouverneur Mourel,Gobernador Mourel,Gobernador Mourel,Gouverneur Mourel,,,,Губернатор Морел,
Governor Mourel,TXT_SPEAKER_GOVERNOR_MOUREL,,,,Gouverneur Mourel,Gobernador Mourel,Gobernador Mourel,Gouverneur Mourel,,Governatore Mourel,,Губернатор Морел,
Bowyer,TXT_SPEAKER_BOWYER,,,,,,,,,,,Лучник,
Derwin,TXT_SPEAKER_DERWIN,,,,,,,,,,,Дервин,
Can't render this file because it is too large.