Merge branch 'development' into gpu-primitives

Author: HeliumAnt

CHANGELOG.md

@@ -58,12 +58,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - 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`: `PRIMARY = 0, AUXILIARY = 1, HELDDEVICEHOTKEYTYPECOUNT = 2`.  
-	`Enum` binding for `Actor.ActorHotkeyType`: `PRIMARY = 0, AUXILIARY = 1, ACTORHOTKEYTYPECOUNT = 2`. 
+	`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).
 
 - New `GAScripted` Lua script method `IsCompatibleScene(scene)` to allow Activities to generically decide which Scenes are eligible by returning a boolean value.
 	New `GAScripted` INI enumerating property `AddRequiredArea`, replacing Lua file scanning, to allow Activities to explicitly state which areas are strictly required.
@@ -83,6 +85,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - 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.
 
+- New `ACraft` INI and Lua (R/W) property `CanEnterOrbit`, which determines whether a craft can enter orbit (and refund gold appropriately) or not. If false, default out-of-bounds deletion logic applies.
+
+- New `MovableMan` function `GetMOsAtPosition(posX, posY, ignoreTeam, getsHitByMOsOnly)` that will return an iterator with all the `MovableObject`s that intersect that exact position with their sprite.
+
+- 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.
+
 </details>
 
 <details><summary><b>Changed</b></summary>
@@ -117,7 +125,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Internal GUI element `ComboBox` no longer displays dropdown combobutton when disabled, to communicate visually that it's setting is not modifiable.
 
-- Almost all ctrl+* special inputs functionality (i.e restarting activity, world dumps, showing performance stats) are now mapped to right alt, to not interfere with default crouching inputs. The only exception is ctrl+arrow keys for changing console size.
+- Almost all ctrl+\* special inputs functionality (i.e restarting activity, world dumps, showing performance stats) are now mapped to right alt, to not interfere with default crouching inputs. The only exception is ctrl+arrow keys for changing console size.
 
 - `Gib`s and detached `Attachable`s now inherit the parent's angular velocity by default.
 
@@ -127,6 +135,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - 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.
+
+- `SceneMan` function `CastFindMORay` now has an extra bool parameter `findChildMOIDs` that denotes whether it also triggers on child MOIDs or not, which defaults to true for the same default behavior as before.
+
+- `SceneMan` function `CastMORay` now can also accept a table of MOIDs instead of a single MOID, letting you ignore any arbitrary set of MOIDs.
+
+- Techion Laser Rifle now has a constant range rather than being dependent on game resolution.
+
+- Various performance improvements.
+
 </details>
 
 <details><summary><b>Fixed</b></summary>
@@ -151,6 +171,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Fixed allegro not loading alpha of image with alpha by using SDL_image instead.
 
+- 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.
+
+- Fixed issue where MOSR `Gib`s, `AEmitter` or `PEmitter` `Emission`s, and MetaMan `Player`s were not correctly accessible from script.
+
+- Fixed a crash on launch when the `SupportedGameVersion` INI property was not set.
+
+- Fixed several issues with the way pie menus and aiming interacts between players, such as opening the pie menu always resetting the M&KB player's aim and pie selection, as well as another issue where the pie menu would fail to appear entirely for some players.
+
 </details>
 
 <details><summary><b>Removed</b></summary>
