Skip to content
Snippets Groups Projects
Commit 064e2cb7 authored by Vlad Doc's avatar Vlad Doc
Browse files

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

parents fb437a3c dfb57319
No related branches found
No related tags found
No related merge requests found
......@@ -39,6 +39,7 @@ common
defaulttexturescale = 1.0f;
defaultflatscale = 1.0f;
scaledtextureoffsets = true;
scaledflatoffsets = true;
// Colormap/fade related options
maxcolormapalpha = 25;
......
This diff is collapsed.
......@@ -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";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment