Version 2.4.44.0

.github/workflows/build.yml

@@ -95,18 +95,22 @@ jobs:
         run: python -m PyInstaller --distpath "../dist/${{ matrix.bitness }}bit/" -y BEE2.spec
         working-directory: ./src/
 
+      - name: Compress Artifact
+        run: python -m zipfile --create "../../bee2_${{ matrix.bitness }}.zip" .
+        working-directory: ./dist/${{ matrix.bitness }}bit/BEE2/
+
       - name: Artifact upload (tag)
         uses: actions/upload-artifact@v3
         if: github.event_name == 'create'
         with:
           name: beemod2_${{ github.event.ref }}_${{ matrix.artifact-name }}
-          path: ./dist/${{ matrix.bitness }}bit/BEE2/
+          path: ./dist/bee2_${{ matrix.bitness }}.zip
           if-no-files-found: error
 
       - name: Artifact upload (hash)
         uses: actions/upload-artifact@v3
         if: github.event_name != 'create'
         with:
           name: beemod2_${{ github.sha }}_${{ matrix.artifact-name }}
-          path: ./dist/${{ matrix.bitness }}bit/BEE2/
+          path: ./dist/bee2_${{ matrix.bitness }}.zip
           if-no-files-found: error

.github/workflows/run-tests.yml

@@ -15,6 +15,7 @@ permissions:
 jobs:
   run-tests:
     runs-on: windows-latest
+    name: "${{ matrix.os }} Python ${{ matrix.python-version }}-${{ matrix.arch }}"
     strategy:
       fail-fast: false
       matrix:
@@ -23,15 +24,19 @@ jobs:
           - python-version: '3.8.10'
             arch: 'x86'
             os: 'windows-latest'
+            libs: 'lib-32'
           - python-version: '3.11'
             arch: 'x64'
             os: 'windows-latest'
+            libs: 'lib-64'
           - python-version: '3.12-dev'
             arch: 'x64'
             os: 'windows-latest'
+            libs: 'lib-64'
           - python-version: '3.11'
             arch: 'x64'
             os: 'ubuntu-latest'
+            libs: 'lib-64'  # TODO?
 
     steps:
     - uses: actions/checkout@v3
@@ -57,5 +62,6 @@ jobs:
         python -X dev -m pytest ${{ github.workspace }}/src/test/
       env:
         PYTHONPATH: ${{ github.workspace }}/src/
+        SPATIALINDEX_C_LIBRARY: ${{ github.workspace }}/${{ matrix.libs }}/
       # Don't fail for beta versions of Python.
       continue-on-error: ${{ contains(matrix.python-version, 'dev') }}

BEE2.fgd

@@ -111,14 +111,15 @@
 
 
 // --------
