Merge branch '4.14.2' into gz_merge
This commit is contained in:
commit
9aa44fa13b
83 changed files with 927 additions and 270 deletions
|
|
@ -170,6 +170,7 @@ CVAR(Bool, am_showmonsters, true, CVAR_ARCHIVE);
|
|||
CVAR(Bool, am_showitems, true, CVAR_ARCHIVE);
|
||||
CVAR(Bool, am_showtime, true, CVAR_ARCHIVE);
|
||||
CVAR(Bool, am_showtotaltime, false, CVAR_ARCHIVE);
|
||||
CVAR(Bool, am_showlevelname, true, CVAR_ARCHIVE);
|
||||
CVAR(Int, am_colorset, 0, CVAR_ARCHIVE);
|
||||
CVAR(Bool, am_customcolors, true, CVAR_ARCHIVE);
|
||||
CVAR(Int, am_map_secrets, 1, CVAR_ARCHIVE);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue