mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-02-03 23:11:14 +00:00
Merge branch SRB2:next into linux-customshader-compilation-fix
This commit is contained in:
commit
064e2cb7e8
4 changed files with 8 additions and 153 deletions
|
@ -39,6 +39,7 @@ common
|
|||
defaulttexturescale = 1.0f;
|
||||
defaultflatscale = 1.0f;
|
||||
scaledtextureoffsets = true;
|
||||
scaledflatoffsets = true;
|
||||
|
||||
// Colormap/fade related options
|
||||
maxcolormapalpha = 25;
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -590,6 +590,12 @@ universalfields
|
|||
type = 3;
|
||||
default = false;
|
||||
}
|
||||
|
||||
triggertag
|
||||
{
|
||||
type = 0;
|
||||
default = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -3938,6 +3938,7 @@ udmf
|
|||
width = 30;
|
||||
height = 32;
|
||||
color = 17;
|
||||
hangs = 1;
|
||||
arg0
|
||||
{
|
||||
title = "Initial delay";
|
||||
|
|
Loading…
Reference in a new issue