-// Entities used with editoritems_gen.py to make editoritems configs.
+// Entities used with editoritems_vmf to make editoritems configs.
 // These should not appear in any maps.
 
 @PointClass 
 	base(Angles)
 	studioprop("models/BEE2/editor/connection_point.mdl")
 	= bee2_editor_connectionpoint: "Defines a connection point for antlines."
 	[
+	sortkey(string) : "Sort Key" : "This allows specifying the order for connection points in the final script. The value is sorted in ascending order."
 	skin(choices) : "Orientation" : 1 : "The position of the antline relative to the signage." =
 		[
 		// 0 = useless, needed to distinguish materials in the model.
@@ -162,7 +163,7 @@
 @SolidClass = bee2_collision_bbox: "Defines a region of item collision for the compiler."
 	[
 	tags(string): "Tags" : : "Space-seperated list of tags to associate with the collision volume."
-	item_name(string) readonly: "Item Name" : : "In exports of the full map collisions, this is the item name this collision is for."
+	item_id(string) readonly: "Item ID" : : "In exports of the full map collisions, this is the item ID this collision is for."
 	coll_solid(boolean):      "Collide: Solid"      : 0 : "General collisions, should be used for solid walls, props and the like that do not pass anything through."
 	coll_grating(boolean):    "Collide: Grating"    : 0 : "Grating blocks movement, but does not block 'energy' effects."
 	coll_glass(boolean):      "Collide: Glass"      : 0 : "Glass blocks everything, except for line of sight and Discouragement Beams."
@@ -171,6 +172,7 @@
 	coll_temporary(boolean):  "Collide: Temporary"  : 0 : "Indicates a region which will only sometimes be solid. This should be used for the movement region of things like platforms and panels."
 	coll_decoration(boolean): "Collide: Decoration" : 0 : "Prohibits additional decoration from being placed in this area."
 	coll_antlines(boolean):   "Collide: Antlines"   : 0 : "Prohibits antlines from being placed in this area."
+	coll_oob(boolean):     "Collide: Out Of Bounds" : 0 : "Indicates a region which might be air, but is outside the puzzle. Objects will be prevented from spawning here."
 	]
 
 // Entities added to the finished map to pass information to VRAD.

CHANGELOG.md

@@ -1,6 +1,56 @@
 # Changelog
 
-# Version `<dev>`
+# Version 4.44.0
+
+### Enhancements:
+* If a duplicate package is present, include the paths of both in the error message.
+* Change palette item format to permit "holes" in the position of items. This isn't exposed in the UI yet.
+* Redo the selector on the Item Properties pane to make it more clear that it swaps pages.
+* Display the authors of corridors.
+* Rearranged the UI on the corridor picker display.
+* Add some informative errors if Unstationary Scaffolds (or similar UCP items) are connected in an
+  invalid manner.
+* Added "Compress Items" option, which hides all but one of each on the item list.
+* Skip disabled packages when extracting resources.
+* Timer-style indicator panels at the end of antlines can now have a custom appearance for some 
+  items (Delayers). This allows them to show both count-down and count-up displays.
+* Moved various palette-related buttons, to group them with the other palette options.
+* VPK files can be now placed into `vpk_override` to have them be combined with the built VPK. 
+* Added a warning screen to the developer tab of the options window, indicating that some of these options can temporarily break BEE if changed.
+* #1984: The "save settings to palette" will now change to match the selected palette. This means clicking "save" won't accidentally delete saved settings.
+* #1893: Add compile logs to error display windows.
+* Internal files are now placed in a `bin/` subfolder, instead of cluttering
+  the folders containing `BEE2.exe`, `vbsp.exe` and `vrad.exe`.
+
+### UCP-Relevant Changes:
+* Terminology change: "Condition Flags" have been renamed to "Condition Tests" - I think that sounds a bit better.
+* Added an `Inherit` option to Corridor Groups. This specifies the ID of another style, causing all
+  corridors to be copied from that other style.
+* Make several results properly permit options to use `$fixup` variables: `addOverlay`, `changeInstance`, `setKey`, `localTarget`.
+* `properties.txt` for items is now optional, since most of these options can be set elsewhere.
+* `PosIsSolid` and `ReadSurfType` now have a `debug` option. When "Developer Mode" is enabled,
+  `info_target`s are generated to mark the locations being sampled, and the contents of this field
+  is copied into those as a comment to help identify them.
+* Behaviour change: in Fizzlers, `model_mid` will now be affected by the `NameType` value.
+* Added the `Error` result, which allows producing a custom error message from a package.
+* #1313: Allow disabling the triggers produced by `CustVactube`.
+* When Dev Mode is on, `SetTile` now dumps the tiles it's trying to set into the final map.
+* `ConfigGroup` slider widgets can now be set to display "Off" when set to zero, also fixed them not snapping to values.
+
+### Bugfixes:
+* BEE will detect `portal2_dlc3` being in use and pick another DLC folder for its VPKs.
+* Properly pick free port for error server.
+* Set a title for the corridor selector window.
+* Always pack generated resources even if packing is disabled in options.
+* Parse game translation files in an even more lenient way, to handle some Portal 2 files correctly.
+* Fix potential z-fighting near the hinge of static angled panels.
+* Add a scrollbar if required to the corridor selection window.
+* Fix single-dot antlines sometimes failing to be placed.
+* BEEmod/BEE2-items#4325: Set corridors to force upright even if vertical corridors are not available.
+* Piston Platforms will now correctly accept Surface Lacquer, if placed on their base.
+* Paint Splats will correctly rotate to aint Angled Panels they are placed on top of.
+* Removed the "Prevent Portal Bump (fizzler)" stylevar. It is useless and never worked.
+* #1955: Fix some situations causing incorrect catwalk placement.
 
 ------------------------------------------
 

README.md

@@ -46,8 +46,8 @@ As of version 4.37 we have stopped supporting BEE2.4 on Mac. See [this wiki arti
 * First, grab the repo and then clone the HammerAddons submodule:
 
 	    git clone --recurse-submodules https://github.com/BEEmod/BEE2.4.git
-        cd BEE2.4
-	    git submodules update --init
+	    cd BEE2.4
+	    git submodule update --init
 
 * Run `python -m pip install -r requirements.txt` to install the required packages. On Linux, 
 Pillow, TK and IDLE might need to be installed via the system package manager:
@@ -57,9 +57,9 @@ Pillow, TK and IDLE might need to be installed via the system package manager:
 	* In the `BEE2.4` folder, add `lib-32` and/or `lib-64/` folders.
 	* Download the [32-bit](https://github.com/sudo-nautilus/FFmpeg-Builds-Win32/releases) or [64-bit](https://github.com/BtbN/FFmpeg-Builds/releases) builds (`winXX-lgpl-shared`), then copy the contents of the `bin` folder into the appropriate `lib-XX` folder mentioned.
 
-* Finally, switch to the BEE2.4 repo and build the compiler, then the application:
+* Finally, switch to the BEE2.4 repo and build the compiler, then the application (You should be in the BEE2.4 folder already):
 
-	    cd BEE2.4/src/
+	    cd src/
 	    pyinstaller --distpath ../dist/64bit/ --workpath ../build_tmp compiler.spec
 	    pyinstaller --distpath ../dist/64bit/ --workpath ../build_tmp BEE2.spec
 
@@ -68,3 +68,5 @@ To generate the packages zips, either manually zip the contents of each folder o
 use the `compile_packages` script in BEE2-items. 
 This does the same thing, but additionally removes some unnessary content 
 to decrease file sizes - comments, blank lines, hidden visgroups.
+
+* For Linux Compilation check out this wiki entry [Building from Source](https://github.com/BEEmod/BEE2-items/wiki/Building-from-source) 

dev-requirements.txt

@@ -1,10 +1,10 @@
-mypy>=0.982
-mypy-extensions==0.4.3
-pytest>=6.2.2
-pytest-trio>=0.7.0
+mypy>=1.5.0
+mypy-extensions>=1.0.0
+pytest>=7.3.2
+pytest-trio>=0.8.0
 pytest-datadir>=1.4.1
 pytest-regressions>=2.4.2
-types-Pillow~=8.3.0
+dirty_equals >= 0.6
+types-Pillow>=9.4.0.5
 types-atomicwrites>=1.4.0
-trio-typing>=0.7.0
 types-babel>=2.10.0