From b7ec565a0146234b19c6ba7eae223335262f14be Mon Sep 17 00:00:00 2001 From: Jander Metsma Date: Fri, 12 Dec 2025 13:21:56 +0200 Subject: [PATCH] Conjuction --- Content/Input/Actions/IA_Parkour.uasset | 3 +++ Content/Input/IMC_Default.uasset | 4 ++-- Content/LevelForTesting.umap | 4 ++-- Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset | 4 ++-- .../Blueprints/Spline/FollowSplineComponent.uasset | 4 ++-- Content/_GENERATED/jander/Box_784E8B81.uasset | 3 +++ Content/_GENERATED/jander/Box_9FA74337.uasset | 3 +++ Content/_GENERATED/jander/CubeGridToolOutput_41F043D6.uasset | 3 +++ Content/_GENERATED/jander/CubeGridToolOutput_4E5A5F11.uasset | 3 +++ Content/_GENERATED/jander/CubeGridToolOutput_6CDBF828.uasset | 3 +++ Content/_GENERATED/jander/CubeGridToolOutput_D93CDD5A.uasset | 3 +++ .../Lvl_ThirdPerson/0/6I/WQM9JJTE33MQGKSCO9QXEN.uasset | 3 +++ .../Lvl_ThirdPerson/0/9C/X81BOL0A90P9IEOZ65XYWH.uasset | 4 ++-- .../Lvl_ThirdPerson/1/78/DT40IMS6SND01DWSUG6016.uasset | 2 +- .../Lvl_ThirdPerson/2/7A/14RD8I8CJSXD1WWN6YA4VC.uasset | 4 ++-- .../Lvl_ThirdPerson/2/7T/7T9H79CMKERSINQRI0BU57.uasset | 4 ++-- .../Lvl_ThirdPerson/4/4E/2N0M7591W93POVODPNETAP.uasset | 4 ++-- .../Lvl_ThirdPerson/4/NP/RXUJJZN6MP3BWMD5P44D08.uasset | 3 +++ .../Lvl_ThirdPerson/8/9Z/PFI2EX438N8F5XAICUMT6Z.uasset | 3 +++ .../Lvl_ThirdPerson/9/C1/H6ZK9VOM0J3QVHYDRG3OQE.uasset | 2 +- .../Lvl_ThirdPerson/D/8U/M6D3QTNAYRLEAKFNEQHIAO.uasset | 4 ++-- .../Lvl_ThirdPerson/E/7N/DBJVACVWADXVYQN1LW8BMP.uasset | 3 --- .../Lvl_ThirdPerson/E/K8/VP9ZAJAVC6N0QO49K1TG4P.uasset | 4 ++-- .../Lvl_ThirdPerson/4/E0/W5VODUT1VBE22WE5TC6B42.uasset | 3 +++ .../Lvl_ThirdPerson/C/79/DMXZ8ERWFUVVB61ZZQ915A.uasset | 3 +++ test.txt | 0 26 files changed, 58 insertions(+), 25 deletions(-) create mode 100644 Content/Input/Actions/IA_Parkour.uasset create mode 100644 Content/_GENERATED/jander/Box_784E8B81.uasset create mode 100644 Content/_GENERATED/jander/Box_9FA74337.uasset create mode 100644 Content/_GENERATED/jander/CubeGridToolOutput_41F043D6.uasset create mode 100644 Content/_GENERATED/jander/CubeGridToolOutput_4E5A5F11.uasset create mode 100644 Content/_GENERATED/jander/CubeGridToolOutput_6CDBF828.uasset create mode 100644 Content/_GENERATED/jander/CubeGridToolOutput_D93CDD5A.uasset create mode 100644 Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/0/6I/WQM9JJTE33MQGKSCO9QXEN.uasset create mode 100644 Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/4/NP/RXUJJZN6MP3BWMD5P44D08.uasset create mode 100644 Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/8/9Z/PFI2EX438N8F5XAICUMT6Z.uasset delete mode 100644 Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/E/7N/DBJVACVWADXVYQN1LW8BMP.uasset create mode 100644 Content/__ExternalObjects__/ThirdPerson/Lvl_ThirdPerson/4/E0/W5VODUT1VBE22WE5TC6B42.uasset create mode 100644 Content/__ExternalObjects__/ThirdPerson/Lvl_ThirdPerson/C/79/DMXZ8ERWFUVVB61ZZQ915A.uasset delete mode 100644 test.txt diff --git a/Content/Input/Actions/IA_Parkour.uasset b/Content/Input/Actions/IA_Parkour.uasset new file mode 100644 index 0000000..fb38a7f --- /dev/null +++ b/Content/Input/Actions/IA_Parkour.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70a80f8ce074cd21af1b88447b4adae67c0e80c52d9cdf2e2d186fdd9f3f84ff +size 1157 diff --git a/Content/Input/IMC_Default.uasset b/Content/Input/IMC_Default.uasset index ea082a3..b039eac 100644 --- a/Content/Input/IMC_Default.uasset +++ b/Content/Input/IMC_Default.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7136b84dd07ee0e513916c8c4f4632b0a7745816c4afcfa4d16effe14c605741 -size 3264 +oid sha256:68e66c49c9a680264666e59e01e7d5f4020d42c56988ac0182477b7c4a22f322 +size 4170 diff --git a/Content/LevelForTesting.umap b/Content/LevelForTesting.umap index 52e3376..f48619d 100644 --- a/Content/LevelForTesting.umap +++ b/Content/LevelForTesting.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7adb068233a6a65b33d041f13c49f3a1883b56df0dcca004add79ada52536ec -size 53085 +oid sha256:54d911a17e345c2c0b1837baf665da3ec8bc32f1766db1c1bc6097e712734daa +size 64413 diff --git a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset index dae9c48..10bc133 100644 --- a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset +++ b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:812146a0fc0784b66d044bec86cbf2ee134c56465956e03c874fd97ada7e8dc3 -size 157942 +oid sha256:66fee6b300931a3d0a23e34017103a284218ed0fa945d0079943d51df60c836b +size 438638 diff --git a/Content/ThirdPerson/Blueprints/Spline/FollowSplineComponent.uasset b/Content/ThirdPerson/Blueprints/Spline/FollowSplineComponent.uasset index e2953fb..8b7a9cd 100644 --- a/Content/ThirdPerson/Blueprints/Spline/FollowSplineComponent.uasset +++ b/Content/ThirdPerson/Blueprints/Spline/FollowSplineComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39d016b4738229453de01321a3c0df8b03e153159c5d726964ca7c03b7130948 -size 204198 +oid sha256:1b6295c04f46a6b692f837df76f07b47e0d5cd6cadbfa634786fd5b6b8f4ff40 +size 202441 diff --git a/Content/_GENERATED/jander/Box_784E8B81.uasset b/Content/_GENERATED/jander/Box_784E8B81.uasset new file mode 100644 index 0000000..06195ea --- /dev/null +++ b/Content/_GENERATED/jander/Box_784E8B81.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:beff8619d36ee044ba5a147fcd27bcc9700246ab49b104dd693a9c6125755113 +size 15281 diff --git a/Content/_GENERATED/jander/Box_9FA74337.uasset b/Content/_GENERATED/jander/Box_9FA74337.uasset new file mode 100644 index 0000000..58b58b2 --- /dev/null +++ b/Content/_GENERATED/jander/Box_9FA74337.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9797cdc3e75df175531669a79b9eabdcd8983978218f60559801b18c61288a4c +size 15281 diff --git a/Content/_GENERATED/jander/CubeGridToolOutput_41F043D6.uasset b/Content/_GENERATED/jander/CubeGridToolOutput_41F043D6.uasset new file mode 100644 index 0000000..836e8eb --- /dev/null +++ b/Content/_GENERATED/jander/CubeGridToolOutput_41F043D6.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:551022e1c8dd631a40455af4f1b4d9bcc4ab7752102d4bdbe29aa6c0a3170805 +size 15343 diff --git a/Content/_GENERATED/jander/CubeGridToolOutput_4E5A5F11.uasset b/Content/_GENERATED/jander/CubeGridToolOutput_4E5A5F11.uasset new file mode 100644 index 0000000..8f3b41d --- /dev/null +++ b/Content/_GENERATED/jander/CubeGridToolOutput_4E5A5F11.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5318cb3eb8036812783ec0c95e76a31b4ce2ee100890dff83464ac73e8810eb +size 15343 diff --git a/Content/_GENERATED/jander/CubeGridToolOutput_6CDBF828.uasset b/Content/_GENERATED/jander/CubeGridToolOutput_6CDBF828.uasset new file mode 100644 index 0000000..01344de --- /dev/null +++ b/Content/_GENERATED/jander/CubeGridToolOutput_6CDBF828.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed0af6bd44990b6a03d1ad51675209832b711d0a5bcbaad3f9b9d4b290ad81b5 +size 15354 diff --git a/Content/_GENERATED/jander/CubeGridToolOutput_D93CDD5A.uasset b/Content/_GENERATED/jander/CubeGridToolOutput_D93CDD5A.uasset new file mode 100644 index 0000000..8b6f195 --- /dev/null +++ b/Content/_GENERATED/jander/CubeGridToolOutput_D93CDD5A.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f224838b3c62e15d025d141e8288cb55e9fe2f351749e29754884e856ea26ba0 +size 15809 diff --git a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/0/6I/WQM9JJTE33MQGKSCO9QXEN.uasset b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/0/6I/WQM9JJTE33MQGKSCO9QXEN.uasset new file mode 100644 index 0000000..7080b19 --- /dev/null +++ b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/0/6I/WQM9JJTE33MQGKSCO9QXEN.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43a3b44962b152b22ff5c54302bdfc7bfefc263831b4382dbeca03ec8648bff7 +size 3759 diff --git a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/0/9C/X81BOL0A90P9IEOZ65XYWH.uasset b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/0/9C/X81BOL0A90P9IEOZ65XYWH.uasset index 6b75825..b77289c 100644 --- a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/0/9C/X81BOL0A90P9IEOZ65XYWH.uasset +++ b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/0/9C/X81BOL0A90P9IEOZ65XYWH.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dcbdd8cf54828eebb957ea262614c1c1c5b0b6fabbb36fd7106cc79d48626a31 -size 4434 +oid sha256:ee1e9c13df209dfaa66cb5cd985f4a2dbf54e41769f83fb8d965b4db6296039c +size 4342 diff --git a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/1/78/DT40IMS6SND01DWSUG6016.uasset b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/1/78/DT40IMS6SND01DWSUG6016.uasset index 5618f40..ee992fc 100644 --- a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/1/78/DT40IMS6SND01DWSUG6016.uasset +++ b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/1/78/DT40IMS6SND01DWSUG6016.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83e115ccef75cd399b6190897df09d43ee25b06f07d9119ac6a22713e6af22e3 +oid sha256:7ce4d348bb7629990cb2159db43e13c448aae15984e0bc582c7fe97b0f323192 size 20441 diff --git a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/2/7A/14RD8I8CJSXD1WWN6YA4VC.uasset b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/2/7A/14RD8I8CJSXD1WWN6YA4VC.uasset index 76129ba..b4f98d6 100644 --- a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/2/7A/14RD8I8CJSXD1WWN6YA4VC.uasset +++ b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/2/7A/14RD8I8CJSXD1WWN6YA4VC.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47c814d3d44debacd2b3efdcdee3c76a74272fe845a99e0eb93e93b7ffde4cee -size 4276 +oid sha256:d751545d566dc34dc87258600518bcf19d0b64534517a05e9c81953682420ffa +size 4376 diff --git a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/2/7T/7T9H79CMKERSINQRI0BU57.uasset b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/2/7T/7T9H79CMKERSINQRI0BU57.uasset index d7050e7..e20f37e 100644 --- a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/2/7T/7T9H79CMKERSINQRI0BU57.uasset +++ b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/2/7T/7T9H79CMKERSINQRI0BU57.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57be2634ed75401b09b3b726da4ebf1555e36582de400bba18ab5f8f9d88d334 -size 4434 +oid sha256:aaa541c4448266723d0886ea18ada84761581ceca1b281481fb0a1bcbc982fd5 +size 4342 diff --git a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/4/4E/2N0M7591W93POVODPNETAP.uasset b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/4/4E/2N0M7591W93POVODPNETAP.uasset index d1953f6..47f21c2 100644 --- a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/4/4E/2N0M7591W93POVODPNETAP.uasset +++ b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/4/4E/2N0M7591W93POVODPNETAP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d8e0e31b598f1fbbcf0f56a784d70d2bb8267b341b8b08285a4f42023ef2802 -size 4183 +oid sha256:ef4ea7df3f8f7ad5fcdab74404b212d8ae4c5f56a7c6d7556bda9cbb2c4d640b +size 4095 diff --git a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/4/NP/RXUJJZN6MP3BWMD5P44D08.uasset b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/4/NP/RXUJJZN6MP3BWMD5P44D08.uasset new file mode 100644 index 0000000..5d877c0 --- /dev/null +++ b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/4/NP/RXUJJZN6MP3BWMD5P44D08.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:284f852051700319ff6af129686bc32f6ede724a119f8b3be308e49ba5038cdf +size 4694 diff --git a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/8/9Z/PFI2EX438N8F5XAICUMT6Z.uasset b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/8/9Z/PFI2EX438N8F5XAICUMT6Z.uasset new file mode 100644 index 0000000..7f5775b --- /dev/null +++ b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/8/9Z/PFI2EX438N8F5XAICUMT6Z.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80336db04ba063da0e08ee4da0cefa7d307684957f1426f0953254b7dc8ea0e9 +size 3757 diff --git a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/9/C1/H6ZK9VOM0J3QVHYDRG3OQE.uasset b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/9/C1/H6ZK9VOM0J3QVHYDRG3OQE.uasset index ed22f16..874ca73 100644 --- a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/9/C1/H6ZK9VOM0J3QVHYDRG3OQE.uasset +++ b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/9/C1/H6ZK9VOM0J3QVHYDRG3OQE.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9581027f48d047bc304f97eb206b542d334bde4cb425efa27566bb6d3cd19855 +oid sha256:9f4b0c874b6a76c4a9539003a26824c2cf5cd516492ab847c3f2b2169d6af7bb size 7851 diff --git a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/D/8U/M6D3QTNAYRLEAKFNEQHIAO.uasset b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/D/8U/M6D3QTNAYRLEAKFNEQHIAO.uasset index 15797b5..d7d045e 100644 --- a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/D/8U/M6D3QTNAYRLEAKFNEQHIAO.uasset +++ b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/D/8U/M6D3QTNAYRLEAKFNEQHIAO.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3ba55f82cec7922752abcbb7aa7392464b7fe5ecedb23db3ac2eb844c740899 -size 4434 +oid sha256:5ec161cc0f605af02b30b85c471299b6cd97349401e1443e66766c20e5656023 +size 4342 diff --git a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/E/7N/DBJVACVWADXVYQN1LW8BMP.uasset b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/E/7N/DBJVACVWADXVYQN1LW8BMP.uasset deleted file mode 100644 index 9745966..0000000 --- a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/E/7N/DBJVACVWADXVYQN1LW8BMP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:910ff79a4bdf461c2736628a0beaee5b486b992d9ec198316e56c41716faaa8d -size 4694 diff --git a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/E/K8/VP9ZAJAVC6N0QO49K1TG4P.uasset b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/E/K8/VP9ZAJAVC6N0QO49K1TG4P.uasset index f7b0316..11be653 100644 --- a/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/E/K8/VP9ZAJAVC6N0QO49K1TG4P.uasset +++ b/Content/__ExternalActors__/ThirdPerson/Lvl_ThirdPerson/E/K8/VP9ZAJAVC6N0QO49K1TG4P.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e735758bdf06cd0740d3a4fea54a28f721f34d41bd51b0d76235fc5190263bfb -size 4272 +oid sha256:6d8dd5185529ad3fd7d296b7ee344827dd9db667ae784f57521aecb9e94b3fd5 +size 4368 diff --git a/Content/__ExternalObjects__/ThirdPerson/Lvl_ThirdPerson/4/E0/W5VODUT1VBE22WE5TC6B42.uasset b/Content/__ExternalObjects__/ThirdPerson/Lvl_ThirdPerson/4/E0/W5VODUT1VBE22WE5TC6B42.uasset new file mode 100644 index 0000000..fd64436 --- /dev/null +++ b/Content/__ExternalObjects__/ThirdPerson/Lvl_ThirdPerson/4/E0/W5VODUT1VBE22WE5TC6B42.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:091de49cb804acf444315bcf5e3a27095cf54c4acf94eb4ce6bd588507bda9fa +size 1841 diff --git a/Content/__ExternalObjects__/ThirdPerson/Lvl_ThirdPerson/C/79/DMXZ8ERWFUVVB61ZZQ915A.uasset b/Content/__ExternalObjects__/ThirdPerson/Lvl_ThirdPerson/C/79/DMXZ8ERWFUVVB61ZZQ915A.uasset new file mode 100644 index 0000000..98611ad --- /dev/null +++ b/Content/__ExternalObjects__/ThirdPerson/Lvl_ThirdPerson/C/79/DMXZ8ERWFUVVB61ZZQ915A.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5702a8e255a4a52b9cdaa9678eb08b5222d4d27006cd4f0331f3f4eba0e01577 +size 1837 diff --git a/test.txt b/test.txt deleted file mode 100644 index e69de29..0000000