.editorconfig

+[*.cs]
+indent_style = tab
\ No newline at end of file

.github/workflows/continuous_integration_other.yml

@@ -10,10 +10,10 @@ jobs:
       fail-fast: false
       matrix:
         config:
-        - {
-            name: "macOS",
-            os: macos-latest
-          }
+#        - {
+#            name: "macOS",
+#            os: macos-latest
+#          }
         - {
             name: "Linux",
             os: ubuntu-latest
@@ -28,7 +28,7 @@ jobs:
           make mac
         elif [[ "${{ runner.os }}" == 'Linux' ]]; then
           sudo apt-get update
-          sudo apt install mesa-common-dev
+          sudo apt install mesa-common-dev libxfixes-dev
           make linux
         fi
 

.gitignore

@@ -39,3 +39,4 @@ bin
 /Build/Updater.ini
 /Build.Native
 /builder
+*.csproj.dtbcache.json

.gitlab-ci.yml

@@ -2,7 +2,7 @@ variables:
   BUILDTYPE: Release
 
 default:
-  image: mono:slim
+  image: git.do.srb2.org:5050/stjr/srb2ci/srb2ci:stable
 
   cache:
     - key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG
@@ -170,9 +170,6 @@ stages:
   - build
 
 Release:
-
-  image: mono:latest
-
   stage: build
 
   variables:
@@ -183,7 +180,7 @@ Release:
    - - |
           # apt_toolchain
           echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
-     - apt-get install clang
+     - apt-get install clang msbuild
      - |
           # apt_toolchain
           echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"

Build/Compilers/BCC/bcc.cfg

@@ -7,7 +7,7 @@ compilers
 	// All others are the required files (the setting names do not matter)
 	bcc
 	{
-		interface = "AccCompiler";
+		interface = "BccCompiler";
 		program = "bcc.exe";
 		zcommon = "zcommon.bcs";
 		std = "std.acs";

Build/Configurations/Includes/Game_SRB222.cfg

@@ -37,7 +37,6 @@ defaultskytextures
 // Skill levels
 skills
 {
-	1 = "Normal";
 }
 
 // Skins

Build/Configurations/Includes/SRB222_common.cfg

@@ -38,9 +38,12 @@ common
 	mixtexturesflats = true;
 	defaulttexturescale = 1.0f;
 	defaultflatscale = 1.0f;
-	scaledtextureoffsets = false;
+	scaledtextureoffsets = true;
+	scaledflatoffsets = true;
 
+	// Colormap/fade related options
 	maxcolormapalpha = 25;
+	// TODO: change to 255;
 
 	// Thing number for start position in 3D Mode
 	start3dmode = 3328;
@@ -112,7 +115,7 @@ mapformat_udmf
 
 	// Enables setting distinct brightness for floor, ceiling, and walls
 	distinctfloorandceilingbrightness = true;
-	distinctwallbrightness = false;
+	distinctwallbrightness = true;
 
 	// Enables setting distinct brightness for upper, middle, and lower sidedef parts
 	distinctsidedefpartbrightness = false;

Build/Configurations/Includes/SRB222_misc.cfg

@@ -78,6 +78,8 @@ sectorflags
 	ropehang = "Rope Hang";
 	jumpflip = "Flip Gravity on Jump";
 	gravityoverride = "Make Reverse Gravity Temporary";
+	nophysics_floor = "Disable Floor Slope Physics";
+	nophysics_ceiling = "Disable Ceiling Slope Physics";
 	flipspecial_nofloor = "No Trigger on Floor Touch";
 	flipspecial_ceiling = "Trigger on Ceiling Touch";
 	triggerspecial_touch = "Trigger on Edge Touch";
@@ -114,6 +116,8 @@ sectorflagscategories
 	ropehang = "special";
 	jumpflip = "special";
 	gravityoverride = "special";
+	nophysics_floor = "special";
+	nophysics_ceiling = "special";
 	flipspecial_nofloor = "trigger";
 	flipspecial_ceiling = "trigger";
 	triggerspecial_touch = "trigger";
@@ -260,6 +264,12 @@ universalfields
 			type = 2;
 			default = "";
 		}
+		
+		executordelay
+		{
+			type = 0;
+			default = 0;
+		}
 	}
 
 	sidedef
@@ -270,18 +280,18 @@ universalfields
 			default = "";
 		}
 		
