Skip to content

Commit 564e7c0

Browse files
committed
Merge branch 'development' into gpu-scenelayers
2 parents f31c4a5 + 5c457c1 commit 564e7c0

28 files changed

+36
-5
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
8383

8484
- 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.
8585

86+
- Gibs and detached Attachables now inherit the parent's angular velocity, as well as velocity derived from the angular velocity of the parent MO and their offset from the parent's centre. On gibs, this is scaled by `InheritsVel`.
87+
8688
</details>
8789

8890
<details><summary><b>Fixed</b></summary>

Data/Base.rte/AI/SharedBehaviors.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@ function SharedBehaviors.GoToWpt(AI, Owner, Abort)
848848
end
849849
else
850850
-- do we have a target we want to shoot at?
851-
if (AI.Target and AI.canHitTarget and AI.BehaviorName ~= "AttackTarget") then
851+
if Owner.Head and AI.Target and AI.canHitTarget and AI.BehaviorName ~= "AttackTarget" then
852852
-- are we also flying
853853
if AI.flying and Owner.Jetpack.JetpackType == AEJetpack.Standard then
854854
-- predict jetpack movement when jumping and there is a target (check one direction)
9.1 KB
Loading
9.13 KB
Loading
8.86 KB
Loading
-13 Bytes
Loading
-2 Bytes
Loading
2 Bytes
Loading
-1 Bytes
Loading
-3 Bytes
Loading

0 commit comments

Comments
 (0)