zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom

This commit is contained in:
Magnus Norddahl 2016-10-07 12:45:29 +02:00
parent aae4571c95 a4ccbddfd6
commit b30a3552d1
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wadsrc/static/language.enu
View File

@ -1780,10 +1780,6 @@ DSPLYMNU_BRIGHTNESS = "Brightness";
DSPLYMNU_VSYNC = "Vertical Sync"; DSPLYMNU_VSYNC = "Vertical Sync";
DSPLYMNU_CAPFPS = "Rendering Interpolation"; DSPLYMNU_CAPFPS = "Rendering Interpolation";
DSPLYMNU_COLUMNMETHOD = "Column render mode"; DSPLYMNU_COLUMNMETHOD = "Column render mode";
DSPLYMNU_TRUECOLOR = "True color output";
DSPLYMNU_MINFILTER = "Linear filter when downscaling";
DSPLYMNU_MAGFILTER = "Linear filter when upscaling";
DSPLYMNU_MIPMAP = "Use mipmapped textures";
DSPLYMNU_WIPETYPE = "Screen wipe style"; DSPLYMNU_WIPETYPE = "Screen wipe style";
DSPLYMNU_SHOWENDOOM = "Show ENDOOM screen"; DSPLYMNU_SHOWENDOOM = "Show ENDOOM screen";
DSPLYMNU_BLOODFADE = "Blood Flash Intensity"; DSPLYMNU_BLOODFADE = "Blood Flash Intensity";
@ -2726,3 +2722,17 @@ OPTVAL_LOW = "Low";
OPTVAL_MEDIUM = "Medium"; OPTVAL_MEDIUM = "Medium";
OPTVAL_HIGH = "High"; OPTVAL_HIGH = "High";
OPTVAL_EXTREME = "Extreme"; OPTVAL_EXTREME = "Extreme";
// QZDoom exclusive:
DSPLYMNU_TCOPT = "TrueColor Options";
TCMNU_TITLE = "TRUECOLOR OPTIONS";
TCMNU_MULTITHREADED = "Multithreaded Drawing";
TCMNU_TRUECOLOR = "True color output";
TCMNU_MINFILTER = "Linear filter when downscaling";
TCMNU_MAGFILTER = "Linear filter when upscaling";
TCMNU_MIPMAP = "Use mipmapped textures";

16
wadsrc/static/menudef.txt
View File

@ -658,11 +658,23 @@ OptionMenu "OpenGLOptions"
Submenu "$GLMNU_PREFS", "GLPrefOptions" Submenu "$GLMNU_PREFS", "GLPrefOptions"
} }
OptionMenu "TrueColorOptions"
{
Title "$TCMNU_TITLE"
Option "$TCMNU_MULTITHREADED", "r_multithreaded", "OnOff"
StaticText " "
Option "$TCMNU_TRUECOLOR", "swtruecolor", "OnOff"
Option "$TCMNU_MINFILTER", "r_minfilter", "OnOff"
Option "$TCMNU_MAGFILTER", "r_magfilter", "OnOff"
Option "$TCMNU_MIPMAP", "r_mipmap", "OnOff"
}
OptionMenu "VideoOptions" OptionMenu "VideoOptions"
{ {
Title "$DSPLYMNU_TITLE" Title "$DSPLYMNU_TITLE"
Submenu "$DSPLYMNU_GLOPT", "OpenGLOptions" Submenu "$DSPLYMNU_GLOPT", "OpenGLOptions"
Submenu "$DSPLYMNU_TCOPT", "TrueColorOptions"
Submenu "$DSPLYMNU_SCOREBOARD", "ScoreboardOptions" Submenu "$DSPLYMNU_SCOREBOARD", "ScoreboardOptions"
StaticText " " StaticText " "
Slider "$DSPLYMNU_SCREENSIZE", "screenblocks", 3.0, 12.0, 1.0, 0 Slider "$DSPLYMNU_SCREENSIZE", "screenblocks", 3.0, 12.0, 1.0, 0
@ -677,10 +689,6 @@ OptionMenu "VideoOptions"
Slider "$DSPLYMNU_BLOODFADE", "blood_fade_scalar", 0.0, 1.0, 0.05, 1 Slider "$DSPLYMNU_BLOODFADE", "blood_fade_scalar", 0.0, 1.0, 0.05, 1
Slider "$DSPLYMNU_PICKUPFADE", "pickup_fade_scalar", 0.0, 1.0, 0.05, 1 Slider "$DSPLYMNU_PICKUPFADE", "pickup_fade_scalar", 0.0, 1.0, 0.05, 1
Option "$DSPLYMNU_COLUMNMETHOD", "r_columnmethod", "ColumnMethods" Option "$DSPLYMNU_COLUMNMETHOD", "r_columnmethod", "ColumnMethods"
Option "$DSPLYMNU_TRUECOLOR", "swtruecolor", "OnOff"
Option "$DSPLYMNU_MINFILTER", "r_minfilter", "OnOff"
Option "$DSPLYMNU_MAGFILTER", "r_magfilter", "OnOff"
Option "$DSPLYMNU_MIPMAP", "r_mipmap", "OnOff"
StaticText " " StaticText " "
Option "$DSPLYMNU_WIPETYPE", "wipetype", "Wipes" Option "$DSPLYMNU_WIPETYPE", "wipetype", "Wipes"