-		//light
-		//{
-		//	type = 0;
-		//	default = 0;
-		//}
-		//
-		//lightabsolute
-		//{
-		//	type = 3;
-		//	default = false;
-		//}
-		//
+		light
+		{
+			type = 0;
+			default = 0;
+		}
+		
+		lightabsolute
+		{
+			type = 3;
+			default = false;
+		}
+		
 		//light_top
 		//{
 		//	type = 0;
@@ -354,41 +364,41 @@ universalfields
 			default = 0.0;
 		}
 		
-		//scalex_bottom
-		//{
-		//	type = 1;
-		//	default = 1.0;
-		//}
-		//
-		//scalex_mid
-		//{
-		//	type = 1;
-		//	default = 1.0;
-		//}
-		//
-		//scalex_top
-		//{
-		//	type = 1;
-		//	default = 1.0;
-		//}
-		//
-		//scaley_bottom
-		//{
-		//	type = 1;
-		//	default = 1.0;
-		//}
-		//
-		//scaley_mid
-		//{
-		//	type = 1;
-		//	default = 1.0;
-		//}
-		//
-		//scaley_top
-		//{
-		//	type = 1;
-		//	default = 1.0;
-		//}
+		scalex_bottom
+		{
+			type = 1;
+			default = 1.0;
+		}
+		
+		scalex_mid
+		{
+			type = 1;
+			default = 1.0;
+		}
+		
+		scalex_top
+		{
+			type = 1;
+			default = 1.0;
+		}
+		
+		scaley_bottom
+		{
+			type = 1;
+			default = 1.0;
+		}
+		
+		scaley_mid
+		{
+			type = 1;
+			default = 1.0;
+		}
+		
+		scaley_top
+		{
+			type = 1;
+			default = 1.0;
+		}
 	}
 
 	thing
@@ -432,6 +442,13 @@ universalfields
 			type = 2;
 			default = "";
 		}
+		
+		mobjscale
+		{
+			type = 1;
+			default = 1.0;
+			managed = false;
+		}
 	}
 	
 	sector
@@ -508,17 +525,17 @@ universalfields
 			default = 0.0;
 		}
 
-		//xscalefloor
-		//{
-		//	type = 1;
-		//	default = 1.0;
-		//}
-		//
-		//yscalefloor
-		//{
-		//	type = 1;
-		//	default = 1.0;
-		//}
+		xscalefloor
+		{
+			type = 1;
+			default = 1.0;
+		}
+		
+		yscalefloor
+		{
+			type = 1;
+			default = 1.0;
+		}
 
 		lightfloor
 		{
@@ -550,17 +567,17 @@ universalfields
 			default = 0.0;
 		}
 
-		//xscaleceiling
-		//{
-		//	type = 1;
-		//	default = 1.0;
-		//}
-		//
-		//yscaleceiling
-		//{
-		//	type = 1;
-		//	default = 1.0;
-		//}
+		xscaleceiling
+		{
+			type = 1;
+			default = 1.0;
+		}
+		
+		yscaleceiling
+		{
+			type = 1;
+			default = 1.0;
+		}
 
 		lightceiling
 		{
@@ -573,6 +590,12 @@ universalfields
 			type = 3;
 			default = false;
 		}
+
+		triggertag
+		{
+			type = 0;
+			default = 0;
+		}
 	}
 }
 

Build/Configurations/Includes/SRB222_things.cfg

