From a55b8556ea4a7aebec862953fb14211094756e03 Mon Sep 17 00:00:00 2001 From: Maxime Date: Sat, 25 Nov 2023 12:24:02 +0100 Subject: [PATCH] Add spiral stair in Controller Gym --- Pawn_Unreal/Content/Characters/BP_Judy.uasset | 4 ++-- .../maxim/Spiral_Stair_Brush_StaticMesh.uasset | 3 +++ Pawn_Unreal/Content/Maps/Dev/MAP_ControllerGym.umap | 4 ++-- .../MAP_ControllerGym/0/91/BERD0JFDCI5RAYAPS4DY1P.uasset | 3 --- .../MAP_ControllerGym/0/GT/B3FVEW201B4H0JZT407R3G.uasset | 3 --- .../MAP_ControllerGym/0/XC/EES9G2P00B5EO5FPWE8N4U.uasset | 3 --- .../MAP_ControllerGym/1/LE/RIS6ZA9R1KK7MS3EGVDKZV.uasset | 3 --- .../MAP_ControllerGym/1/TO/L6IIV6YT2Z6G1UGUHWHWPR.uasset | 3 --- .../MAP_ControllerGym/1/XM/TP8DFTZ6ODOTSDOLG6WEXZ.uasset | 3 --- .../MAP_ControllerGym/3/7A/SCU1D1LU7J4NS7X4MENA7G.uasset | 3 --- .../MAP_ControllerGym/3/ZC/SPZ5ZSIG7BW3194FWIBEWC.uasset | 3 --- .../MAP_ControllerGym/3/ZX/V7QFRP3DMWRT8NZCJQYVRB.uasset | 3 --- .../MAP_ControllerGym/4/OH/3YZOO5HQPTMDBNJPPM4RV0.uasset | 3 --- .../MAP_ControllerGym/5/7S/W5AOPA3TGYQNLQDCWK6C75.uasset | 3 +++ .../MAP_ControllerGym/5/V3/7TDZ89SOYDGI26YWXQ04D4.uasset | 3 --- .../MAP_ControllerGym/5/Y4/YBN91OHWXDZU3ZMLN026WF.uasset | 3 +++ .../MAP_ControllerGym/9/IH/5T09JNLLSNG3U1KPWNFK3T.uasset | 3 --- .../MAP_ControllerGym/9/RQ/JYNZEWOG6SXNE3HGUCSZIE.uasset | 3 --- .../MAP_ControllerGym/A/1J/FGN60CK2BMBEJRXHZ72TKV.uasset | 4 ++-- .../MAP_ControllerGym/A/BZ/XZUBN8NU0UZ2W8T2MBWCYN.uasset | 3 --- .../MAP_ControllerGym/A/MX/Q9G3HXBB9AGAYTMOU1AVGY.uasset | 3 +++ .../MAP_ControllerGym/A/U2/4ECO0ADAHJEURYSR8OYVEX.uasset | 3 --- .../MAP_ControllerGym/B/0Z/X5N2DTGOJMHQWHOBBKFNDX.uasset | 3 --- .../MAP_ControllerGym/D/VD/LJAQY01SJR93NPW0FPCPIL.uasset | 3 --- .../MAP_ControllerGym/E/86/NKWQISSIQGRX07O716DOXO.uasset | 3 --- .../MAP_ControllerGym/E/9K/R7HQI0E9NM3G94LW522VPS.uasset | 3 +++ .../Private/Characters/PwnCharacterMovementComponent.cpp | 9 ++++++--- .../Private/GameplayModes/PwnGameplayModeSubsystem.cpp | 7 +++---- 28 files changed, 30 insertions(+), 67 deletions(-) create mode 100644 Pawn_Unreal/Content/Developers/maxim/Spiral_Stair_Brush_StaticMesh.uasset delete mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/0/91/BERD0JFDCI5RAYAPS4DY1P.uasset delete mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/0/GT/B3FVEW201B4H0JZT407R3G.uasset delete mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/0/XC/EES9G2P00B5EO5FPWE8N4U.uasset delete mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/1/LE/RIS6ZA9R1KK7MS3EGVDKZV.uasset delete mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/1/TO/L6IIV6YT2Z6G1UGUHWHWPR.uasset delete mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/1/XM/TP8DFTZ6ODOTSDOLG6WEXZ.uasset delete mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/3/7A/SCU1D1LU7J4NS7X4MENA7G.uasset delete mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/3/ZC/SPZ5ZSIG7BW3194FWIBEWC.uasset delete mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/3/ZX/V7QFRP3DMWRT8NZCJQYVRB.uasset delete mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/4/OH/3YZOO5HQPTMDBNJPPM4RV0.uasset create mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/5/7S/W5AOPA3TGYQNLQDCWK6C75.uasset delete mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/5/V3/7TDZ89SOYDGI26YWXQ04D4.uasset create mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/5/Y4/YBN91OHWXDZU3ZMLN026WF.uasset delete mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/9/IH/5T09JNLLSNG3U1KPWNFK3T.uasset delete mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/9/RQ/JYNZEWOG6SXNE3HGUCSZIE.uasset delete mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/A/BZ/XZUBN8NU0UZ2W8T2MBWCYN.uasset create mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/A/MX/Q9G3HXBB9AGAYTMOU1AVGY.uasset delete mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/A/U2/4ECO0ADAHJEURYSR8OYVEX.uasset delete mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/B/0Z/X5N2DTGOJMHQWHOBBKFNDX.uasset delete mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/D/VD/LJAQY01SJR93NPW0FPCPIL.uasset delete mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/E/86/NKWQISSIQGRX07O716DOXO.uasset create mode 100644 Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/E/9K/R7HQI0E9NM3G94LW522VPS.uasset diff --git a/Pawn_Unreal/Content/Characters/BP_Judy.uasset b/Pawn_Unreal/Content/Characters/BP_Judy.uasset index bf9eb67..6dc34fb 100644 --- a/Pawn_Unreal/Content/Characters/BP_Judy.uasset +++ b/Pawn_Unreal/Content/Characters/BP_Judy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d60efd34651c15fc40c0c27d7cda39e93af96951bc2bdba75f105dd776bf44cb -size 223684 +oid sha256:c8f5690bd8acd5e30d28f26d236a462d24e4805d8e453329b43b1494809bb30e +size 265660 diff --git a/Pawn_Unreal/Content/Developers/maxim/Spiral_Stair_Brush_StaticMesh.uasset b/Pawn_Unreal/Content/Developers/maxim/Spiral_Stair_Brush_StaticMesh.uasset new file mode 100644 index 0000000..859e486 --- /dev/null +++ b/Pawn_Unreal/Content/Developers/maxim/Spiral_Stair_Brush_StaticMesh.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:270f830f69526b5dee62726473c812ec099f5e27bcfd32bb5513cbe2a658e0b9 +size 28660 diff --git a/Pawn_Unreal/Content/Maps/Dev/MAP_ControllerGym.umap b/Pawn_Unreal/Content/Maps/Dev/MAP_ControllerGym.umap index d5ed56c..f19db3d 100644 --- a/Pawn_Unreal/Content/Maps/Dev/MAP_ControllerGym.umap +++ b/Pawn_Unreal/Content/Maps/Dev/MAP_ControllerGym.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf8faa684a75e3f6952436d2002faadcdc22024d0bbbc2fda66745751b7e6957 -size 177294 +oid sha256:900d468098cbffb355ff43693c5cecb8b11724fbd7585ec61de92225039bfff1 +size 723799 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/0/91/BERD0JFDCI5RAYAPS4DY1P.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/0/91/BERD0JFDCI5RAYAPS4DY1P.uasset deleted file mode 100644 index 34bce67..0000000 --- a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/0/91/BERD0JFDCI5RAYAPS4DY1P.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea41203b31cef6377aa3c85f0d7c1811b4361f623ddc21ba949c9481ddf091ef -size 4468 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/0/GT/B3FVEW201B4H0JZT407R3G.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/0/GT/B3FVEW201B4H0JZT407R3G.uasset deleted file mode 100644 index 7d27d2d..0000000 --- a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/0/GT/B3FVEW201B4H0JZT407R3G.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e643bf23f948a5dcaa2c6be5000f9777f48eaf7c437dffb6631ee1ae36cfb0be -size 92642 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/0/XC/EES9G2P00B5EO5FPWE8N4U.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/0/XC/EES9G2P00B5EO5FPWE8N4U.uasset deleted file mode 100644 index 52cb337..0000000 --- a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/0/XC/EES9G2P00B5EO5FPWE8N4U.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:48a4afd6ed50ec93b48527f71913a9f1030ef343171b7e952bd5d2dc2d32d9e0 -size 4354 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/1/LE/RIS6ZA9R1KK7MS3EGVDKZV.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/1/LE/RIS6ZA9R1KK7MS3EGVDKZV.uasset deleted file mode 100644 index 7c84048..0000000 --- a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/1/LE/RIS6ZA9R1KK7MS3EGVDKZV.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d97f7312712cd44144da64d0eee3f18fd0a662d9c9174c460dbd3db58bfdc9c -size 4354 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/1/TO/L6IIV6YT2Z6G1UGUHWHWPR.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/1/TO/L6IIV6YT2Z6G1UGUHWHWPR.uasset deleted file mode 100644 index 520fc76..0000000 --- a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/1/TO/L6IIV6YT2Z6G1UGUHWHWPR.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:734f55506d9a81905e539f298ec87729c80bae8e41f1a29e35863d6ffe19cbf2 -size 4769 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/1/XM/TP8DFTZ6ODOTSDOLG6WEXZ.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/1/XM/TP8DFTZ6ODOTSDOLG6WEXZ.uasset deleted file mode 100644 index 5ee54d9..0000000 --- a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/1/XM/TP8DFTZ6ODOTSDOLG6WEXZ.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:89d226422dbea5d390f2a6802a4ae8f1a7208719358bf16b4f7b99aedf65096d -size 4468 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/3/7A/SCU1D1LU7J4NS7X4MENA7G.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/3/7A/SCU1D1LU7J4NS7X4MENA7G.uasset deleted file mode 100644 index 9fa1f49..0000000 --- a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/3/7A/SCU1D1LU7J4NS7X4MENA7G.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9fb2c2cd2f7f0a5b2e9de10f83e32d1aed54adb0436615e8e87466a00ddeb089 -size 4468 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/3/ZC/SPZ5ZSIG7BW3194FWIBEWC.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/3/ZC/SPZ5ZSIG7BW3194FWIBEWC.uasset deleted file mode 100644 index 0279701..0000000 --- a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/3/ZC/SPZ5ZSIG7BW3194FWIBEWC.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d446dc00a602ee2314f3139450c5139beb01ec210f410490804dcf17cabfc4cd -size 4352 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/3/ZX/V7QFRP3DMWRT8NZCJQYVRB.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/3/ZX/V7QFRP3DMWRT8NZCJQYVRB.uasset deleted file mode 100644 index 32af73e..0000000 --- a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/3/ZX/V7QFRP3DMWRT8NZCJQYVRB.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a302cfe5a1a23a60611f1def2d9827d0424778202e09fc91523b84a87779292 -size 4354 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/4/OH/3YZOO5HQPTMDBNJPPM4RV0.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/4/OH/3YZOO5HQPTMDBNJPPM4RV0.uasset deleted file mode 100644 index ef0c747..0000000 --- a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/4/OH/3YZOO5HQPTMDBNJPPM4RV0.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9461f90ef9909f371c63791fe25c706a04dc17d6263ffc0c8685eee65236a01b -size 4354 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/5/7S/W5AOPA3TGYQNLQDCWK6C75.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/5/7S/W5AOPA3TGYQNLQDCWK6C75.uasset new file mode 100644 index 0000000..0833def --- /dev/null +++ b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/5/7S/W5AOPA3TGYQNLQDCWK6C75.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b48770736cd4e3bbe223473939c821b4fa96cb988416b39256bf614e7d5769e +size 3157 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/5/V3/7TDZ89SOYDGI26YWXQ04D4.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/5/V3/7TDZ89SOYDGI26YWXQ04D4.uasset deleted file mode 100644 index 9dded55..0000000 --- a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/5/V3/7TDZ89SOYDGI26YWXQ04D4.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a261b9f01b1c2455a3917548963d356b3176859cf6b8523ff11388121efb7dab -size 4468 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/5/Y4/YBN91OHWXDZU3ZMLN026WF.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/5/Y4/YBN91OHWXDZU3ZMLN026WF.uasset new file mode 100644 index 0000000..89eabd9 --- /dev/null +++ b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/5/Y4/YBN91OHWXDZU3ZMLN026WF.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aab8d0c32e904ecdd2d3cc855d5f1ac1d992e37ecede3ce78a38fc14accf4509 +size 4466 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/9/IH/5T09JNLLSNG3U1KPWNFK3T.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/9/IH/5T09JNLLSNG3U1KPWNFK3T.uasset deleted file mode 100644 index 1e1c210..0000000 --- a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/9/IH/5T09JNLLSNG3U1KPWNFK3T.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d55fb4948de4b56060cab139887b7c3d48907d652ad659dec656cd49f483116 -size 4468 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/9/RQ/JYNZEWOG6SXNE3HGUCSZIE.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/9/RQ/JYNZEWOG6SXNE3HGUCSZIE.uasset deleted file mode 100644 index ac3060e..0000000 --- a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/9/RQ/JYNZEWOG6SXNE3HGUCSZIE.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5fc3b30f3fe873ddad5a3b878959df02740cc2002b9d9b90eb8ffcfa96750a0 -size 232038 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/A/1J/FGN60CK2BMBEJRXHZ72TKV.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/A/1J/FGN60CK2BMBEJRXHZ72TKV.uasset index 6b98691..a47bf12 100644 --- a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/A/1J/FGN60CK2BMBEJRXHZ72TKV.uasset +++ b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/A/1J/FGN60CK2BMBEJRXHZ72TKV.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74c3d9cbdd7b3dffcdf8c839ac50d82da1cefd9edd442ed17c41e3db3fa515b5 -size 6595 +oid sha256:9bba4336c33851df81a85c72b9ff24cf2086df13cdea3c111ef66926ddbd7a62 +size 6436 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/A/BZ/XZUBN8NU0UZ2W8T2MBWCYN.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/A/BZ/XZUBN8NU0UZ2W8T2MBWCYN.uasset deleted file mode 100644 index 85edb43..0000000 --- a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/A/BZ/XZUBN8NU0UZ2W8T2MBWCYN.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd4efef212868af4897f9c2fa1266ec7fd73ce93486f6ef66c93b1a945a0a96b -size 4354 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/A/MX/Q9G3HXBB9AGAYTMOU1AVGY.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/A/MX/Q9G3HXBB9AGAYTMOU1AVGY.uasset new file mode 100644 index 0000000..df77337 --- /dev/null +++ b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/A/MX/Q9G3HXBB9AGAYTMOU1AVGY.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06b1b860093e42e19a7cc959613ee281464f36e823d70b17dec651a65e75542b +size 3151 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/A/U2/4ECO0ADAHJEURYSR8OYVEX.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/A/U2/4ECO0ADAHJEURYSR8OYVEX.uasset deleted file mode 100644 index 8349326..0000000 --- a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/A/U2/4ECO0ADAHJEURYSR8OYVEX.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:445e880fb237edeeb4bd4f3851b1963e9dacc065fd6c66e030b8822f97b91f47 -size 4354 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/B/0Z/X5N2DTGOJMHQWHOBBKFNDX.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/B/0Z/X5N2DTGOJMHQWHOBBKFNDX.uasset deleted file mode 100644 index 9578655..0000000 --- a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/B/0Z/X5N2DTGOJMHQWHOBBKFNDX.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:314ef25ab8e4a9d7fbfad3f559cccee22f93f63bee9e4cd7e79ba0b6b60f5479 -size 4468 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/D/VD/LJAQY01SJR93NPW0FPCPIL.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/D/VD/LJAQY01SJR93NPW0FPCPIL.uasset deleted file mode 100644 index 2c3d72a..0000000 --- a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/D/VD/LJAQY01SJR93NPW0FPCPIL.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:28e095597c35d3ffbdb133e35e6deeafd6c9b343f8b65cd6c45ae0f2175f81c5 -size 4354 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/E/86/NKWQISSIQGRX07O716DOXO.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/E/86/NKWQISSIQGRX07O716DOXO.uasset deleted file mode 100644 index 244bbaf..0000000 --- a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/E/86/NKWQISSIQGRX07O716DOXO.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8a1ef219f83cb248783e23ab9ba98f87d4350994f21896701e5dbc753836b6bb -size 4468 diff --git a/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/E/9K/R7HQI0E9NM3G94LW522VPS.uasset b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/E/9K/R7HQI0E9NM3G94LW522VPS.uasset new file mode 100644 index 0000000..f421c96 --- /dev/null +++ b/Pawn_Unreal/Content/__ExternalActors__/Maps/Dev/MAP_ControllerGym/E/9K/R7HQI0E9NM3G94LW522VPS.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42c258a1fa460a66de6f5116d4f1e9505f03efd46e5508dbd3685118479b3632 +size 179755 diff --git a/Pawn_Unreal/Source/Pawn/Private/Characters/PwnCharacterMovementComponent.cpp b/Pawn_Unreal/Source/Pawn/Private/Characters/PwnCharacterMovementComponent.cpp index 103100c..58a6bf2 100644 --- a/Pawn_Unreal/Source/Pawn/Private/Characters/PwnCharacterMovementComponent.cpp +++ b/Pawn_Unreal/Source/Pawn/Private/Characters/PwnCharacterMovementComponent.cpp @@ -5,7 +5,7 @@ #include "Components/SplineComponent.h" #include "GameplayModes/PwnGameplayModeSubsystem.h" #include "GameplayModes/Combat/PwnCombatPlatformerPath.h" -#include "Utils/EngineUtils.h" +#include "Kismet/KismetSystemLibrary.h" constexpr float LineTraceDistance = 10000.0f; @@ -101,7 +101,8 @@ bool UPwnCharacterMovementComponent::IsCustomMovementMode(const ECustomMovementM bool UPwnCharacterMovementComponent::LineTraceToGround(FHitResult& OutHit, const FVector& StartLocation) const { const FVector EndLocation = StartLocation + FVector(0.0f, 0.0f, -LineTraceDistance); - return GetWorld()->LineTraceSingleByChannel(OutHit, StartLocation, EndLocation, ECC_Visibility, IGNORE_OWNER_PARAMS); + return UKismetSystemLibrary::LineTraceSingle(this, StartLocation, EndLocation, UEngineTypes::ConvertToTraceType(ECC_Visibility), false, TArray(), + EDrawDebugTrace::None, OutHit, true, FLinearColor::Red, FLinearColor::Green, 0.5f); } void UPwnCharacterMovementComponent::UpdateCurrentCombatPath(const bool UpdateLocation) { @@ -130,7 +131,9 @@ void UPwnCharacterMovementComponent::UpdateCurrentCombatPath(const bool UpdateLo } void UPwnCharacterMovementComponent::UpdateTangentAndAcceleration() { - Tangent2D = CombatPath->FlattenedSpline->GetTangentAtDistanceAlongSpline(DistanceAlongSpline, ESplineCoordinateSpace::World).GetSafeNormal2D(); + // Clamp distance because tangents are not defined at the ends of the spline + const float ClampedDistanceAlongSpline = FMath::Clamp(DistanceAlongSpline, 0.0001f, CombatPath->FlattenedSpline->GetSplineLength() - 0.0001f); + Tangent2D = CombatPath->FlattenedSpline->GetTangentAtDistanceAlongSpline(ClampedDistanceAlongSpline, ESplineCoordinateSpace::World).GetSafeNormal2D(); // Recalculate acceleration so the input is relative to the spline Acceleration = Tangent2D * Acceleration.Size2D() * FMath::Sign(Acceleration.X) * DotDirection; } diff --git a/Pawn_Unreal/Source/Pawn/Private/GameplayModes/PwnGameplayModeSubsystem.cpp b/Pawn_Unreal/Source/Pawn/Private/GameplayModes/PwnGameplayModeSubsystem.cpp index 22bbe14..9a4a120 100644 --- a/Pawn_Unreal/Source/Pawn/Private/GameplayModes/PwnGameplayModeSubsystem.cpp +++ b/Pawn_Unreal/Source/Pawn/Private/GameplayModes/PwnGameplayModeSubsystem.cpp @@ -51,7 +51,6 @@ void UPwnGameplayModeSubsystem::UnregisterCombatPath(APwnCombatPlatformerPath* C bool UPwnGameplayModeSubsystem::FindClosestCombatPathLocation(const FVector& Location, APwnCombatPlatformerPath*& OutCombatPath) const { float ShortestDistance = FLT_MAX; APwnCombatPlatformerPath* ClosestCombatPath = nullptr; - bool Found = false; for (APwnCombatPlatformerPath* CombatPath : CombatPaths) { const USplineComponent* CurrentSpline = CombatPath->Spline; @@ -62,12 +61,12 @@ bool UPwnGameplayModeSubsystem::FindClosestCombatPathLocation(const FVector& Loc if (CurrentDistance < ShortestDistance) { ShortestDistance = CurrentDistance; ClosestCombatPath = CombatPath; - Found = true; } } - if (Found) { + if (ClosestCombatPath != nullptr) { OutCombatPath = ClosestCombatPath; + return true; } - return Found; + return false; }