From f06ffdf24639f7b7a84fe3bb1deea2f467af5bc1 Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Mon, 8 Nov 2021 21:08:53 -0500 Subject: [PATCH] When transitioning states, exit from current state to least common ancestor, then enter from least common ancestor to new state [git-p4: depot-paths = "//depot/main/": change = 137] --- .../Components/SNGStateMachineComponent.cpp | Bin 10094 -> 15252 bytes .../SwordNGun/Private/States/SNGState.cpp | Bin 7612 -> 8578 bytes .../Components/SNGStateMachineComponent.h | Bin 2880 -> 2918 bytes .../Source/SwordNGun/Public/States/SNGState.h | Bin 4766 -> 5064 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/SwordNGun/Source/SwordNGun/Private/Components/SNGStateMachineComponent.cpp b/SwordNGun/Source/SwordNGun/Private/Components/SNGStateMachineComponent.cpp index d951c6f0d5b0416ba5cb8b77e85069908bdeaf5e..fa00c8dedf5dcdda3338cdc9cb21cb070d2dde61 100644 GIT binary patch literal 15252 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 P71qxgV{zojongjLGQaH` delta 108 zcmbPI{?2d1GS12SwAm&{X!A{ez;gE z__$anKT-6XJVAtIa+Zd{-8Ib+KL}KzQb&1J7x>l0~t(c-B&ZL;c4WKKX|$#h9gL)DO7wwdKc9hT^4k0|WZut}L44Z`Phi$ZyCFy`_M zqOaOgg49(>sgdX%WoZoVvv@yfh-%I1Cn?CFfo delta 48 zcmZp2-ebL?LS*s;R)xuWVrr8Y$g*tSCozj-a+ZVuzXF3Tg91YdLk2@8LotK(WJg6u E0Dl<`mjD0& diff --git a/SwordNGun/Source/SwordNGun/Public/Components/SNGStateMachineComponent.h b/SwordNGun/Source/SwordNGun/Public/Components/SNGStateMachineComponent.h index 7a39bf413b2ba92b1ea2a3bb761ca6c598aac87c..25bebc38ba063dfcd7092b7753a3da5863aba0ea 100644 GIT binary patch delta 30 lcmX>g_DpPp1P8MYgTmxqc5&7KhD3&<$%QPUo7Fg^m;r(_2Xg=b delta 12 TcmaDRc0g={1jlAO4h?1iA4UVm diff --git a/SwordNGun/Source/SwordNGun/Public/States/SNGState.h b/SwordNGun/Source/SwordNGun/Public/States/SNGState.h index 15ee8ed0754c99b6c3383bb928ad81a4c6920588..475d16b837bb24def998a9bcd8331eb5e40fb86a 100644 GIT binary patch delta 211 zcmbQIdP02z2m9nz%v_VZ_(Y`L8B!Ta7y=j)8H#|cJRndjVz+_r3{&1oyH7C3=d7&JEjXWP#nngUc*4Azv# ykPMVmU`PX6na_|5WP#{>pqv8Gn0$s5pe)dO22LPEH5y?k*nte3o7eNbX9fVIXey%s delta 25 hcmX@1K2LQ62m9npd=iuE_zX6SapbXYe!>5M831@S2_FCe