From 8487ec61343cccbbe4536d0c74891f1a3b4221ab Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Tue, 19 Nov 2024 16:29:18 +0000 Subject: [PATCH 01/28] Created destructible buildings and added collisions to mech --- .../BlockoutAssets/IonaBaseBlockout/BlockOutMaterial.uasset | 4 ++-- Content/Assets/ChaosAssets/LargeBuilding.uasset | 3 +++ Content/Assets/ChaosAssets/MediumBuilding.uasset | 3 +++ Content/Levels/PrototypeLevel.umap | 4 ++-- Content/Monolith/BPI_AOverheat.uasset | 4 ++-- Content/Monolith/BPI_Bullet.uasset | 4 ++-- Content/Monolith/BPI_Monolith.uasset | 4 ++-- 7 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 Content/Assets/ChaosAssets/LargeBuilding.uasset create mode 100644 Content/Assets/ChaosAssets/MediumBuilding.uasset diff --git a/Content/Assets/BlockoutAssets/IonaBaseBlockout/BlockOutMaterial.uasset b/Content/Assets/BlockoutAssets/IonaBaseBlockout/BlockOutMaterial.uasset index e19d74d..d360144 100644 --- a/Content/Assets/BlockoutAssets/IonaBaseBlockout/BlockOutMaterial.uasset +++ b/Content/Assets/BlockoutAssets/IonaBaseBlockout/BlockOutMaterial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ff54ec0b6a53b83973249283da0fbc62b5cb490e5bcc96b6c00d54faa9c2a1e -size 12583 +oid sha256:feef49ec33540accaf71431f2ad1ca6afa42c88bc9f25a1ce0356abb6164195e +size 12611 diff --git a/Content/Assets/ChaosAssets/LargeBuilding.uasset b/Content/Assets/ChaosAssets/LargeBuilding.uasset new file mode 100644 index 0000000..2b4d181 --- /dev/null +++ b/Content/Assets/ChaosAssets/LargeBuilding.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85e3032cbbb9af68f49fd5cae1dae70d34d04e872fb792275531701980e06b45 +size 7778456 diff --git a/Content/Assets/ChaosAssets/MediumBuilding.uasset b/Content/Assets/ChaosAssets/MediumBuilding.uasset new file mode 100644 index 0000000..97db5d7 --- /dev/null +++ b/Content/Assets/ChaosAssets/MediumBuilding.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c8da620ae81f87967cbaadba609f638fe563b327052419f6b7af6bab699ea0b +size 7861667 diff --git a/Content/Levels/PrototypeLevel.umap b/Content/Levels/PrototypeLevel.umap index 005e5c7..6c7155d 100644 --- a/Content/Levels/PrototypeLevel.umap +++ b/Content/Levels/PrototypeLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3a1c76a8c0bb9968a1935c99bd522e3d931b183e24feeca8f23fc786801a483 -size 9058233 +oid sha256:9a6c747f93d544d2f0c927f6852e62c5d38e3f7c0a9c1fb105d6fc58344c8a56 +size 8453588 diff --git a/Content/Monolith/BPI_AOverheat.uasset b/Content/Monolith/BPI_AOverheat.uasset index 59400e5..c182b17 100644 --- a/Content/Monolith/BPI_AOverheat.uasset +++ b/Content/Monolith/BPI_AOverheat.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ce069207eb27f77e2ff24383695ae65cd719bcabbebd497fc3d4ae7f7a5eafb -size 30065 +oid sha256:f94f6e3436c40399c2d142f20c4404ec4279665bb1f9b6c28be718e504981993 +size 80536 diff --git a/Content/Monolith/BPI_Bullet.uasset b/Content/Monolith/BPI_Bullet.uasset index 54fca47..07e9d26 100644 --- a/Content/Monolith/BPI_Bullet.uasset +++ b/Content/Monolith/BPI_Bullet.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:642be458f27be81d4d616c4e5d0ab77d6cf91d407a1dca42b63643da92e4ef56 -size 60922 +oid sha256:905f3a8d711eb703a1dbecde6ad0839060766c7f91f2df9a4e919e6851e7ebce +size 78772 diff --git a/Content/Monolith/BPI_Monolith.uasset b/Content/Monolith/BPI_Monolith.uasset index 7ab6196..98f0f74 100644 --- a/Content/Monolith/BPI_Monolith.uasset +++ b/Content/Monolith/BPI_Monolith.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f1d91017959c5992f846b353521c2f7f21e7a56258d5c4516856c4c8a488c65 -size 284460 +oid sha256:11549b9f62934fd88087942786e16c240f145763040e2ca47aebf6cd98fde40a +size 292529 From 5bbb4a800349924383555fc3e62aef1add9d46a1 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Tue, 19 Nov 2024 16:30:09 +0000 Subject: [PATCH 02/28] forgot to push this --- Content/Monolith/BPI_Monolith.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Monolith/BPI_Monolith.uasset b/Content/Monolith/BPI_Monolith.uasset index 98f0f74..eae3a63 100644 --- a/Content/Monolith/BPI_Monolith.uasset +++ b/Content/Monolith/BPI_Monolith.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11549b9f62934fd88087942786e16c240f145763040e2ca47aebf6cd98fde40a -size 292529 +oid sha256:486a9fa4033e8b4f6ab44589c605f335dbac0701337e8bad416de1ec09b3da98 +size 291394 From 79934e983a0edc24dfda6bd6b732ec548333bb83 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Tue, 19 Nov 2024 17:24:31 +0000 Subject: [PATCH 03/28] Made the camera not shit --- Content/Monolith/BPI_Monolith.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Monolith/BPI_Monolith.uasset b/Content/Monolith/BPI_Monolith.uasset index eae3a63..86a825e 100644 --- a/Content/Monolith/BPI_Monolith.uasset +++ b/Content/Monolith/BPI_Monolith.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:486a9fa4033e8b4f6ab44589c605f335dbac0701337e8bad416de1ec09b3da98 -size 291394 +oid sha256:923acfd434b764d64fde2732d8bfbb99252031e6b1bd8fe347c835df1921bf40 +size 291901 From dd52759b0d51ad6f749f627f92da1a17355c6eda Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Wed, 20 Nov 2024 13:22:04 +0000 Subject: [PATCH 04/28] Added New input for monolith I updated the basic movement settings to the enhanced input settings to allow for a cool rotation thing in the game --- Content/Levels/PrototypeLevel.umap | 2 +- Content/Monolith/BPI_Monolith.uasset | 4 ++-- Content/Monolith/Input/IA_MJump.uasset | 3 +++ Content/Monolith/Input/IA_MLook.uasset | 3 +++ Content/Monolith/Input/IA_MMove.uasset | 3 +++ Content/Monolith/Input/IMC_Monolith.uasset | 3 +++ 6 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 Content/Monolith/Input/IA_MJump.uasset create mode 100644 Content/Monolith/Input/IA_MLook.uasset create mode 100644 Content/Monolith/Input/IA_MMove.uasset create mode 100644 Content/Monolith/Input/IMC_Monolith.uasset diff --git a/Content/Levels/PrototypeLevel.umap b/Content/Levels/PrototypeLevel.umap index 6c7155d..35f59ee 100644 --- a/Content/Levels/PrototypeLevel.umap +++ b/Content/Levels/PrototypeLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a6c747f93d544d2f0c927f6852e62c5d38e3f7c0a9c1fb105d6fc58344c8a56 +oid sha256:70ff76d2277748282ba0019535629dbebf6ae2cd93ac6b80fa6f0ae0e9d85b94 size 8453588 diff --git a/Content/Monolith/BPI_Monolith.uasset b/Content/Monolith/BPI_Monolith.uasset index 86a825e..945bbe9 100644 --- a/Content/Monolith/BPI_Monolith.uasset +++ b/Content/Monolith/BPI_Monolith.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:923acfd434b764d64fde2732d8bfbb99252031e6b1bd8fe347c835df1921bf40 -size 291901 +oid sha256:c69f2ab2428196228b40c3adae7b2d9d5200bfeb3ff5dd6f424b7b76ca6c071e +size 348287 diff --git a/Content/Monolith/Input/IA_MJump.uasset b/Content/Monolith/Input/IA_MJump.uasset new file mode 100644 index 0000000..96bd697 --- /dev/null +++ b/Content/Monolith/Input/IA_MJump.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:235780e743540db841e73189f073d86d3150432ecb7906a723790e18afe66a6d +size 1371 diff --git a/Content/Monolith/Input/IA_MLook.uasset b/Content/Monolith/Input/IA_MLook.uasset new file mode 100644 index 0000000..730518f --- /dev/null +++ b/Content/Monolith/Input/IA_MLook.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9ef9f3ba422c50ead5d04f326a7fa3f9daa82f602d810d245dc4dab91b7b3b9 +size 1567 diff --git a/Content/Monolith/Input/IA_MMove.uasset b/Content/Monolith/Input/IA_MMove.uasset new file mode 100644 index 0000000..4301d71 --- /dev/null +++ b/Content/Monolith/Input/IA_MMove.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a14e0b0259cf7257c7df0bfa4f001e19b762ed4b905eb6ac081f3eb48384f01d +size 1567 diff --git a/Content/Monolith/Input/IMC_Monolith.uasset b/Content/Monolith/Input/IMC_Monolith.uasset new file mode 100644 index 0000000..d3547df --- /dev/null +++ b/Content/Monolith/Input/IMC_Monolith.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e569810046fce5b50c9cc6ed9f2bbc8328d3e048c498be9133f4745bc1b2a80 +size 6766 From e68f56be1c62b31b1d912f006e55fb5124ad86bf Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Thu, 21 Nov 2024 11:44:20 +0000 Subject: [PATCH 05/28] Added performance fixes Added shadow changes, and a disable field in order to make the destruction more optimised --- Content/Assets/ChaosAssets/DisableField.uasset | 3 +++ Content/Assets/ChaosAssets/LargeBuilding.uasset | 4 ++-- Content/Assets/ChaosAssets/MediumBuilding.uasset | 4 ++-- Content/Levels/PrototypeLevel.umap | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 Content/Assets/ChaosAssets/DisableField.uasset diff --git a/Content/Assets/ChaosAssets/DisableField.uasset b/Content/Assets/ChaosAssets/DisableField.uasset new file mode 100644 index 0000000..bf082ee --- /dev/null +++ b/Content/Assets/ChaosAssets/DisableField.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01d33aa9d754f814fbc3e9673d635df983dd65f56338c3e26e46c94bef5c3a3a +size 29769 diff --git a/Content/Assets/ChaosAssets/LargeBuilding.uasset b/Content/Assets/ChaosAssets/LargeBuilding.uasset index 2b4d181..5f9e227 100644 --- a/Content/Assets/ChaosAssets/LargeBuilding.uasset +++ b/Content/Assets/ChaosAssets/LargeBuilding.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85e3032cbbb9af68f49fd5cae1dae70d34d04e872fb792275531701980e06b45 -size 7778456 +oid sha256:b7fe473bb3461550a4aa4840f8efe6fe766b32b4f726388c2636fc018267bf72 +size 7778550 diff --git a/Content/Assets/ChaosAssets/MediumBuilding.uasset b/Content/Assets/ChaosAssets/MediumBuilding.uasset index 97db5d7..d296841 100644 --- a/Content/Assets/ChaosAssets/MediumBuilding.uasset +++ b/Content/Assets/ChaosAssets/MediumBuilding.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c8da620ae81f87967cbaadba609f638fe563b327052419f6b7af6bab699ea0b -size 7861667 +oid sha256:3602c4a992b6479d566a94b720379a673c576297bc658c856608d0197e439e63 +size 7861566 diff --git a/Content/Levels/PrototypeLevel.umap b/Content/Levels/PrototypeLevel.umap index 35f59ee..afdbafa 100644 --- a/Content/Levels/PrototypeLevel.umap +++ b/Content/Levels/PrototypeLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70ff76d2277748282ba0019535629dbebf6ae2cd93ac6b80fa6f0ae0e9d85b94 -size 8453588 +oid sha256:a4b0bbccc93c7c9477ce0ee763cfbc7f8abcf21aa2162efddac2634690d089b2 +size 8485636 From 95292268341a5d9f13221c20b7dfd749105c39fa Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Thu, 28 Nov 2024 17:10:41 +0000 Subject: [PATCH 06/28] Added in more chaos destruction assets Added in a combined mesh large medium and small buildings with less fractures in order to optimize the framerate --- .../CombinedBuildings/LargeBuildingCombined.uasset | 3 +++ .../HouseBlockout/CombinedBuildings/Material.uasset | 3 +++ .../CombinedBuildings/MediumBuildingCombined.uasset | 3 +++ .../CombinedBuildings/SmallBuildingCombined.uasset | 3 +++ Content/Assets/ChaosAssets/LargeBuildingCombined.uasset | 3 +++ 5 files changed, 15 insertions(+) create mode 100644 Content/Assets/BlockoutAssets/HouseBlockout/CombinedBuildings/LargeBuildingCombined.uasset create mode 100644 Content/Assets/BlockoutAssets/HouseBlockout/CombinedBuildings/Material.uasset create mode 100644 Content/Assets/BlockoutAssets/HouseBlockout/CombinedBuildings/MediumBuildingCombined.uasset create mode 100644 Content/Assets/BlockoutAssets/HouseBlockout/CombinedBuildings/SmallBuildingCombined.uasset create mode 100644 Content/Assets/ChaosAssets/LargeBuildingCombined.uasset diff --git a/Content/Assets/BlockoutAssets/HouseBlockout/CombinedBuildings/LargeBuildingCombined.uasset b/Content/Assets/BlockoutAssets/HouseBlockout/CombinedBuildings/LargeBuildingCombined.uasset new file mode 100644 index 0000000..2c5a53a --- /dev/null +++ b/Content/Assets/BlockoutAssets/HouseBlockout/CombinedBuildings/LargeBuildingCombined.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e738336dd3aecef2b592b2cd362ceafed79db395d53f3ab9edadf33a1f1dcffe +size 120386 diff --git a/Content/Assets/BlockoutAssets/HouseBlockout/CombinedBuildings/Material.uasset b/Content/Assets/BlockoutAssets/HouseBlockout/CombinedBuildings/Material.uasset new file mode 100644 index 0000000..c154cad --- /dev/null +++ b/Content/Assets/BlockoutAssets/HouseBlockout/CombinedBuildings/Material.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76ba4cd518d3c369e9f28f3bae77a7a47d219262019cc043a6eb3298a963100c +size 9108 diff --git a/Content/Assets/BlockoutAssets/HouseBlockout/CombinedBuildings/MediumBuildingCombined.uasset b/Content/Assets/BlockoutAssets/HouseBlockout/CombinedBuildings/MediumBuildingCombined.uasset new file mode 100644 index 0000000..b2d7703 --- /dev/null +++ b/Content/Assets/BlockoutAssets/HouseBlockout/CombinedBuildings/MediumBuildingCombined.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aff024f65312cf930cd7031b320f29ec367123c40c125b799ccbcd19bc8f0b51 +size 104556 diff --git a/Content/Assets/BlockoutAssets/HouseBlockout/CombinedBuildings/SmallBuildingCombined.uasset b/Content/Assets/BlockoutAssets/HouseBlockout/CombinedBuildings/SmallBuildingCombined.uasset new file mode 100644 index 0000000..6b5eec4 --- /dev/null +++ b/Content/Assets/BlockoutAssets/HouseBlockout/CombinedBuildings/SmallBuildingCombined.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7124ef41a1d98c02dd0082a0be849acab6e85e8b96d8b65530e90ae6eb76f5f +size 87089 diff --git a/Content/Assets/ChaosAssets/LargeBuildingCombined.uasset b/Content/Assets/ChaosAssets/LargeBuildingCombined.uasset new file mode 100644 index 0000000..672d99a --- /dev/null +++ b/Content/Assets/ChaosAssets/LargeBuildingCombined.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f9da88d42ad759ed282543996694dd1305e24bcdf429cb90d2113e14de4e120 +size 36331718 From b1d6bdee0eab6df56412a078a0fa2037b3205bfa Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Thu, 28 Nov 2024 17:36:05 +0000 Subject: [PATCH 07/28] Added in 3 quests into the quest data table Added in the 2 main quests and one side quest i designed for the prototype into the table and are ready to be added into the game itself --- Content/Levels/PrototypeLevel.umap | 4 ++-- Content/QuestSystem/QuestData.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Levels/PrototypeLevel.umap b/Content/Levels/PrototypeLevel.umap index afdbafa..68a0c58 100644 --- a/Content/Levels/PrototypeLevel.umap +++ b/Content/Levels/PrototypeLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4b0bbccc93c7c9477ce0ee763cfbc7f8abcf21aa2162efddac2634690d089b2 -size 8485636 +oid sha256:eb8c4739a1cde72a4210dbf337e6a0351a944a61d51f45995ee59ed1ccd5dc7c +size 8484800 diff --git a/Content/QuestSystem/QuestData.uasset b/Content/QuestSystem/QuestData.uasset index 661dd4e..426512c 100644 --- a/Content/QuestSystem/QuestData.uasset +++ b/Content/QuestSystem/QuestData.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d856e4ab5d9267903f42a14fde1e6394e93ce81fa300c84d868a33f69dd492a2 -size 13930 +oid sha256:68fe6811627192f014a151643aca8ebf502db26a99d6d5073a71c532dcdf19e9 +size 32353 From d284012315e4734fa421c7efe710c035a701d5bc Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Fri, 29 Nov 2024 15:37:26 +0000 Subject: [PATCH 08/28] Fixed the monolith not jumping I fixed the jumping by replacing the IA node with the correct one so it works --- Content/Monolith/BPI_Monolith.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Monolith/BPI_Monolith.uasset b/Content/Monolith/BPI_Monolith.uasset index 945bbe9..1d1d8db 100644 --- a/Content/Monolith/BPI_Monolith.uasset +++ b/Content/Monolith/BPI_Monolith.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c69f2ab2428196228b40c3adae7b2d9d5200bfeb3ff5dd6f424b7b76ca6c071e -size 348287 +oid sha256:af1a32803d7c6bd4fa3f84e89ffeb5b0dd19951f1934e077b56751849fdad90f +size 342717 From e0a13614397b182e57ae3040b3a7b9d57c985c38 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Fri, 29 Nov 2024 15:51:39 +0000 Subject: [PATCH 09/28] Fixed the weapons and abilities Fixed the melee and ability 1 so that they despawn and would apply damage etc --- Content/Monolith/BPI_AOverheat.uasset | 4 ++-- Content/Monolith/BPI_MeeleWeapon.uasset | 4 ++-- Content/Monolith/BPI_Monolith.uasset | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Content/Monolith/BPI_AOverheat.uasset b/Content/Monolith/BPI_AOverheat.uasset index c182b17..5601c19 100644 --- a/Content/Monolith/BPI_AOverheat.uasset +++ b/Content/Monolith/BPI_AOverheat.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f94f6e3436c40399c2d142f20c4404ec4279665bb1f9b6c28be718e504981993 -size 80536 +oid sha256:2048062c510d1fd8bca0769d2ed34cc2126fcccc248581ff16c382baf135c3c7 +size 81247 diff --git a/Content/Monolith/BPI_MeeleWeapon.uasset b/Content/Monolith/BPI_MeeleWeapon.uasset index 9577994..64b9480 100644 --- a/Content/Monolith/BPI_MeeleWeapon.uasset +++ b/Content/Monolith/BPI_MeeleWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:119ede114e954ffdb164837884d34704a41ce958ac022aa65ce754444dad8013 -size 30542 +oid sha256:b20f17043ea6dec646d118819cabb9d2b110adde930fedde52f520300304d56f +size 73554 diff --git a/Content/Monolith/BPI_Monolith.uasset b/Content/Monolith/BPI_Monolith.uasset index 1d1d8db..1a30ea3 100644 --- a/Content/Monolith/BPI_Monolith.uasset +++ b/Content/Monolith/BPI_Monolith.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af1a32803d7c6bd4fa3f84e89ffeb5b0dd19951f1934e077b56751849fdad90f -size 342717 +oid sha256:d1c75c8bbaabe7a1010e6f2328caf17f61e59c0c170acc2599b643f0ca165bf9 +size 339823 From bc36eafe1192492fbdb6e62a82b9339da2be9a7c Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Fri, 29 Nov 2024 15:52:20 +0000 Subject: [PATCH 10/28] Changed input mapping for abilities I changed the input mapping for the abilities so it uses the new enhanced version --- Content/Monolith/Input/IA_MAbilitySelection.uasset | 3 +++ Content/Monolith/Input/IA_Mability1.uasset | 3 +++ Content/Monolith/Input/IMC_Monolith.uasset | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 Content/Monolith/Input/IA_MAbilitySelection.uasset create mode 100644 Content/Monolith/Input/IA_Mability1.uasset diff --git a/Content/Monolith/Input/IA_MAbilitySelection.uasset b/Content/Monolith/Input/IA_MAbilitySelection.uasset new file mode 100644 index 0000000..0307b55 --- /dev/null +++ b/Content/Monolith/Input/IA_MAbilitySelection.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:940952854655c8cc96ed730477256911d909dcb11d0c9d3d4609484af0d850c7 +size 1431 diff --git a/Content/Monolith/Input/IA_Mability1.uasset b/Content/Monolith/Input/IA_Mability1.uasset new file mode 100644 index 0000000..dd76b71 --- /dev/null +++ b/Content/Monolith/Input/IA_Mability1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:651adf43013052188278d5fb7cfc473a9b24177e6a164b09dbda82223bdec917 +size 1391 diff --git a/Content/Monolith/Input/IMC_Monolith.uasset b/Content/Monolith/Input/IMC_Monolith.uasset index d3547df..5e3d5c7 100644 --- a/Content/Monolith/Input/IMC_Monolith.uasset +++ b/Content/Monolith/Input/IMC_Monolith.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e569810046fce5b50c9cc6ed9f2bbc8328d3e048c498be9133f4745bc1b2a80 -size 6766 +oid sha256:109de11973198fe65c4acfee5fb05d86f5a107bd3ecbfbf8ba7b2e8ed5edea0c +size 8890 From cb9fef137af37b9de309653640a1800d8e2f540b Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Sat, 30 Nov 2024 19:01:40 +0000 Subject: [PATCH 11/28] Added in ability 1 animation Added in the animation for ability one to pair it with the actual ability 1 --- Content/Monolith/Animations/Ability_1.uasset | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Content/Monolith/Animations/Ability_1.uasset diff --git a/Content/Monolith/Animations/Ability_1.uasset b/Content/Monolith/Animations/Ability_1.uasset new file mode 100644 index 0000000..d56d646 --- /dev/null +++ b/Content/Monolith/Animations/Ability_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7a94bd2d1160cfb5cb5ab7f96d28c7c512693ee8a473fda2b96ebd1f0971667 +size 35766464 From d76b47630f85ef91ae1cd9221205713990eff335 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Sat, 30 Nov 2024 19:02:34 +0000 Subject: [PATCH 12/28] Added in socket to monolith mesh Added in a socket to the monolith mesh so that the ability 1 would attach the enemy mesh to the socket and play their retrospective animations --- .../MonolithBlockout/Monolith_blockout_Rig.uasset | 4 ++-- Content/Monolith/BPI_Monolith.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Assets/BlockoutAssets/MonolithBlockout/Monolith_blockout_Rig.uasset b/Content/Assets/BlockoutAssets/MonolithBlockout/Monolith_blockout_Rig.uasset index ffc689f..88093ae 100644 --- a/Content/Assets/BlockoutAssets/MonolithBlockout/Monolith_blockout_Rig.uasset +++ b/Content/Assets/BlockoutAssets/MonolithBlockout/Monolith_blockout_Rig.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07275b4d6e8dd6d77390a34a78d26381b1c6afcc600b70d989638c1d3e2e0b39 -size 590315 +oid sha256:80f5ae2b7e1fec3cd36526c57ed3dc12ec49c3ce29952d4ddca34e1afc99f47c +size 590566 diff --git a/Content/Monolith/BPI_Monolith.uasset b/Content/Monolith/BPI_Monolith.uasset index 1a30ea3..18e941e 100644 --- a/Content/Monolith/BPI_Monolith.uasset +++ b/Content/Monolith/BPI_Monolith.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1c75c8bbaabe7a1010e6f2328caf17f61e59c0c170acc2599b643f0ca165bf9 -size 339823 +oid sha256:94e89634a9b8d60b5201795cd03305c2a7ea54a8b81b70b7402cc747f2e4f040 +size 365216 From efca89e169804b28275efdbfe57d6f9a7ae9bb2a Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Sat, 30 Nov 2024 19:04:30 +0000 Subject: [PATCH 13/28] Added in the flats monster Added in the flats monster into the game --- Content/Enemies/Flats/FlatsMonsterRigged.uasset | 3 +++ Content/Enemies/Flats/FlatsMonsterRigged_PhysicsAsset.uasset | 3 +++ Content/Enemies/Flats/FlatsMonsterRigged_Skeleton.uasset | 3 +++ 3 files changed, 9 insertions(+) create mode 100644 Content/Enemies/Flats/FlatsMonsterRigged.uasset create mode 100644 Content/Enemies/Flats/FlatsMonsterRigged_PhysicsAsset.uasset create mode 100644 Content/Enemies/Flats/FlatsMonsterRigged_Skeleton.uasset diff --git a/Content/Enemies/Flats/FlatsMonsterRigged.uasset b/Content/Enemies/Flats/FlatsMonsterRigged.uasset new file mode 100644 index 0000000..80372f5 --- /dev/null +++ b/Content/Enemies/Flats/FlatsMonsterRigged.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:065bdd46a49fc4cbf734d2962886ad8da95ed004cf436d85035a05c03a1d20f6 +size 1156791 diff --git a/Content/Enemies/Flats/FlatsMonsterRigged_PhysicsAsset.uasset b/Content/Enemies/Flats/FlatsMonsterRigged_PhysicsAsset.uasset new file mode 100644 index 0000000..4f7aaa6 --- /dev/null +++ b/Content/Enemies/Flats/FlatsMonsterRigged_PhysicsAsset.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75b28c22f5d3da12125be49373c7332131193fe2df78e0a62eef66df834ef426 +size 14741 diff --git a/Content/Enemies/Flats/FlatsMonsterRigged_Skeleton.uasset b/Content/Enemies/Flats/FlatsMonsterRigged_Skeleton.uasset new file mode 100644 index 0000000..00eda77 --- /dev/null +++ b/Content/Enemies/Flats/FlatsMonsterRigged_Skeleton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:feb3efd2989ce26acb16f01e81ce8c3bd9ddb7f094f0a7cde0649b8f4ba7366e +size 72436 From 48a5df9a3d68683688fd45a4186763545168d44f Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Sat, 30 Nov 2024 20:19:58 +0000 Subject: [PATCH 14/28] Added in flats monster Added in the flats monster blueprint --- Content/Enemies/Flats/BP_FlatsMonster.uasset | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Content/Enemies/Flats/BP_FlatsMonster.uasset diff --git a/Content/Enemies/Flats/BP_FlatsMonster.uasset b/Content/Enemies/Flats/BP_FlatsMonster.uasset new file mode 100644 index 0000000..360d15a --- /dev/null +++ b/Content/Enemies/Flats/BP_FlatsMonster.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fffc393744025bcf970c9628c0eea89e2d4f7de154735fcc433bffb283048a99 +size 33144 From f2616a24a9f14f738f9f08da99603de50e6b0479 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Sat, 30 Nov 2024 20:29:29 +0000 Subject: [PATCH 15/28] Added ability 1 animation montage --- Content/Monolith/Animations/Ability_1Montage.uasset | 3 +++ Content/Monolith/BPI_Monolith.uasset | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 Content/Monolith/Animations/Ability_1Montage.uasset diff --git a/Content/Monolith/Animations/Ability_1Montage.uasset b/Content/Monolith/Animations/Ability_1Montage.uasset new file mode 100644 index 0000000..1caa296 --- /dev/null +++ b/Content/Monolith/Animations/Ability_1Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6b44357b5fba5078b3ff6dc45b9a2ab79221e9e3b514451dd6cdf72660fed6f +size 9265 diff --git a/Content/Monolith/BPI_Monolith.uasset b/Content/Monolith/BPI_Monolith.uasset index 18e941e..b4ad43c 100644 --- a/Content/Monolith/BPI_Monolith.uasset +++ b/Content/Monolith/BPI_Monolith.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94e89634a9b8d60b5201795cd03305c2a7ea54a8b81b70b7402cc747f2e4f040 -size 365216 +oid sha256:3085d92566ff172cce91cf18fb27575852a73e55625c90b292efa1f9f26aaf12 +size 389508 From a492419199b619eb73c14d3551237d55d226f49c Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Sat, 30 Nov 2024 20:29:59 +0000 Subject: [PATCH 16/28] Changed the rig for the monolith --- .../MonolithBlockout/Monolith_blockout_Rig.uasset | 2 +- .../MonolithBlockout/Monolith_blockout_Rig_Skeleton.uasset | 4 ++-- Content/Levels/PrototypeLevel.umap | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Content/Assets/BlockoutAssets/MonolithBlockout/Monolith_blockout_Rig.uasset b/Content/Assets/BlockoutAssets/MonolithBlockout/Monolith_blockout_Rig.uasset index 88093ae..b3f90b3 100644 --- a/Content/Assets/BlockoutAssets/MonolithBlockout/Monolith_blockout_Rig.uasset +++ b/Content/Assets/BlockoutAssets/MonolithBlockout/Monolith_blockout_Rig.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80f5ae2b7e1fec3cd36526c57ed3dc12ec49c3ce29952d4ddca34e1afc99f47c +oid sha256:5883c56f50f181b2640283055a689447804a3d4d65a3be7c33f19f02f2492cd4 size 590566 diff --git a/Content/Assets/BlockoutAssets/MonolithBlockout/Monolith_blockout_Rig_Skeleton.uasset b/Content/Assets/BlockoutAssets/MonolithBlockout/Monolith_blockout_Rig_Skeleton.uasset index eac14ee..b9609f2 100644 --- a/Content/Assets/BlockoutAssets/MonolithBlockout/Monolith_blockout_Rig_Skeleton.uasset +++ b/Content/Assets/BlockoutAssets/MonolithBlockout/Monolith_blockout_Rig_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13c89f25dbe2673220a77a288074c3f015b849f069a5b3d3eddb818a445c9ad7 -size 74842 +oid sha256:92aa4bb4a6e72e90e10028ba6dc97367ba8ab7736aec26510031e85251b1e036 +size 75318 diff --git a/Content/Levels/PrototypeLevel.umap b/Content/Levels/PrototypeLevel.umap index afdbafa..ece96aa 100644 --- a/Content/Levels/PrototypeLevel.umap +++ b/Content/Levels/PrototypeLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4b0bbccc93c7c9477ce0ee763cfbc7f8abcf21aa2162efddac2634690d089b2 -size 8485636 +oid sha256:cb3098b54aa97edc484db17d5cd2a11feb3fac16b3ea6207be2eadaebcc499ec +size 8486357 From 3ba86a0d80bf416499bf4434ff995b4ef7d86d23 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Sat, 30 Nov 2024 20:32:26 +0000 Subject: [PATCH 17/28] IDk tbh --- Content/Monolith/BPI_Monolith.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Monolith/BPI_Monolith.uasset b/Content/Monolith/BPI_Monolith.uasset index b4ad43c..80e1c1e 100644 --- a/Content/Monolith/BPI_Monolith.uasset +++ b/Content/Monolith/BPI_Monolith.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3085d92566ff172cce91cf18fb27575852a73e55625c90b292efa1f9f26aaf12 -size 389508 +oid sha256:a7daf0a4f6e0c6891982bfd563e527d0ffcc1d258cb83b8229a3f11700006387 +size 387557 From 59768da7698100582caef694c9b2f39ac8d02470 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Sun, 1 Dec 2024 17:16:47 +0000 Subject: [PATCH 18/28] Added spawn area in a forest --- Content/Levels/PrototypeLevelRework.umap | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Content/Levels/PrototypeLevelRework.umap diff --git a/Content/Levels/PrototypeLevelRework.umap b/Content/Levels/PrototypeLevelRework.umap new file mode 100644 index 0000000..0eafa01 --- /dev/null +++ b/Content/Levels/PrototypeLevelRework.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05f59234dda0e2da1f7c039177c169cb257c1dbd885077eb146ce706e5917ce6 +size 9050157 From 987e68fec9e1defc6613887cc928248ab7f8250a Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Mon, 2 Dec 2024 10:33:50 +0000 Subject: [PATCH 19/28] Changed all buildings in prototype level rework to chaos destruction assets --- Content/Assets/ChaosAssets/AnchorField.uasset | 3 +++ Content/Assets/ChaosAssets/LargeBuildingCombined.uasset | 4 ++-- Content/Assets/ChaosAssets/MediumBuildingCombined.uasset | 3 +++ Content/Assets/ChaosAssets/SmallBuildingDestruction.uasset | 3 +++ Content/Levels/PrototypeLevelRework.umap | 4 ++-- 5 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 Content/Assets/ChaosAssets/AnchorField.uasset create mode 100644 Content/Assets/ChaosAssets/MediumBuildingCombined.uasset create mode 100644 Content/Assets/ChaosAssets/SmallBuildingDestruction.uasset diff --git a/Content/Assets/ChaosAssets/AnchorField.uasset b/Content/Assets/ChaosAssets/AnchorField.uasset new file mode 100644 index 0000000..e5b4e40 --- /dev/null +++ b/Content/Assets/ChaosAssets/AnchorField.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b63848f7a0245ef6b4518e2826f1031cec4321bda22429a7f1d986c71078fb0 +size 29793 diff --git a/Content/Assets/ChaosAssets/LargeBuildingCombined.uasset b/Content/Assets/ChaosAssets/LargeBuildingCombined.uasset index 672d99a..af75f98 100644 --- a/Content/Assets/ChaosAssets/LargeBuildingCombined.uasset +++ b/Content/Assets/ChaosAssets/LargeBuildingCombined.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f9da88d42ad759ed282543996694dd1305e24bcdf429cb90d2113e14de4e120 -size 36331718 +oid sha256:7866e3d285ec1070a1fd5bd2f23a53e17feb1840f78fe4097b926e55bd4f7dc0 +size 36331862 diff --git a/Content/Assets/ChaosAssets/MediumBuildingCombined.uasset b/Content/Assets/ChaosAssets/MediumBuildingCombined.uasset new file mode 100644 index 0000000..f0a7f52 --- /dev/null +++ b/Content/Assets/ChaosAssets/MediumBuildingCombined.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c5517fd6bcc0ab00d00492c3335821eb2b19d9ca020b0bd0260373965584c36 +size 3267836 diff --git a/Content/Assets/ChaosAssets/SmallBuildingDestruction.uasset b/Content/Assets/ChaosAssets/SmallBuildingDestruction.uasset new file mode 100644 index 0000000..7036277 --- /dev/null +++ b/Content/Assets/ChaosAssets/SmallBuildingDestruction.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:292f8c8223a48fdc43b525ef97f3bd6a0b8f78e5e13c00c6a36d2e86645e3e1e +size 3394039 diff --git a/Content/Levels/PrototypeLevelRework.umap b/Content/Levels/PrototypeLevelRework.umap index 0eafa01..1e26c81 100644 --- a/Content/Levels/PrototypeLevelRework.umap +++ b/Content/Levels/PrototypeLevelRework.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05f59234dda0e2da1f7c039177c169cb257c1dbd885077eb146ce706e5917ce6 -size 9050157 +oid sha256:21d37d4963354d01a3171613a0971dd0f4142b53815ed69b36a3199ba297748b +size 2720016 From 4548c189287bff37733976d7c95e15bc53d9ad08 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Mon, 2 Dec 2024 18:59:02 +0000 Subject: [PATCH 20/28] changed something --- Content/Levels/PrototypeLevelRework.umap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Levels/PrototypeLevelRework.umap b/Content/Levels/PrototypeLevelRework.umap index 1e26c81..2e1c928 100644 --- a/Content/Levels/PrototypeLevelRework.umap +++ b/Content/Levels/PrototypeLevelRework.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21d37d4963354d01a3171613a0971dd0f4142b53815ed69b36a3199ba297748b -size 2720016 +oid sha256:9b663c290ead16b09c53384274983c728cd74f773dd8631462429bdb306958b1 +size 2720743 From eea95f8eee68b504835048414193e13867712cd5 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Mon, 2 Dec 2024 19:14:46 +0000 Subject: [PATCH 21/28] Fixed play montage not working --- Content/Monolith/Animations/MonolithAnimBlueprint.uasset | 3 +++ Content/Monolith/BPI_Monolith.uasset | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 Content/Monolith/Animations/MonolithAnimBlueprint.uasset diff --git a/Content/Monolith/Animations/MonolithAnimBlueprint.uasset b/Content/Monolith/Animations/MonolithAnimBlueprint.uasset new file mode 100644 index 0000000..a69c91c --- /dev/null +++ b/Content/Monolith/Animations/MonolithAnimBlueprint.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1739b7151063f654408244a25daedc7eab29737a6afe6cf36f36e8320b05174 +size 37455 diff --git a/Content/Monolith/BPI_Monolith.uasset b/Content/Monolith/BPI_Monolith.uasset index 80e1c1e..6a7f70e 100644 --- a/Content/Monolith/BPI_Monolith.uasset +++ b/Content/Monolith/BPI_Monolith.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7daf0a4f6e0c6891982bfd563e527d0ffcc1d258cb83b8229a3f11700006387 -size 387557 +oid sha256:d4388646485aada1c481cde271c9adea8d9589ed106aa5a5e2faa3ff53f39775 +size 400206 From f040467f21f1fafa794052529d68b8028c86648d Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Mon, 2 Dec 2024 19:15:43 +0000 Subject: [PATCH 22/28] IDK --- Content/Levels/PrototypeLevel.umap | 4 ++-- Content/Monolith/BPI_Monolith.uasset | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Content/Levels/PrototypeLevel.umap b/Content/Levels/PrototypeLevel.umap index ece96aa..5619abe 100644 --- a/Content/Levels/PrototypeLevel.umap +++ b/Content/Levels/PrototypeLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb3098b54aa97edc484db17d5cd2a11feb3fac16b3ea6207be2eadaebcc499ec -size 8486357 +oid sha256:27fb8937749a5b4d9cf62ab0454166535ddcdbd80d95c0e73d11a4cc2b4fecb3 +size 8486661 diff --git a/Content/Monolith/BPI_Monolith.uasset b/Content/Monolith/BPI_Monolith.uasset index 6a7f70e..7d19025 100644 --- a/Content/Monolith/BPI_Monolith.uasset +++ b/Content/Monolith/BPI_Monolith.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4388646485aada1c481cde271c9adea8d9589ed106aa5a5e2faa3ff53f39775 +oid sha256:90c499262d42f2ed9468915f085082e227382c2fd14f1778193bc03b2dbe50d4 size 400206 From cf509a1ea26be757a34040ce80f84274cd3ecd50 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Tue, 3 Dec 2024 12:53:38 +0000 Subject: [PATCH 23/28] Added monolith ability boolean Added a boolean for the monolith so that when the monolith is in an animation, it isnt able to move or do any other actions. Added the boolean to the flats monster too. --- Content/Enemies/Flats/BP_FlatsMonster.uasset | 4 ++-- Content/Monolith/BPI_Monolith.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Enemies/Flats/BP_FlatsMonster.uasset b/Content/Enemies/Flats/BP_FlatsMonster.uasset index 360d15a..27fcb9b 100644 --- a/Content/Enemies/Flats/BP_FlatsMonster.uasset +++ b/Content/Enemies/Flats/BP_FlatsMonster.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fffc393744025bcf970c9628c0eea89e2d4f7de154735fcc433bffb283048a99 -size 33144 +oid sha256:8612d68766b341360e175a670d1f6fff0ec8a6744eda9cc9d731d241f1be5fd8 +size 33166 diff --git a/Content/Monolith/BPI_Monolith.uasset b/Content/Monolith/BPI_Monolith.uasset index 7d19025..40bac4c 100644 --- a/Content/Monolith/BPI_Monolith.uasset +++ b/Content/Monolith/BPI_Monolith.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90c499262d42f2ed9468915f085082e227382c2fd14f1778193bc03b2dbe50d4 -size 400206 +oid sha256:6845e2dd857a54f95591a2b81f89e6d2ac785c90231528311273b1f9929815fd +size 431263 From 4c47b7cbeb69ebcd34d428af9fc581039316c09c Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Tue, 3 Dec 2024 21:48:58 +0000 Subject: [PATCH 24/28] Fixed mapping controller bug Added a clear mapping node before changing the input map so that it doesnt break the game anymore --- Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- Content/Monolith/BPI_Monolith.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index bf6a3e7..ea50ca3 100644 --- a/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6f143cb54550b86bd0796650f0fd8e0aac611b9812f0c2dcd809e3f180b0fd4 -size 320866 +oid sha256:89060747c2145def58d57943b0b333c5f5b216c9c7107582d76a9454a3d82de8 +size 342019 diff --git a/Content/Monolith/BPI_Monolith.uasset b/Content/Monolith/BPI_Monolith.uasset index 40bac4c..033fb42 100644 --- a/Content/Monolith/BPI_Monolith.uasset +++ b/Content/Monolith/BPI_Monolith.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6845e2dd857a54f95591a2b81f89e6d2ac785c90231528311273b1f9929815fd -size 431263 +oid sha256:d1f10027f316544b29f22842ba6541bad93635d10665710bb8fca400c5506906 +size 424922 From ef644ea7b487680d24e35d89616188bb1c60603f Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Tue, 3 Dec 2024 23:20:28 +0000 Subject: [PATCH 25/28] Bump Unreal Version to 5.5 from 5.4.4 --- Monolith.uproject | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Monolith.uproject b/Monolith.uproject index 5dbac3b..90b8db5 100644 --- a/Monolith.uproject +++ b/Monolith.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "5.4", + "EngineAssociation": "5.5", "Category": "", "Description": "", "Modules": [ From b9fff1cc545dbea66746a2df4f7a511978cf6f59 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Tue, 3 Dec 2024 23:56:13 +0000 Subject: [PATCH 26/28] Update Advanced Sessions Steam Plugin --- .../AdvancedSessions/AdvancedSessions.uplugin | 4 +-- .../Classes/AdvancedFriendsGameInstance.h | 7 ++++ .../FindSessionsCallbackProxyAdvanced.h | 4 +-- .../Private/AdvancedFriendsGameInstance.cpp | 35 +++++++++++++++++++ .../FindSessionsCallbackProxyAdvanced.cpp | 12 +++---- 5 files changed, 52 insertions(+), 10 deletions(-) diff --git a/Plugins/AdvancedSessions/AdvancedSessions.uplugin b/Plugins/AdvancedSessions/AdvancedSessions.uplugin index 7dc2e3a..a970a4a 100644 --- a/Plugins/AdvancedSessions/AdvancedSessions.uplugin +++ b/Plugins/AdvancedSessions/AdvancedSessions.uplugin @@ -1,8 +1,8 @@ { "FileVersion": 3, "FriendlyName": "Advanced Sessions", - "Version": 5.4, - "VersionName": "5.4", + "Version": 5.5, + "VersionName": "5.5", "Description": "Adds new blueprint functions to handle more advanced session operations.", "Category": "Advanced Sessions Plugin", "CreatedBy": "Joshua Statzer", diff --git a/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h b/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h index be1def9..29d5018 100644 --- a/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h +++ b/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h @@ -52,6 +52,13 @@ public: FOnSessionInviteReceivedDelegate SessionInviteReceivedDelegate; FDelegateHandle SessionInviteReceivedDelegateHandle; + // custom handle to join directly from steam ui "Join Game" + FDelegateHandle OnJoinSessionCompleteDelegateHandle; + // custom Steam UI Join User function #Self invite# + void OnSessionUserInviteAccepted(const bool bWasSuccessful, const int32 ControllerId, FUniqueNetIdPtr UserId, const FOnlineSessionSearchResult& InviteResult); + // custom Steam UI function to client travel #Self invite# + void OnJoinSessionComplete(FName SessionName, EOnJoinSessionCompleteResult::Type Result); + //const FUniqueNetId& /*UserId*/, const FUniqueNetId& /*FromId*/, const FString& /*AppId*/, const FOnlineSessionSearchResult& /*InviteResult*/ void OnSessionInviteReceivedMaster(const FUniqueNetId & PersonInvited, const FUniqueNetId & PersonInviting, const FString & AppId, const FOnlineSessionSearchResult& SessionToJoin); diff --git a/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h b/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h index e610277..5d225d8 100644 --- a/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h +++ b/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h @@ -28,7 +28,7 @@ class UFindSessionsCallbackProxyAdvanced : public UOnlineBlueprintCallProxyBase // Searches for advertised sessions with the default online subsystem and includes an array of filters UFUNCTION(BlueprintCallable, meta = (BlueprintInternalUseOnly = "true", WorldContext = "WorldContextObject", AutoCreateRefTerm="Filters"), Category = "Online|AdvancedSessions") - static UFindSessionsCallbackProxyAdvanced* FindSessionsAdvanced(UObject* WorldContextObject, class APlayerController* PlayerController, int32 MaxResults, bool bUseLAN, EBPServerPresenceSearchType ServerTypeToSearch, const TArray &Filters, bool bEmptyServersOnly = false, bool bNonEmptyServersOnly = false, bool bSecureServersOnly = false, bool bSearchLobbies = true, int MinSlotsAvailable = 0); + static UFindSessionsCallbackProxyAdvanced* FindSessionsAdvanced(UObject* WorldContextObject, class APlayerController* PlayerController, int32 MaxResults, bool bUseLAN, EBPServerPresenceSearchType ServerTypeToSearch, const TArray &Filters, bool bEmptyServersOnly = false, bool bNonEmptyServersOnly = false, bool bSecureServersOnly = false, /*bool bSearchLobbies = true,*/ int MinSlotsAvailable = 0); static bool CompareVariants(const FVariantData &A, const FVariantData &B, EOnlineComparisonOpRedux Comparator); @@ -99,7 +99,7 @@ private: bool bSecureServersOnly; // Search through lobbies - bool bSearchLobbies; + //bool bSearchLobbies; // Min slots requires to search int MinSlotsAvailable; diff --git a/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp b/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp index 47afb6a..706bae5 100644 --- a/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp +++ b/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp @@ -20,6 +20,37 @@ UAdvancedFriendsGameInstance::UAdvancedFriendsGameInstance(const FObjectInitiali { } +void UAdvancedFriendsGameInstance::OnSessionUserInviteAccepted(const bool bWasSuccessful, const int32 ControllerId, FUniqueNetIdPtr UserId, const FOnlineSessionSearchResult& InviteResult) +{ + IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(GetWorld()); + if (SessionInterface.IsValid()) + { + SessionInterface->ClearOnJoinSessionCompleteDelegate_Handle(OnJoinSessionCompleteDelegateHandle); + OnJoinSessionCompleteDelegateHandle = SessionInterface->AddOnJoinSessionCompleteDelegate_Handle( + FOnJoinSessionCompleteDelegate::CreateUObject(this, &UAdvancedFriendsGameInstance::OnJoinSessionComplete)); + + SessionInterface->JoinSession(0, NAME_GameSession, InviteResult); + } + UE_LOG(AdvancedFriendsInterfaceLog, Log, TEXT("Called Join Session for Steam Friends List UI InviteResults: %s, UserId: %s"), *InviteResult.GetSessionIdStr(), *UserId->ToString()); +} + +void UAdvancedFriendsGameInstance::OnJoinSessionComplete(FName SessionName, EOnJoinSessionCompleteResult::Type Result) +{ + IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(GetWorld()); + if (SessionInterface.IsValid()) + { + FString ConnectInfo; + if (SessionInterface->GetResolvedConnectString(NAME_GameSession, ConnectInfo)) + { + APlayerController* PlayerController = GetFirstLocalPlayerController(); + if (PlayerController) + { + PlayerController->ClientTravel(ConnectInfo, ETravelType::TRAVEL_Absolute); + } + } + } +} + void UAdvancedFriendsGameInstance::Shutdown() { IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(GetWorld()); @@ -34,6 +65,7 @@ void UAdvancedFriendsGameInstance::Shutdown() // Clear all of the delegate handles here SessionInterface->ClearOnSessionUserInviteAcceptedDelegate_Handle(SessionInviteAcceptedDelegateHandle); SessionInterface->ClearOnSessionInviteReceivedDelegate_Handle(SessionInviteReceivedDelegateHandle); + SessionInterface->ClearOnJoinSessionCompleteDelegate_Handle(OnJoinSessionCompleteDelegateHandle); } @@ -80,6 +112,9 @@ void UAdvancedFriendsGameInstance::Init() SessionInviteAcceptedDelegateHandle = SessionInterface->AddOnSessionUserInviteAcceptedDelegate_Handle(SessionInviteAcceptedDelegate); SessionInviteReceivedDelegateHandle = SessionInterface->AddOnSessionInviteReceivedDelegate_Handle(SessionInviteReceivedDelegate); + + // Custom steam join game delegate + SessionInterface->OnSessionUserInviteAcceptedDelegates.AddUObject(this, &UAdvancedFriendsGameInstance::OnSessionUserInviteAccepted); } else { diff --git a/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp b/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp index dc0dc4b..7325caa 100644 --- a/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp +++ b/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp @@ -16,7 +16,7 @@ UFindSessionsCallbackProxyAdvanced::UFindSessionsCallbackProxyAdvanced(const FOb bIsOnSecondSearch = false; } -UFindSessionsCallbackProxyAdvanced* UFindSessionsCallbackProxyAdvanced::FindSessionsAdvanced(UObject* WorldContextObject, class APlayerController* PlayerController, int MaxResults, bool bUseLAN, EBPServerPresenceSearchType ServerTypeToSearch, const TArray &Filters, bool bEmptyServersOnly, bool bNonEmptyServersOnly, bool bSecureServersOnly, bool bSearchLobbies, int MinSlotsAvailable) +UFindSessionsCallbackProxyAdvanced* UFindSessionsCallbackProxyAdvanced::FindSessionsAdvanced(UObject* WorldContextObject, class APlayerController* PlayerController, int MaxResults, bool bUseLAN, EBPServerPresenceSearchType ServerTypeToSearch, const TArray &Filters, bool bEmptyServersOnly, bool bNonEmptyServersOnly, bool bSecureServersOnly, /*bool bSearchLobbies,*/ int MinSlotsAvailable) { UFindSessionsCallbackProxyAdvanced* Proxy = NewObject(); Proxy->PlayerControllerWeakPtr = PlayerController; @@ -28,7 +28,7 @@ UFindSessionsCallbackProxyAdvanced* UFindSessionsCallbackProxyAdvanced::FindSess Proxy->bEmptyServersOnly = bEmptyServersOnly, Proxy->bNonEmptyServersOnly = bNonEmptyServersOnly; Proxy->bSecureServersOnly = bSecureServersOnly; - Proxy->bSearchLobbies = bSearchLobbies; + //Proxy->bSearchLobbies = bSearchLobbies; Proxy->MinSlotsAvailable = MinSlotsAvailable; return Proxy; } @@ -114,9 +114,9 @@ void UFindSessionsCallbackProxyAdvanced::Activate() case EBPServerPresenceSearchType::ClientServersOnly: { - tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals); + //tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals); - if (bSearchLobbies && !IOnlineSubsystem::DoesInstanceExist("STEAM")) + //if (bSearchLobbies)// && !IOnlineSubsystem::DoesInstanceExist("STEAM")) tem.Set(SEARCH_LOBBIES, true, EOnlineComparisonOp::Equals); } break; @@ -140,9 +140,9 @@ void UFindSessionsCallbackProxyAdvanced::Activate() FOnlineSearchSettingsEx DedicatedOnly = tem; - tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals); + //tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals); - if (bSearchLobbies && !IOnlineSubsystem::DoesInstanceExist("STEAM")) + //if (bSearchLobbies)// && !IOnlineSubsystem::DoesInstanceExist("STEAM")) tem.Set(SEARCH_LOBBIES, true, EOnlineComparisonOp::Equals); //DedicatedOnly.Set(SEARCH_DEDICATED_ONLY, true, EOnlineComparisonOp::Equals); From 4a69b5e40f240ad4e0dfe03d7fd7638a4922f5e7 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Wed, 4 Dec 2024 12:04:01 +0000 Subject: [PATCH 27/28] Bump Unreal version to 5.5 on this branch --- Monolith.uproject | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Monolith.uproject b/Monolith.uproject index 5dbac3b..90b8db5 100644 --- a/Monolith.uproject +++ b/Monolith.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "5.4", + "EngineAssociation": "5.5", "Category": "", "Description": "", "Modules": [ From 2298912e66389cc7c4305b60bc9ecdfccaac8c44 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Wed, 4 Dec 2024 12:46:29 +0000 Subject: [PATCH 28/28] Finished ability 1 I finished the ability one by giving the ability knockback, allowing for the large enemy hit by the attack to get thrown back away. I added in a print string into flats monster to check if the apply damage was working --- Content/Enemies/Flats/BP_FlatsMonster.uasset | 4 ++-- Content/Monolith/BPI_Monolith.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Enemies/Flats/BP_FlatsMonster.uasset b/Content/Enemies/Flats/BP_FlatsMonster.uasset index 27fcb9b..9244dfd 100644 --- a/Content/Enemies/Flats/BP_FlatsMonster.uasset +++ b/Content/Enemies/Flats/BP_FlatsMonster.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8612d68766b341360e175a670d1f6fff0ec8a6744eda9cc9d731d241f1be5fd8 -size 33166 +oid sha256:f2490a32f128d922eeccd2de310b85940d1f2768d8af0387cbdebd43f57d7bdb +size 45403 diff --git a/Content/Monolith/BPI_Monolith.uasset b/Content/Monolith/BPI_Monolith.uasset index 033fb42..7e1003d 100644 --- a/Content/Monolith/BPI_Monolith.uasset +++ b/Content/Monolith/BPI_Monolith.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1f10027f316544b29f22842ba6541bad93635d10665710bb8fca400c5506906 -size 424922 +oid sha256:c654470faf96019a2a09460ab7e8108bca9f2e52d525a67397ec4ecde7af0c54 +size 437368