Merge pull request #3383 from BEEmod/dev

Version 4.37.0
BEEmod · Jul 19, 2020 · 2064f05 · 2064f05
2 parents a44cb67 + d87a9d9
commit 2064f05
Show file tree

Hide file tree

Showing 2,051 changed files with 351,736 additions and 346,668 deletions.
diff --git a/compile_packages.py b/compile_packages.py
@@ -28,9 +28,9 @@ def clean_vmf(vmf_path):
             inst.remove_ent(ent)
             continue
 
-        # Remove info_null entities
-        if ent['classname'] == 'info_null':
-            print('Removing info_null...')
+        # Remove hammer_notes entities
+        if ent['classname'] == 'hammer_notes':
+            print('Removing hammer_notes...')
             inst.remove_ent(ent)
             continue
 

diff --git a/icons/items/620_2013-12-16_00005.png b/icons/items/620_2013-12-16_00005.png
diff --git a/icons/items/620_2013-12-25_00003.png b/icons/items/620_2013-12-25_00003.png
diff --git a/icons/items/620_2014-01-20_00003.png b/icons/items/620_2014-01-20_00003.png
diff --git a/icons/items/autoportal_blue.pdn → icons/items/autoportal/autoportal_blue.pdn b/icons/items/autoportal_blue.pdn → icons/items/autoportal/autoportal_blue.pdn
diff --git a/icons/items/autoportal/autoportal_blue_p2.png b/icons/items/autoportal/autoportal_blue_p2.png
diff --git a/icons/items/autoportal/autoportal_both_p2.pdn b/icons/items/autoportal/autoportal_both_p2.pdn
diff --git a/icons/items/autoportal/autoportal_both_p2.png b/icons/items/autoportal/autoportal_both_p2.png
diff --git a/icons/items/autoportal/autoportal_oran_p2.png b/icons/items/autoportal/autoportal_oran_p2.png
diff --git a/icons/items/blocks/2x2x2.png b/icons/items/blocks/2x2x2.png
diff --git a/icons/items/blocks/4x1x1.png b/icons/items/blocks/4x1x1.png
diff --git a/icons/items/blocks/4x2x2.png b/icons/items/blocks/4x2x2.png
diff --git a/icons/items/blocks/angled_30.png b/icons/items/blocks/angled_30.png
diff --git a/icons/items/blocks/angled_45.png b/icons/items/blocks/angled_45.png
diff --git a/icons/items/blocks/angled_60.png b/icons/items/blocks/angled_60.png
diff --git a/icons/items/blocks/angled_all.png b/icons/items/blocks/angled_all.png
diff --git a/icons/items/blocks/partial_all.png b/icons/items/blocks/partial_all.png
diff --git a/icons/items/blocks/quarter_tile.png b/icons/items/blocks/quarter_tile.png
diff --git a/icons/items/bomb.png b/icons/items/bomb.png
diff --git a/icons/items/button_trigger.pdn b/icons/items/button_trigger.pdn
diff --git a/icons/items/coop_checkpoint/checkpoint.pdn b/icons/items/coop_checkpoint/checkpoint.pdn
diff --git a/icons/items/coop_checkpoint/checkpoint_sep.pdn b/icons/items/coop_checkpoint/checkpoint_sep.pdn
diff --git a/icons/items/grouped_paint_dropper.pdn b/icons/items/grouped_paint_dropper.pdn
diff --git a/icons/items/inputs.pptx b/icons/items/inputs.pptx
diff --git a/icons/items/laser_retract.pdn b/icons/items/laser_retract.pdn
diff --git a/icons/items/light_panel_cool.pdn b/icons/items/light_panel_cool.pdn
diff --git a/icons/items/light_panel_cool.vtf b/icons/items/light_panel_cool.vtf
diff --git a/icons/items/logic/logic_and_strip.png b/icons/items/logic/logic_and_strip.png
diff --git a/icons/items/logic/logic_and_strip_tex.png b/icons/items/logic/logic_and_strip_tex.png
diff --git a/icons/items/logic/logic_and_tex.png b/icons/items/logic/logic_and_tex.png
diff --git a/icons/items/logic/logic_not_strip.png b/icons/items/logic/logic_not_strip.png
diff --git a/icons/items/logic/logic_not_strip_tex.png b/icons/items/logic/logic_not_strip_tex.png
diff --git a/icons/items/logic/logic_or_strip.png b/icons/items/logic/logic_or_strip.png
diff --git a/icons/items/logic/logic_strips.png b/icons/items/logic/logic_strips.png
diff --git a/icons/items/override.png b/icons/items/override.png
diff --git a/icons/items/override.pptx b/icons/items/override.pptx
diff --git a/icons/items/pedestal_button_retract.pdn b/icons/items/pedestal_button_retract.pdn
diff --git a/icons/items/rotate.pdn b/icons/items/rotate.pdn
diff --git a/icons/items/standing_reclined_fizzlers/Reclined Fizzler/Clean/reclined_fizzler.pdn b/icons/items/standing_reclined_fizzlers/Reclined Fizzler/Clean/reclined_fizzler.pdn
diff --git a/...items/standing_reclined_fizzlers/Reclined Fizzler/Clean/reclined_fizzler_x1.png b/...items/standing_reclined_fizzlers/Reclined Fizzler/Clean/reclined_fizzler_x1.png
diff --git a/...items/standing_reclined_fizzlers/Reclined Fizzler/Clean/reclined_fizzler_x2.png b/...items/standing_reclined_fizzlers/Reclined Fizzler/Clean/reclined_fizzler_x2.png
diff --git a/...items/standing_reclined_fizzlers/Reclined Fizzler/Clean/reclined_fizzler_x3.png b/...items/standing_reclined_fizzlers/Reclined Fizzler/Clean/reclined_fizzler_x3.png
diff --git a/icons/items/timer.png b/icons/items/timer.png
diff --git a/icons/items/timer.pptx b/icons/items/timer.pptx
diff --git a/icons/items/vtf/faith_cube.vtf b/icons/items/vtf/faith_cube.vtf
diff --git a/icons/items/vtf/pincer_cube.vtf b/icons/items/vtf/pincer_cube.vtf
diff --git a/icons/music/friendly_faith.png b/icons/music/friendly_faith.png
diff --git a/icons/previews/p2c/1500854111.p2c b/icons/previews/p2c/1500854111.p2c
@@ -7,7 +7,7 @@
 	"Timestamp_Modified"		"0x000000005975375F"
 	"CompileTime"		"33.507000"
 	"Coop"		"0"
