TeamSpen210/HammerAddons#231 fgd changes

ReactiveDrop · Aug 1, 2023 · 68b5796 · 68b5796
1 parent 53d390a
commit 68b5796
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/reactivedrop/fgd/base.fgd b/reactivedrop/fgd/base.fgd
@@ -3865,7 +3865,7 @@
 //
 //-------------------------------------------------------------------------
 
-@PointClass color(0 0 255) sidelist(sides) iconsprite("editor/env_cubemap.vmt") wirebox(box_mins, box_maxs) = env_cubemap :
+@PointClass color(0 0 255) sidelist(sides) iconsprite("editor/env_cubemap.vmt") = env_cubemap :
 	"An entity that creates a sample point for the Cubic Environment Map."
 [
 	cubemapsize(choices) : "Cubemap Size" : 0 =
@@ -3882,8 +3882,6 @@
 		9 : "256x256"
 	]
 	sides(sidelist) : "Brush faces": : "(Optional) Brushes faces to directly attach to the env_cubemap. Press Pick then click on faces in the 3D View to select them. Use CTRL while clicking to add or remove from the selection."
-	box_mins(vector) : "Box Projection Mins" : : "Not yet implemented."
-	box_maxs(vector) : "Box Projection Maxs" : : "Not yet implemented."
 ]
 
 @BaseClass = BModelParticleSpawner

diff --git a/reactivedrop/fgd/reactivedrop.fgd b/reactivedrop/fgd/reactivedrop.fgd
@@ -854,3 +854,19 @@ asw_pickup_50calmg : "50cal Machine Gun"
 [
 	client_vscript(script) : "Client Script" : "" : "Name of script file to run on clients."
 ]
+
+@PointClass base(Angles) iconsprite("editor/teamspen210/comp_propcombine_set") wirebox(mins, maxs) = comp_propcombine_set : "Specifies a group of props that will be combined together."
+[
+	mins(vector) : "BBox Mins" : "-32 -32 -32" : "Minimum offset from the entity, defining the shape."
+	maxs(vector) : "BBox Maxes" : "32 32 32" : "Maximum offset from the entity, defining the shape."
+	name(string) : "Name" : : "Two sets with the same name will be treated as one."
+	prop(studio) : "Model Filter" : : "If set, a combinable model used to filter which others will be combined. The propcombine set will only apply to models which could be combined with this one."
+	skin(integer) : "Skin Filter" : 0 : "The skin for the Model Filter."
+]
+
+@PointClass base(Angles) iconsprite("editor/teamspen210/comp_cubemap_parallax") wirebox(mins, maxs) sphere() = comp_cubemap_parallax : "Specifies the positions of the walls of a box-shaped room for parallax-corrected cubemaps."
+[
+	mins(vector) : "BBox Mins" : "-32 -32 -32" : "Minimum offset from the entity, defining the shape."
+	maxs(vector) : "BBox Maxes" : "32 32 32" : "Maximum offset from the entity, defining the shape."
+	radius(float) : "Cubemap Radius" : "32" : "Bounding radius to find env_cubemap entities to modify."
+]
diff --git a/src/game/client/swarm/vgui/asw_hud_crosshair.cpp b/src/game/client/swarm/vgui/asw_hud_crosshair.cpp
@@ -46,7 +46,7 @@ using namespace vgui;
 
 int ScreenTransform( const Vector& point, Vector& screen );
 
-ConVar crosshair( "crosshair", "1", FCVAR_ARCHIVE );
+ConVar crosshair( "crosshair", "1", FCVAR_NONE );
 
 DECLARE_HUDELEMENT( CASWHudCrosshair );
 

diff --git a/utils/build_maps.py b/utils/build_maps.py
@@ -16,7 +16,7 @@ def __init__(self, name, radius_override="2500", buildcubemaps="1", vbsp=None, v
 		self.vbsp = vbsp if vbsp is not None else ["-alldetail"]
 		self.vvis = vvis if vvis is not None else ["-radius_override", radius_override]
 		self.vrad = vrad if vrad is not None else ["-final", "-textureshadows", "-StaticPropLighting", "-StaticPropPolys"]
-		self.postcompiler = postcompiler if postcompiler is not None else ["--propcombine"]
+		self.postcompiler = postcompiler if postcompiler is not None else []
 
 vrad_notextureshadows = ["-final", "-StaticPropLighting", "-StaticPropPolys"]