Merge branch SRB2:next into linux-customshader-compilation-fix

This commit is contained in:
Vlad Doc 2024-05-06 23:31:22 +00:00
commit 064e2cb7e8
4 changed files with 8 additions and 153 deletions

View file

@ -39,6 +39,7 @@ common
defaulttexturescale = 1.0f; defaulttexturescale = 1.0f;
defaultflatscale = 1.0f; defaultflatscale = 1.0f;
scaledtextureoffsets = true; scaledtextureoffsets = true;
scaledflatoffsets = true;
// Colormap/fade related options // Colormap/fade related options
maxcolormapalpha = 25; maxcolormapalpha = 25;

File diff suppressed because it is too large Load diff

View file

@ -590,6 +590,12 @@ universalfields
type = 3; type = 3;
default = false; default = false;
} }
triggertag
{
type = 0;
default = 0;
}
} }
} }

View file

@ -3938,6 +3938,7 @@ udmf
width = 30; width = 30;
height = 32; height = 32;
color = 17; color = 17;
hangs = 1;
arg0 arg0
{ {
title = "Initial delay"; title = "Initial delay";