-	"Title"		"TEST MAP"
+	"Title"		"Style Preview Map"
 	"Description"		"(Provide a description of your creation)"
 	"PreviewDirty"		"0"
 	"ChamberSize"		"25 25 16"

diff --git a/icons/previews/p2c/1501698868.p2c b/icons/previews/p2c/1501698868.p2c
@@ -7,7 +7,7 @@
 	"Timestamp_Modified"		"0x0000000059821B34"
 	"CompileTime"		"15.000000"
 	"Coop"		"0"
-	"Title"		"Skybox_Test"
+	"Title"		"Skybox Preview Map"
 	"Description"		"(Provide a description of your creation)"
 	"PreviewDirty"		"1"
 	"ChamberSize"		"9 24 5"

diff --git a/icons/previews/readme.txt b/icons/previews/readme.txt
@@ -4,15 +4,15 @@ Please follow this guide to create previews for styles and skyboxes in BEE 2.4.
 
 First, copy the .p2c files and their screenshots in p2c to:
 * C:\Program Files (x86)\Steam\steamapps\common\Portal 2\portal2\puzzles\[a number]\
-You should have two maps titled TEST MAP and Skybox_Test in your drafts. 
+You should have two maps titled Style Preview Map and Skybox Preview Map under Create Test Chambers. 
 Open your preferred image editor and create a file that is 400x300 pixels. An editor with layering support is recommended (Photoshop, paint.NET, etc.).
 
 Style previews: 
 Export your custom style with the recommended settings (skybox, etc.)
 Build and play TEST MAP in the PuzzleMaker.
 Set your video to the following settings: 
 * Widescreen 16:9 Aspect Ratio
-* 3840x2160 resolution
+* 3840x2160 resolution if available, otherwise 1920x1080 will work
 * 8x MSAA Anti-Aliasing
 * Anisotropic 16x Filtering mode
 * High effect, model, and shader details
@@ -29,7 +29,7 @@ Export the Original Clean style with your custom skybox.
 Build and play Skybox_Test in the PuzzleMaker.
 Set your video to the following settings: 
 * Widescreen 16:9 Aspect Ratio
-* 2048x1152 resolution
+* 2048x1152 resolution if available, otherwise 1920x1080 will work
 * 8x MSAA Anti-Aliasing
 * Anisotropic 16x Filtering mode
 * High effect, model, and shader details
@@ -43,4 +43,5 @@ Add a line to your style in info.txt: "IconLarge"	"prev/sky_[yourstyle].png"
 
 Notes:
 * Do not modify the PuzzleMaker maps in any way. 
+* Do not move your camera after running the setpos/setang commands.
 * If you are using the wrong resolution while taking screenshots, resize them to 538x303 for styles and 574x323 for skyboxes.
diff --git a/packages/Lautaro/Gridded_wall/items/gridded_wall/vbsp_config.cfg b/packages/Lautaro/Gridded_wall/items/gridded_wall/vbsp_config.cfg
@@ -3,14 +3,15 @@
 "Condition"
 	{
 	"instance" "<ITEM_LAUTARO_GRIDDED_WALL>"
+	"Priority" "-50"
 	"Result"
 		{
-		"AlterTexture"
+		"SetTiles"
 			{
-			"Pos" "0 0 0"
-			"Dir" "0 0 -1"
-			"gridPos" "1"
-			"tex" "<4x4>"
+			"Tile" "4444"
+			"Tile" "4444"
+			"Tile" "4444"
+			"Tile" "4444"
 			}
 		"ChangeInstance" ""
 		}