@@ -2681,7 +2709,7 @@ This can be accessed via the new Lua (R/W) `SettingsMan` property `AIUpdateInter
 
 - `TDExplosive.ActivatesWhenReleased` now works properly.
 
-- Various bug fixed related to all the Attachable and Emitter changes, so they can now me affected reliably and safely with lua.
+- Various bugs fixed related to all the Attachable and Emitter changes, so they can again be affected reliably and safely with lua.
 
 - Various minor other things that have gotten lost in the shuffle.
 

Data/Base.rte/AI/SharedBehaviors.lua

@@ -864,28 +864,28 @@ function SharedBehaviors.GoToWpt(AI, Owner, Abort)
 
 												-- test jumping
 												local JetAccel = Accel + Vector(-jetStrength, 0):RadRotate(Owner.RotAngle+1.375*math.pi+Owner:GetAimAngle(false)*0.25);
-												local JumpPos = Owner.Head.Pos + PixelVel + JetAccel * (t*t*0.5);
+												local JumpPos = (Owner.Head and Owner.Head.Pos or Owner.Pos) + PixelVel + JetAccel * (t*t*0.5);
 
 												-- a burst add a one time boost to acceleration
 												if Owner.Jetpack:CanTriggerBurst() then
 													JumpPos = JumpPos + Vector(-AI.jetBurstFactor, 0):AbsRotateTo(JetAccel);
 												end
 
 												-- check for obstacles from the head
-												Trace = SceneMan:ShortestDistance(Owner.Head.Pos, JumpPos, false);
-												local jumpScore = SceneMan:CastObstacleRay(Owner.Head.Pos, Trace, JumpPos, Vector(), Owner.ID, Owner.IgnoresWhichTeam, rte.grassID, 3);
+												Trace = SceneMan:ShortestDistance((Owner.Head and Owner.Head.Pos or Owner.Pos), JumpPos, false);
+												local jumpScore = SceneMan:CastObstacleRay((Owner.Head and Owner.Head.Pos or Owner.Pos), Trace, JumpPos, Vector(), Owner.ID, Owner.IgnoresWhichTeam, rte.grassID, 3);
 												if jumpScore < 0 then	-- no obstacles: calculate the distance from the future pos to the wpt
 													jumpScore = SceneMan:ShortestDistance(Waypoint.Pos, JumpPos, false).Magnitude;
 												else -- the ray hit terrain or start inside terrain: avoid
 													jumpScore = SceneMan:ShortestDistance(Waypoint.Pos, JumpPos, false).Largest * 2;
 												end
 
 												-- test falling
-												local FallPos = Owner.Head.Pos + PixelVel + Accel * (t*t*0.5);
+												local FallPos = (Owner.Head and Owner.Head.Pos or Owner.Pos) + PixelVel + Accel * (t*t*0.5);
 
 												-- check for obstacles when falling/walking
-												local Trace = SceneMan:ShortestDistance(Owner.Head.Pos, FallPos, false);
-												SceneMan:CastObstacleRay(Owner.Head.Pos, Trace, FallPos, Vector(), Owner.ID, Owner.IgnoresWhichTeam, rte.grassID, 3);
+												local Trace = SceneMan:ShortestDistance((Owner.Head and Owner.Head.Pos or Owner.Pos), FallPos, false);
+												SceneMan:CastObstacleRay((Owner.Head and Owner.Head.Pos or Owner.Pos), Trace, FallPos, Vector(), Owner.ID, Owner.IgnoresWhichTeam, rte.grassID, 3);
 
 												if SceneMan:ShortestDistance(Waypoint.Pos, FallPos, false):MagnitudeIsLessThan(jumpScore) then
 													AI.jump = false;

Data/Base.rte/Devices/Shared/Scripts/MuzzleSmoke.lua

@@ -1,5 +1,4 @@
 function Create(self)
-
 	if self.Magazine then
 		local particleCount = self.Magazine.NextRound.ParticleCount;
 		local particleMass = self.Magazine.NextRound.NextParticle.Mass;
@@ -30,16 +29,13 @@ function Create(self)
 	self.fireSmokeEffect.GravMult = 1;
 
 	self.particleUtility = require("Scripts/Utility/ParticleUtility");	
-	
 end
 
 function OnFire(self)
-
 	local flip = self.HFlipped and math.pi or 0;
 	local angle = self.RotAngle + flip;
 	self.fireSmokeEffect.Position = self.MuzzlePos;
 	self.fireSmokeEffect.RadAngle = angle;
 
 	self.particleUtility:CreateDirectionalSmokeEffect(self.fireSmokeEffect);
-
 end

Data/Base.rte/Devices/Shared/Scripts/RevolverCylinderReload.lua

@@ -4,18 +4,29 @@ function Create(self)
 	self.shellMOSRotating = self:StringValueExists("CylinderShellMOSRotating") and self:GetStringValue("CylinderShellMOSRotating") or nil;
 end
 
-function Update(self)
+function ThreadedUpdate(self)
 	if self.Magazine then
 		self.shellsToEject = self.Magazine.Capacity - self.Magazine.RoundCount;
 	elseif self.shellsToEject > 0 then
+		self.ejectingShells = {};
 		for i = 1, self.shellsToEject do
 			local shell = self.shellMOSRotating and CreateMOSRotating(self.shellMOSRotating) or CreateMOSParticle(self.shellMOSParticle);
 			shell.Pos = self.Pos;
 			shell.Vel = self.Vel + Vector(RangeRand(-3, 0) * self.FlipFactor, 0):RadRotate(self.RotAngle + RangeRand(-0.3, 0.3));
 			shell.AngularVel = RangeRand(-1, 1);
-			MovableMan:AddParticle(shell);
+			table.insert(self.ejectingShells, shell);
 		end
 
 		self.shellsToEject = 0;
+		self:RequestSyncedUpdate();
+	end
+end
+
+function SyncedUpdate(self)
+	if self.ejectingShells then
+		for i = 1, #self.ejectingShells do 
+			MovableMan:AddParticle(self.ejectingShells[i]);
+		end
+		self.ejectingShells = nil;
 	end
 end