Skip to content

Commit

Permalink
Revert fix for #2219 and #2216
Browse files Browse the repository at this point in the history
This isn't a good solution to this issue - it wastes entities.
  • Loading branch information
TeamSpen210 committed Oct 10, 2017
1 parent cad4264 commit ba6c381
Show file tree
Hide file tree
Showing 35 changed files with 169 additions and 3,462 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ versioninfo
{
"editorversion" "400"
"editorbuild" "7552"
"mapversion" "108"
"mapversion" "107"
"formatversion" "100"
"prefab" "0"
}
Expand All @@ -14,13 +14,13 @@ viewsettings
"bSnapToGrid" "1"
"bShowGrid" "1"
"bShowLogicalGrid" "0"
"nGridSpacing" "1"
"nGridSpacing" "64"
"bShow3DGrid" "0"
}
world
{
"id" "1"
"mapversion" "108"
"mapversion" "107"
"classname" "worldspawn"
"detailmaterial" "detail/detailsprites"
"detailvbsp" "detail.vbsp"
Expand All @@ -29,95 +29,6 @@ world
"skyname" "sky_black_nofog"
}
entity
{
"id" "5612"
"classname" "func_noportal_volume"
"spawnflags" "0"
solid
{
"id" "5613"
side
{
"id" "48"
"plane" "(-16 -64 1) (-16 64 1) (16 64 1)"
"material" "TOOLS/TOOLSINVISIBLE"
"uaxis" "[1 0 0 0] 0.25"
"vaxis" "[0 -1 0 0] 0.25"
"rotation" "0"
"lightmapscale" "16"
"smoothing_groups" "0"
}
side
{
"id" "47"
"plane" "(-16 64 -1) (-16 -64 -1) (16 -64 -1)"
"material" "TOOLS/TOOLSINVISIBLE"
"uaxis" "[-1 0 0 0] 0.25"
"vaxis" "[0 -1 0 0] 0.25"
"rotation" "0"
"lightmapscale" "16"
"smoothing_groups" "0"
}
side
{
"id" "46"
"plane" "(-16 -64 -1) (-16 64 -1) (-16 64 1)"
"material" "TOOLS/TOOLSINVISIBLE"
"uaxis" "[0 -1 0 0] 0.25"
"vaxis" "[0 0 -1 -60] 0.25"
"rotation" "0"
"lightmapscale" "16"
"smoothing_groups" "0"
}
side
{
"id" "45"
"plane" "(16 64 -1) (16 -64 -1) (16 -64 1)"
"material" "TOOLS/TOOLSINVISIBLE"
"uaxis" "[0 1 0 0] 0.25"
"vaxis" "[0 0 -1 -60] 0.25"
"rotation" "0"
"lightmapscale" "16"
"smoothing_groups" "0"
}
side
{
"id" "44"
"plane" "(-16 64 -1) (16 64 -1) (16 64 1)"
"material" "TOOLS/TOOLSINVISIBLE"
"uaxis" "[-1 0 0 0] 0.25"
"vaxis" "[0 0 -1 -60] 0.25"
"rotation" "0"
"lightmapscale" "16"
"smoothing_groups" "0"
}
side
{
"id" "43"
"plane" "(16 -64 -1) (-16 -64 -1) (-16 -64 1)"
"material" "TOOLS/TOOLSINVISIBLE"
"uaxis" "[1 0 0 0] 0.25"
"vaxis" "[0 0 -1 -60] 0.25"
"rotation" "0"
"lightmapscale" "16"
"smoothing_groups" "0"
}
editor
{
"color" "220 30 220"
"visgroupshown" "1"
"visgroupautoshown" "1"
}
}
editor
{
"color" "220 30 220"
"visgroupshown" "1"
"visgroupautoshown" "1"
"logicalpos" "[0 1000]"
}
}
entity
{
"id" "5261"
"classname" "prop_static"
Expand Down Expand Up @@ -199,7 +110,7 @@ entity
"origin" "0 28 20"
editor
{
"color" "220 30 220"
"color" "200 200 0"
"visgroupshown" "1"
"visgroupautoshown" "1"
"logicalpos" "[0 1000]"
Expand All @@ -224,7 +135,7 @@ entity
"origin" "0 -8 20"
editor
{
"color" "220 30 220"
"color" "200 200 0"
"visgroupshown" "1"
"visgroupautoshown" "1"
"logicalpos" "[0 1000]"
Expand All @@ -249,7 +160,7 @@ entity
"origin" "0 -40 20"
editor
{
"color" "220 30 220"
"color" "200 200 0"
"visgroupshown" "1"
"visgroupautoshown" "1"
"logicalpos" "[0 1000]"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ versioninfo
{
"editorversion" "400"
"editorbuild" "7552"
"mapversion" "111"
"mapversion" "110"
"formatversion" "100"
"prefab" "0"
}
Expand All @@ -14,13 +14,13 @@ viewsettings
"bSnapToGrid" "1"
"bShowGrid" "1"
"bShowLogicalGrid" "0"
"nGridSpacing" "1"
"nGridSpacing" "64"
"bShow3DGrid" "0"
}
world
{
"id" "1"
"mapversion" "111"
"mapversion" "110"
"classname" "worldspawn"
"detailmaterial" "detail/detailsprites"
"detailvbsp" "detail.vbsp"
Expand All @@ -29,95 +29,6 @@ world
"skyname" "sky_black_nofog"
}
entity
{
"id" "5621"
"classname" "func_noportal_volume"
"spawnflags" "0"
solid
{
"id" "5622"
side
{
"id" "48"
"plane" "(-16 -64 1) (-16 64 1) (16 64 1)"
"material" "TOOLS/TOOLSINVISIBLE"
"uaxis" "[1 0 0 0] 0.25"
"vaxis" "[0 -1 0 0] 0.25"
"rotation" "0"
"lightmapscale" "16"
"smoothing_groups" "0"
}
side
{
"id" "47"
"plane" "(-16 64 -1) (-16 -64 -1) (16 -64 -1)"
"material" "TOOLS/TOOLSINVISIBLE"
"uaxis" "[-1 0 0 0] 0.25"
"vaxis" "[0 -1 0 0] 0.25"
"rotation" "0"
"lightmapscale" "16"
"smoothing_groups" "0"
}
side
{
"id" "46"
"plane" "(-16 -64 -1) (-16 64 -1) (-16 64 1)"
"material" "TOOLS/TOOLSINVISIBLE"
"uaxis" "[0 -1 0 0] 0.25"
"vaxis" "[0 0 -1 4] 0.25"
"rotation" "0"
"lightmapscale" "16"
"smoothing_groups" "0"
}
side
{
"id" "45"
"plane" "(16 64 -1) (16 -64 -1) (16 -64 1)"
"material" "TOOLS/TOOLSINVISIBLE"
"uaxis" "[0 1 0 0] 0.25"
"vaxis" "[0 0 -1 4] 0.25"
"rotation" "0"
"lightmapscale" "16"
"smoothing_groups" "0"
}
side
{
"id" "44"
"plane" "(-16 64 -1) (16 64 -1) (16 64 1)"
"material" "TOOLS/TOOLSINVISIBLE"
"uaxis" "[-1 0 0 0] 0.25"
"vaxis" "[0 0 -1 4] 0.25"
"rotation" "0"
"lightmapscale" "16"
"smoothing_groups" "0"
}
side
{
"id" "43"
"plane" "(16 -64 -1) (-16 -64 -1) (-16 -64 1)"
"material" "TOOLS/TOOLSINVISIBLE"
"uaxis" "[1 0 0 0] 0.25"
"vaxis" "[0 0 -1 4] 0.25"
"rotation" "0"
"lightmapscale" "16"
"smoothing_groups" "0"
}
editor
{
"color" "220 30 220"
"visgroupshown" "1"
"visgroupautoshown" "1"
}
}
editor
{
"color" "220 30 220"
"visgroupshown" "1"
"visgroupautoshown" "1"
"logicalpos" "[0 1000]"
}
}
entity
{
"id" "5261"
"classname" "prop_static"
Expand Down Expand Up @@ -202,7 +113,7 @@ entity
"origin" "0 28 20"
editor
{
"color" "220 30 220"
"color" "200 200 0"
"visgroupshown" "1"
"visgroupautoshown" "1"
"logicalpos" "[0 1000]"
Expand All @@ -227,7 +138,7 @@ entity
"origin" "0 -8 20"
editor
{
"color" "220 30 220"
"color" "200 200 0"
"visgroupshown" "1"
"visgroupautoshown" "1"
"logicalpos" "[0 1000]"
Expand All @@ -252,7 +163,7 @@ entity
"origin" "0 -40 20"
editor
{
"color" "220 30 220"
"color" "200 200 0"
"visgroupshown" "1"
"visgroupautoshown" "1"
"logicalpos" "[0 1000]"
Expand Down Expand Up @@ -287,7 +198,7 @@ entity
"origin" "-8 -8 24"
editor
{
"color" "220 30 220"
"color" "200 200 0"
"visgroupshown" "1"
"visgroupautoshown" "1"
"logicalpos" "[0 1000]"
Expand Down Expand Up @@ -322,7 +233,7 @@ entity
"origin" "-8 0 32"
editor
{
"color" "220 30 220"
"color" "200 200 0"
"visgroupshown" "1"
"visgroupautoshown" "1"
"logicalpos" "[0 1000]"
Expand Down Expand Up @@ -357,7 +268,7 @@ entity
"origin" "-8 8 24"
editor
{
"color" "220 30 220"
"color" "200 200 0"
"visgroupshown" "1"
"visgroupautoshown" "1"
"logicalpos" "[0 1000]"
Expand Down
Loading

0 comments on commit ba6c381

Please sign in to comment.