Fixed, Texture browser: "Show textures in subdirectories" setting was not applied to the root directory.

Changed, Image formats: GIF images will no longer be loaded, because (G)ZDoom doesn't support them.
Updated ZDoom_DECORATE.cfg.
Updated ZDoom_ACS.cfg.
Updated ZDoom ACC.

Build/Compilers/ZDoom/zspecial.acs

@@ -293,7 +293,7 @@ special
 	-48:Sqrt(1),
 	-49:FixedSqrt(1),
 	-50:VectorLength(2),
-	-51:SetHUDClipRect(4,5),
+	-51:SetHUDClipRect(4,6),
 	-52:SetHUDWrapWidth(1),
 	-53:SetCVar(2),
 	-54:GetUserCVar(2),

Build/Scripting/ZDoom_ACS.cfg

@@ -374,7 +374,7 @@ keywords
 	SetFont = "void SetFont(str fontlump)\nSets the current font (only within the script) to fontlump";
 	SetGlobalFogParameter = "SetGlobalFogParameter(property, value)";
 	SetGravity = "void SetGravity(fixed amount)\nThis function sets the global gravity of an entire level.\nDefault is 800.0";
-	SetHUDClipRect = "void SetHUDClipRect(int x, int y, int width, int height[, int wrapwidth])\nSets the clipping rectangle for future HUD messages.";
+	SetHUDClipRect = "void SetHUDClipRect(int x, int y, int width, int height[, int wrapwidth = 0[, bool aspectratio = true]])\nSets the clipping rectangle for future HUD messages.";
 	SetHudSize = "void SetHudSize(int width, int height, bool statusbar)\nCauses text messages to be stretched or shrunk to match the size\nthey would appear if the user's resolution was width by height.";
 	SetHUDWrapWidth = "void SetHudWrapWidth(int wrapwidth)\nSets the wrapping width for future HUD messages without altering the clipping rectangle.\nIf you set the wrapping width to 0, messages will wrap\nto the full width of the HUD, as normal.";
 	SetLineActivation = "void SetLineActivation(int lineid, int activation)\nSets the line activation flags of the line with the specified id.\nlineid: The id of the line of which to set the activation flags\nactivation: SPAC_ flags to set. Multiple flags can be set by using the pipe character | between the constant names.";

Build/Scripting/ZDoom_DECORATE.cfg

@@ -126,9 +126,10 @@ keywords
 	A_CheckFloor = "A_CheckFloor(int offset OR str state)";
 	A_CheckFlag = "A_CheckFlag(str flagname, state label[, int check_pointer = AAPTR_DEFAULT])";
 	A_CheckLOF = "A_CheckLOF(state jump[, int flags = 0[, float range = 0.0[, float minrange = 0.0[, float angle = 0.0[, float pitch = 0.0[, float offsetheight = 0.0[, float offsetwidth = 0.0[, int ptr_target = AAPTR_DEFAULT]]]]]]]])";
-	A_CheckRange = "A_CheckRange(float distance, int offset OR str state)";
+	A_CheckProximity = "A_CheckProximity(str \"jump\", str classname, float distance[, int count = 1[, int flags = 0[, int pointer]]])"; 
+	A_CheckRange = "A_CheckRange(float distance, int offset OR str state[, bool 2d_check])";
 	A_CheckSight = "A_CheckSight(int offset OR str state)";
-	A_CheckSightOrRange = "A_CheckSightOrRange(float distance, int offset OR str state)";
+	A_CheckSightOrRange = "A_CheckSightOrRange(float distance, int offset OR str state[, bool 2d_check])";
 	A_Jump = "A_Jump(int chance, int offset OR str state, ...)";
 	A_JumpIf = "A_JumpIf(expression, int offset OR str state)";
 	A_JumpIfArmorType = "A_JumpIfArmorType(str armortype, str state[, int minimum])";
@@ -361,6 +362,7 @@ constants
 	Melee:;
 	Missile:;
 	Pain:;
+	Pain.Dagger:;
 	Death:;
 	XDeath:;
 	Burn:;
@@ -1173,6 +1175,13 @@ constants
 	MRF_UNDOBYDEATHFORCED;
 	MRF_UNDOBYDEATHSAVES;
 	MRF_UNDOALWAYS;
+//A_CheckProximity flags
+	CPXF_ANCESTOR;
+	CPXF_NOZ;
+	CPXF_COUNTDEAD;
+	CPXF_DEADONLY;
+	CPXF_LESSOREQUAL;
+	CPXF_EXACT;
 //A_FaceTraget/Master/Tracer flags
 	FAF_BOTTOM;
 	FAF_MIDDLE;

Source/Core/Controls/ImageBrowserControl.cs

@@ -587,7 +587,7 @@ namespace CodeImp.DoomBuilder.Controls
 				if(mixMode == 1 && item.Icon.IsFlat) return false;
 				if(mixMode == 2 && !item.Icon.IsFlat) return false;
 				if(mixMode == 3 && (browseFlats != item.Icon.IsFlat)) return false;
-				if(!showtexturesfromsubdirs && currentlevel > 0 && item.Icon.Level > currentlevel) return false;
+				if(!showtexturesfromsubdirs && item.Icon.Level > currentlevel) return false;
 			}
 
 			return item.Text.ToUpperInvariant().Contains(objectname.Text.ToUpperInvariant());

Source/Core/Data/ImageDataFormat.cs

@@ -61,7 +61,7 @@ namespace CodeImp.DoomBuilder.Data
 				// Check for GIF signature
 				data.Seek(0, SeekOrigin.Begin);
 				if(CheckSignature(data, GIF_SIGNATURE))
-					return new FileImageReader(DevilImageType.IL_GIF);
+					return new UnknownImageReader(); //mxd. Not supported by (G)ZDoom
 
 				//mxd. Check for PCX signature
 				data.Seek(0, SeekOrigin.Begin);
@@ -81,7 +81,7 @@ namespace CodeImp.DoomBuilder.Data
 				// Check for BMP signature
 				data.Seek(0, SeekOrigin.Begin);
 				if(CheckSignature(data, BMP_SIGNATURE))
-					return new UnknownImageReader(); //mxd. Not supported in (G)ZDoom
+					return new UnknownImageReader(); //mxd. Not supported by (G)ZDoom
 			}
 				
 			// Could it be a doom picture?