@@ -2608,7 +2608,6 @@ udmf
 			{
 				title = "Rotation speed";
 				tooltip = "In degrees per tic.";
-				type = 8;
 			}
 			arg4
 			{
@@ -3011,12 +3010,12 @@ udmf
 				arg4
 				{
 					title = "Phase";
-					type = 8;
+					tooltip = "An angle from 0 to 360.";
 				}
 				arg5
 				{
 					title = "Pinch";
-					type = 8;
+					tooltip = "An angle from 0 to 360.";
 				}
 				arg6
 				{
@@ -3060,12 +3059,12 @@ udmf
 				arg4
 				{
 					title = "Phase";
-					type = 8;
+					tooltip = "An angle from 0 to 360.";
 				}
 				arg5
 				{
 					title = "Pinch";
-					type = 8;
+					tooltip = "An angle from 0 to 360.";
 				}
 				arg6
 				{
@@ -3109,12 +3108,12 @@ udmf
 				arg4
 				{
 					title = "Phase";
-					type = 8;
+					tooltip = "An angle from 0 to 360.";
 				}
 				arg5
 				{
 					title = "Pinch";
-					type = 8;
+					tooltip = "An angle from 0 to 360.";
 				}
 				arg6
 				{
@@ -3168,12 +3167,12 @@ udmf
 				arg4
 				{
 					title = "Phase";
-					type = 8;
+					tooltip = "An angle from 0 to 360.";
 				}
 				arg5
 				{
 					title = "Pinch";
-					type = 8;
+					tooltip = "An angle from 0 to 360.";
 				}
 				arg6
 				{
@@ -3226,12 +3225,12 @@ udmf
 				arg4
 				{
 					title = "Phase";
-					type = 8;
+					tooltip = "An angle from 0 to 360.";
 				}
 				arg5
 				{
 					title = "Pinch";
-					type = 8;
+					tooltip = "An angle from 0 to 360.";
 				}
 				arg6
 				{
@@ -3285,12 +3284,12 @@ udmf
 				arg4
 				{
 					title = "Phase";
-					type = 8;
+					tooltip = "An angle from 0 to 360.";
 				}
 				arg5
 				{
 					title = "Pinch";
-					type = 8;
+					tooltip = "An angle from 0 to 360.";
 				}
 				arg6
 				{
@@ -3938,6 +3937,7 @@ udmf
 			width = 30;
 			height = 32;
 			color = 17;
+			hangs = 1;
 			arg0
 			{
 				title = "Initial delay";

Build/Configurations/Includes/ZDoom_misc.cfg

@@ -648,6 +648,138 @@ universalfields
 			default = 0.0;
 			managed = false;
 		}
+
+		nogradient_top
+		{
+			type = 3;
+			default = false;
+			managed = false;
+	  	}
+
+		flipgradient_top
+		{
+			type = 3;
+			default = false;
+			managed = false;
+		}
+
+		clampgradient_top
+		{
+			type = 3;
+			default = false;
+			managed = false;
+
+		}
+		
+		useowncolors_top
+		{
+			type = 3;
+			default = false;
+			managed = false;
+
+		}
+
+		uppercolor_top
+		{
+			type = 10;
+			default = 16777215;
+			managed = false;
+		}
+
+		lowercolor_top
+		{
+			type = 10;
+			default = 16777215;
+			managed = false;
+		}
+
+		nogradient_mid
+		{
+			type = 3;
+			default = false;
+			managed = false;
+	  	}
+
+		flipgradient_mid
+		{
+			type = 3;
+			default = false;
+			managed = false;
+		}
+
+		clampgradient_mid
+		{
+			type = 3;
+			default = false;
+			managed = false;
+
+		}
+		
+		useowncolors_mid
+		{
+			type = 3;
+			default = false;
+			managed = false;
+
+		}
+
+		uppercolor_mid
+		{
+			type = 10;
+			default = 16777215;
+			managed = false;
+		}
+
+		lowercolor_mid
+		{
+			type = 10;
+			default = 16777215;
+			managed = false;
+		}
+
+		nogradient_bottom
+		{
+			type = 3;
+			default = false;
+			managed = false;
+	  	}
+
+		flipgradient_bottom
+		{
+			type = 3;
+			default = false;
+			managed = false;
+		}
+
+		clampgradient_bottom
+		{
+			type = 3;
+			default = false;
+			managed = false;
+
+		}
+		
+		useowncolors_bottom
+		{
+			type = 3;
+			default = false;
+			managed = false;
+
+		}
+
+		uppercolor_bottom
+		{
+			type = 10;
+			default = 16777215;
+			managed = false;
+		}
+
+		lowercolor_bottom
+		{
+			type = 10;
+			default = 16777215;
+			managed = false;
+		}	
 	}
 	
 	thing
@@ -776,16 +908,8 @@ universalfields
 			type = 1;
 			default = 1.0;
 		}
-		
-		lm_gridsize
-		{
-			type = 1;
-			default = 32.0;
-			thingtypespecific = true;
-			managed = false;
-		}
 
-		lm_sampledistance
+		lm_sampledist
 		{
 			type = 0;
 			default = 8;

Build/UDBScript/Scripts/Examples/Cleanup/clearlinedefaction.js

+/// <reference path="../udbscript.d.ts" />
+
+`#version 5`;
+
+`#name Reset linedef actions`;
+
+`#description Resets the action of all selected linedefs to 0.`;
+
+UDB.Map.getSelectedOrHighlightedLinedefs().forEach(line => {
+	if (line.action > 0) {
+		line.action = 0;
+	}
+});

Build/UDBScript/Scripts/Examples/Cleanup/clearmidtextures.js

+/// <reference path="../udbscript.d.ts" />
+
+`#version 5`;
+
+`#name Clear linedef midtextures`;
+
+`#description Clears all midtextures from two-sided linedefs, and optionally removes all flags related to them (Peg Midtexture, Solid Midtexture, Repeat Midtexture)`;
+
+`#scriptoptions
+
+clearflags
+{
+	description = "Remove midtexture-related flags";
+	default = true;
+	type = 3; // Boolean
+}
+`;
+
+UDB.Map.getSelectedOrHighlightedLinedefs().forEach(line => {
+	if (line.front != null && line.back != null) {
+		line.front.middleTexture = "-";
+		line.back.middleTexture = "-";
+		
+		if (UDB.ScriptOptions.clearflags) {
+			line.flags['midpeg'] = false;
+			line.flags['midsolid'] = false;
+			line.flags['wrapmidtex'] = false;
+		}
+	}
+});

Build/UDBScript/Scripts/Examples/Cleanup/selectextravertices.js

+/// <reference path="../udbscript.d.ts" />
+
+`#version 5`;
+
+`#name Select extra vertices`;
+
+`#description Given a selection of vertices, this only keeps vertices that are not essential to sector geometry selected.`;
+
+UDB.Map.getSelectedOrHighlightedVertices().forEach(vertex => {
+	let lines = vertex.getLinedefs();
+	if (lines.length == 2)
+	{
+		let l1 = lines[0].angle%180;
+		let l2 = lines[1].angle%180;
+		if (l1 != l2)
+		{
+			vertex.selected = false;
+		}
+	}
+	else
+	{
+		vertex.selected = false;
+	}
+});
+

Build/UDBScript/Scripts/Examples/ConvertThingHeightToAbsolute.js

+/// <reference path="../udbscript.d.ts" />
+
+`#version 5`;
+
+`#name Convert thing height to absolute Z`;
+
+
+UDB.Map.getSelectedOrHighlightedThings().forEach(thing => {
+	const sector = thing.getSector();
+	if (thing.flags['absolutez'] == false && sector != null) {
+		let plane = sector.getFloorPlane();  
+		let z = plane.getZ([thing.position.x, thing.position.y]);
+		
+		thing.position.z += z;
+		thing.flags['absolutez'] = true;
+	}
+});

Build/UDBScript/Scripts/Examples/CopySlopeFromOppositeSurface.js

+/// <reference path="../udbscript.d.ts" />
+
+`#version 5`;
+
+`#name Copy slope from opposite surface`;
+
+`#scriptoptions
+
+surfaceType
+{
+	description = "Affected surface type";
+	default = 0;
+	type = 11; // Enum
+	enumvalues {
+		0 = "Floor";
+		1 = "Ceiling";
+	}
+}
+`;
+
+UDB.Map.getSelectedOrHighlightedSectors().forEach(sector => {
+	if (UDB.ScriptOptions.surfaceType == 0) {
+		const slope = sector.getCeilingSlope();
+		sector.setFloorSlope([-slope.x, -slope.y, -slope.z]);
+		sector.floorSlopeOffset = -sector.ceilingSlopeOffset;
+		sector.floorHeight = sector.ceilingHeight;
+	} else {
+		const slope = sector.getFloorSlope();
+		sector.setCeilingSlope([-slope.x, -slope.y, -slope.z]);
+		sector.ceilingSlopeOffset = -sector.floorSlopeOffset;
+		sector.ceilingHeight = sector.floorHeight;
+	}
+});

Build/UDBScript/Scripts/Examples/Geometry/bevel.js

@@ -21,7 +21,7 @@ size
 let lines = UDB.Map.getSelectedLinedefs();
 
 if(lines.length < 2)
-    die('You need to select at least 2 connected linedefs');
+    UDB.die('You need to select at least 2 connected linedefs');
 
 let vertices = new Set();