Merge branch 'development' into macos-build

Author: Causeless

.github/workflows/meson.yml

@@ -36,7 +36,7 @@ on:
       macosx-deployment-target:
         type: string
         required: false
-        default: "10.15"
+        default: "11.1"
 
   # Triggers the workflow when called by a top-level workflow
   workflow_call:
@@ -63,7 +63,7 @@ on:
       macosx-deployment-target:
         type: string
         required: false
-        default: "10.15"
+        default: "11.1"
 
 jobs:
   build-linux:
@@ -255,7 +255,7 @@ jobs:
           echo "::group::Installing pkg-config"
           sudo apt install pkg-config
           echo "::group::Installing mac deps"
-          omp install libsdl2 libsdl2_image onetbb lz4 libpng minizip luajit flac
+          omp install SDL3 onetbb lz4 libpng minizip luajit flac
           echo "OSXCROSS_PKG_CONFIG_PATH=${{env.OSXCROSS_TARGET}}/macports/pkgs/opt/local/libexec/onetbb/lib/pkgconfig" >> $GITHUB_ENV
           echo "::endgroup::"
           echo "::group::Installing meson"

.gitignore

@@ -12,6 +12,7 @@
 
 compile_commands.json
 **/.ccls-cache
+**/.cache
 
 **/build*
 

CHANGELOG.md

@@ -9,12 +9,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 <details><summary><b>Added</b></summary>
 
 - Pathfinding and navigation overhaul, including jetpack/jump-aware pathfinding.  
-	Actors will now intelligently choose their path depending on how high they can jump, instead of always taking the shortest flying path. This will reduce instances of the AI getting stuck while trying to take paths that are impossible for them.  
+	Actors will now choose their path depending on how high they can jump, instead of always taking the shortest flying path. This will reduce instances of the AI getting stuck while trying to take paths that are impossible for them.  
 	Improvements to both `ACrab` and `AHuman` navigation. `ACrab`s are now aware of how to pathfind and navigate using their jetpack, and will use it where applicable. Actors are better at using their jetpack, and will use automovers if their jetpack is not sufficient to reach a destination.  
 	Actors are now more capable and responsive when digging. They will dig to their target if they cannot reach it with their jetpack (for example if there is a long vertical shaft in the route they cannot get up), and they preferentially avoid rocks, metal and other hard substances by digging around them. Actors also dig faster and spend less time idle.  
 	In the `CalculatePath` and `CalculatePathAsync` functions, the parameter `movePathToGround` has been replaced with `jumpHeight`, which is the height in metres the pathfind can jump vertically.  
 	New `Actor` Lua property `JumpHeight` (R) to estimate the jump height of the actor (in metres), based on the actor's jetpack and weight. Actors without a jetpack return 0.  
-	The new function `GetPathFindingFlyingJumpHeight()` can be used to get a jumpHeight that allows flying (i.e infinite jump height). This is also the value that `ACRocket`s and `ACDropships` return for `JumpHeight`.
+	The new function `GetPathFindingFlyingJumpHeight()` can be used to get a jumpHeight that allows flying (i.e infinite jump height). This is also the value that `ACRocket`s and `ACDropShip`s return for `JumpHeight`.
 
 - Improved locomotion.
 	Added the ability to run. When running, you cannot sharpaim whatsoever.
@@ -26,6 +26,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 	Added new `Actor` INI and Lua (R/W) property `CanRun` which denotes whether the Actor can run or not.
 	Added new `Actor` INI and Lua (R/W) property `CrouchWalkSpeedMultiplier` which is a walking speed multiplier when at max crouch amount.
 
+- New hotkey system for `Actor` and `HeldDevice`.
+	Pressing a certain new hotkey will mark it as activated on `Actor` and `HeldDevice`, letting scripts make use of the new bindings easily.
+	`Enum` binding for `HeldDevice.HeldDeviceHotkeyType`: `PRIMARYHOTKEY = 0, AUXILIARYHOTKEY = 1, HELDDEVICEHOTKEYTYPECOUNT = 2`.  
+	`Enum` binding for `Actor.ActorHotkeyType`: `PRIMARYHOTKEY = 0, AUXILIARYHOTKEY = 1, ACTORHOTKEYTYPECOUNT = 2`. 
+	Both `Actor` and `HeldDevice` have the following functions:
+	`HotkeyActionIsActivated(hotkeyType)` returns whether a certain hotkey action is being activated or not.
+	`ActivateHotkeyAction(hotkeyType)` activates a certain hotkey action.
+	`DeactivateHotkeyAction(hotkeyType)` deactivates a certain hotkey action.
+
+- New hotkey bindings.
+	On Mouse+KB PC the defaults are: Weapon Primary Hotkey on V, Weapon Auxiliary Hotkey on H, Actor Primary Hotkey on X, Actor Auxiliary Hotkey on O.
+	Added new `Controller` states `WEAPON_PRIMARY_HOTKEYSTART`, `WEAPON_AUXILIARY_HOTKEYSTART`, `ACTOR_PRIMARY_HOTKEYSTART`, `ACTOR_AUXILIARY_HOTKEYSTART`, `WEAPON_PRIMARY_HOTKEY`, `WEAPON_AUXILIARY_HOTKEY`, `ACTOR_PRIMARY_HOTKEY`, `ACTOR_AUXILIARY_HOTKEY`
+
+- Added multiseat support for multiple mice and keyboards on one computer.
+
+- Added optional player argument to all `UInputMan:Key*` Lua Methods. (e.g. `KeyHeld(keycode, player)`) This allows checking individual player's keyboards, when multiple keyboards are available.
+
 - New music system, including a dynamic horizontal sequencing system, under the new music manager `MusicMan`.  
 	`PlayDynamicSong(string songName, string songSectionName, bool playImmediately, bool playTransition, bool smoothFade)` to play a new DynamicSong.
 	`SetNextDynamicSongSection(string songSectionName, bool playImmediately, bool playTransition, bool smoothFade)` to queue a new DynamicSongSection for the currently playing song.  
@@ -51,19 +68,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - New `AEmitter` and `PEmitter` INI and Lua (R/W) property `PlayBurstSound` which denotes whether the BurstSound should play when appropriate. This should not be confused for a trigger - it's just a enable/disable toggle to avoid having to remove and add BurstSound altogether.
 
 - New `MOSprite` INI and Lua (R/W) integer property `ForcedHFlip` which forces a certain flippedness and disallows anything else from ever changing it without clearing the forced value first. 0 is forced not flipped, 1 forced flipped, and -1 is no force.
-
-- New hotkey bindings.
-	On Mouse+KB PC the defaults are: Weapon Primary Hotkey on V, Weapon Auxiliary Hotkey on H, Actor Primary Hotkey on X, Actor Auxiliary Hotkey on O.
-	Added new `Controller` states `WEAPON_PRIMARY_HOTKEYSTART`, `WEAPON_AUXILIARY_HOTKEYSTART`, `ACTOR_PRIMARY_HOTKEYSTART`, `ACTOR_AUXILIARY_HOTKEYSTART`, `WEAPON_PRIMARY_HOTKEY`, `WEAPON_AUXILIARY_HOTKEY`, `ACTOR_PRIMARY_HOTKEY`, `ACTOR_AUXILIARY_HOTKEY`
-
-- New hotkey system for `Actor` and `HeldDevice`.
-	Pressing a certain new hotkey will mark it as activated on `Actor` and `HeldDevice`, letting scripts make use of the new bindings easily.
-	`Enum` binding for `HeldDevice.HeldDeviceHotkeyType`: `PRIMARYHOTKEY = 0, AUXILIARYHOTKEY = 1, HELDDEVICEHOTKEYTYPECOUNT = 2`.  
-	`Enum` binding for `Actor.ActorHotkeyType`: `PRIMARYHOTKEY = 0, AUXILIARYHOTKEY = 1, ACTORHOTKEYTYPECOUNT = 2`. 
-	Both `Actor` and `HeldDevice` have the following functions:
-	`HotkeyActionIsActivated(hotkeyType)` returns whether a certain hotkey action is being activated or not.
-	`ActivateHotkeyAction(hotkeyType)` activates a certain hotkey action.
-	`DeactivateHotkeyAction(hotkeyType)` deactivates a certain hotkey action.
 
 - New `Controller` state `WEAPON_RELOADHELD`, which is true every frame reload input is held (as opposed to `WEAPON_RELOAD` which is only true once when pressed).
 
@@ -81,6 +85,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - New `Attachable` INI and Lua (R/W) properties `InheritsVelWhenDetached` and `InheritsAngularVelWhenDetached`, which determine how much of these velocities an attachable inherits from its parent when detached. Defaults to 1.
 
+- New GPU Renderer using OpenGL+Raylib, draw now takes 0ms in pretty much every instance.
+
+- New Z Order for scene layers and primitives: Background layer sits at z=100, Terrain Background at z=50, Terrain color and MO color at z=0, GUIs sit at z=-100, allowed z range is [-200, +200], in the future this'll be expanded to MO draw as well.
 - Added Lua-accessible bitmap manipulation functions to `MOSprite`s:	
 	```
 	GetSpritePixelIndex(int x, int y, int whichFrame) - Returns the color index of the pixel at the given coordinate on the given frame of the sprite ((0, 0) is the upper left corner!)
@@ -103,6 +110,34 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - New `SceneMan` function `CastAllMOsRay(startVector, rayVector, table ignoreMOIDs, ignoreTeam, ignoreMaterial, bool ignoreAllTerrain, int skip)` which returns an iterator with pointers to all the non-ignored MOs met along the ray.
 
+- New parameter `depth` for all primitives sets draw depth of the drawn primitive. The default depth is -75.0 (lower numbers draw on top, higher numbers in the back). 
+
+- New `DrawDepth` enum for default draw depths:
+   - `Default` = 0.0f (Main draw depth for MOs)
+   - `GUI` = -100.0f (Draw Depth of GUI elements)
+   - `Primitive` = -75.0f (Default Primitive draw depth)
+   - `TerrainBackground` = 50.0f (Draw Depth of Terrain Background layer)
+   - `Background` = 100.0f (Draw Depth of Background layer)
+
+- Added scaling capability to Bitmap primitives.
+	New draw bindings with argument for scale are:
+	```
+	PrimitiveMan:DrawBitmapPrimitive(pos, moSprite, rotAngle, frame, scale)
+	PrimitiveMan:DrawBitmapPrimitive(pos, moSprite, rotAngle, frame, scale, bool hFlipped, bool vFlipped)
+	PrimitiveMan:DrawBitmapPrimitive(player, pos, moSprite, rotAngle, frame, scale)
+	PrimitiveMan:DrawBitmapPrimitive(player, pos, moSprite, rotAngle, frame, scale, bool hFlipped, bool vFlipped)
+	PrimitiveMan:DrawBitmapPrimitive(pos, filePath, rotAngle, scale)
+	PrimitiveMan:DrawBitmapPrimitive(pos, filePath, rotAngle, scale, bool hFlipped, bool vFlipped)
+	PrimitiveMan:DrawBitmapPrimitive(player, pos, filePath, rotAngle, scale)
+	PrimitiveMan:DrawBitmapPrimitive(player, pos, filePath, rotAngle, scale, bool hFlipped, bool vFlipped)
+	```
+	As well as constructors:
+	```
+	BitmapPrimitive(player, pos, moSprite, rotAngle, frame, scale, hFlipped, vFlipped)
+	BitmapPrimitive(player, pos, filePath, rotAngle, scale, hFlipped, vFlipped)
+	```
+	Original bindings with no scale argument are untouched and can be called as they were.
+
 </details>
 
 <details><summary><b>Changed</b></summary>
@@ -113,6 +148,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 	The Ronin Scrambler, the basic scanner, and `SceneMan:CastUnseenRay` have been changed to accomodate fog-of-war resolutions as fine as 1x1 and as coarse as 20x20.
 	The fog-of-war revealing code is now multithreaded to increase performance.
 
+- Save files are now compressed and stored in a single file, instead of a directory.
+	Savefiles have the extension `.ccsave`, but their underlying format is really just a `.zip` file. This can be opened and modified as before with any zip file viewer.
+	These savefiles can be safely renamed and moved without breaking the savegame, unlike before.
+
 - All vanilla scenario activities have had their settings polished, respecting settings which make sense and disabling settings which don't.
 	You can now have fog of war in the test scene, and can no longer require path to orbit in Zero-G Diggers-Only One Man Army.
 
@@ -145,6 +184,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - `InheritsVel` and its ilk have been uncapped, allowing users to set them outside of 0-1.
 
+- Lua renamed `SceneLayer`->`StaticSceneLayer` due to changed SLBackground base class.
+
 - `Scene` Lua functions `AddNavigatableArea(areaName)` and `ClearNavigatableAreas()` have been renamed/corrected to `AddNavigableArea(areaName)` and `ClearNavigableAreas()`, respectively.
 
 - `MOSRotating` Lua function `AddWound` now additionally accepts the format `MOSRotating:AddWound(AEmitter* woundToAdd, const Vector& parentOffsetToSet, bool checkGibWoundLimit, bool isEntryWound, bool isExitWound)`, allowing modders to specify added wounds as entry- or exit wounds, for the purpose of not playing multiple burst sounds on the same frame. These new arguments are optional.
@@ -157,6 +198,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Various performance improvements.
 
+- Drop support for macOS < 11.1 (Big Sur) :(
+
+- Updated SDL2 to SDL3
+
 </details>
 
 <details><summary><b>Fixed</b></summary>
@@ -177,6 +222,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Fixed an issue where internal Lua functions OriginalDoFile, OriginalLoadFile, and OriginalRequire were polluting the global namespace. They have now been made inaccessible.
 
+- Fixed the palette being mangled to 6bit/color on load.
+
+- Fixed allegro not loading alpha of image with alpha by using SDL_image instead.
 - Fixed `MOSprite:UnRotateOffset()` giving the wrong results on HFLipped sprites.
 
 - Various fixes and improvements to inventory management when dual-wielding or carrying a shield, to stop situations where the actor unexpectedly puts their items away.
@@ -189,6 +237,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Fixed issue where scripts applied to `MovableObject`s could become disordered in certain circumstances.
 
+- Fixed a minor inconsistency where `ACDropShip`s were frequently referred to as `ACDropship`s in Lua, the lower case 's' invalidating keywords where the typo occured.
+
 </details>
 
 <details><summary><b>Removed</b></summary>

Data/Base.rte/Activities/BrainVsBrain.lua

@@ -625,7 +625,7 @@ function BrainvsBrain:CreateMediumDrop(xPosLZ)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0);	-- MaxMass not defined
@@ -685,7 +685,7 @@ function BrainvsBrain:CreateLightDrop(xPosLZ)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0);	-- MaxMass not defined
@@ -743,7 +743,7 @@ function BrainvsBrain:CreateScoutDrop(xPosLZ)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined

Data/Base.rte/Activities/Harvester.lua

@@ -263,7 +263,7 @@ function Harvester:UpdateActivity()
 			if shipMaxMass < 0 then
 				shipMaxMass = math.huge;
 			elseif shipMaxMass < 1 then
-				if Craft.ClassName == "ACDropship" then
+				if Craft.ClassName == "ACDropShip" then
 					DeleteEntity(ship);
 					Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 				else

Data/Base.rte/Activities/Massacre.lua

@@ -261,7 +261,7 @@ function Massacre:UpdateActivity()
 			if shipMaxMass < 0 then
 				shipMaxMass = math.huge;
 			elseif shipMaxMass < 1 then
-				if Craft.ClassName == "ACDropship" then
+				if Craft.ClassName == "ACDropShip" then
 					DeleteEntity(ship);
 					Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 				else

Data/Base.rte/Activities/Siege.lua

@@ -612,7 +612,7 @@ function Siege:CreateMediumDrop(xPosLZ, techName)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined
@@ -666,7 +666,7 @@ function Siege:CreateLightDrop(xPosLZ, techName)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined
@@ -718,7 +718,7 @@ function Siege:CreateEngineerDrop(xPosLZ, techName)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined
@@ -767,7 +767,7 @@ function Siege:CreateScoutDrop(xPosLZ, techName)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined

Data/Base.rte/Activities/SkirmishDefense.lua

@@ -740,7 +740,7 @@ function SkirmishDefense:CreateMediumDrop(xPosLZ, Destination, Team)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined
@@ -798,7 +798,7 @@ function SkirmishDefense:CreateLightDrop(xPosLZ, Destination, Team)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined
@@ -854,7 +854,7 @@ function SkirmishDefense:CreateScoutDrop(xPosLZ, Destination, Team)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined

Data/Base.rte/Activities/WaveDefense.lua

@@ -679,7 +679,7 @@ function WaveDefense:CreateMediumDrop(xPosLZ, Destination)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined
@@ -737,7 +737,7 @@ function WaveDefense:CreateLightDrop(xPosLZ, Destination)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined
@@ -793,7 +793,7 @@ function WaveDefense:CreateScoutDrop(xPosLZ, Destination)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined