From 1a039023edf548ad09d6517d1171062277b327f2 Mon Sep 17 00:00:00 2001 From: MarcelHara Date: Thu, 27 Apr 2023 11:57:03 +0100 Subject: [PATCH 1/6] Updated SmokeParticles to breaking walls --- Content/Levels/Build.umap | 4 ++-- Content/Levels/Testing/SneakMechanicTesting.umap | 4 ++-- Content/Particles/Break.uasset | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 6538cb0..f5e1226 100644 --- a/Content/Levels/Build.umap +++ b/Content/Levels/Build.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c4f95034b5002bbd1f6774cddd50b3e24090c174766d140f9083f980de03896 -size 3477301 +oid sha256:fd26446047cac6a7b1f7802aa96499140b9d95854d21d26a9e168a3d5e11c925 +size 3477029 diff --git a/Content/Levels/Testing/SneakMechanicTesting.umap b/Content/Levels/Testing/SneakMechanicTesting.umap index d03d5bc..2aa3f0f 100644 --- a/Content/Levels/Testing/SneakMechanicTesting.umap +++ b/Content/Levels/Testing/SneakMechanicTesting.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28cf4d02ed1f503e4a0eea83f56ca42cd8a2c0406d2eb8cb756f77e1834db6e1 -size 38205 +oid sha256:b8970c52070cfb3ac10d10081543f720c12b73b6a89b9e2554e4a6f13c8b48aa +size 46908 diff --git a/Content/Particles/Break.uasset b/Content/Particles/Break.uasset index 5994e34..91232ee 100644 --- a/Content/Particles/Break.uasset +++ b/Content/Particles/Break.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:656992a724aabc3ae0f6e79a7797ca5075b13b8583509fb89106d6400e61e89d -size 4064184 +oid sha256:09fd7221bd7e040d6aef0b51db01170cbfcb7a02791c3be24b4de116aa39f08d +size 4051601 From 3b725f53bbdf677ee133496474dff08e25b44d92 Mon Sep 17 00:00:00 2001 From: MarcelHara Date: Thu, 27 Apr 2023 12:31:32 +0100 Subject: [PATCH 2/6] Started to work on main menu --- Content/Blueprints/BP_MainMenuActor.uasset | 3 +++ Content/Blueprints/Combat_UI/BookWorldWidget.uasset | 4 ++-- Content/Blueprints/Combat_UI/CombatCharacter.uasset | 4 ++-- Content/Blueprints/MainMenu/BP_MainMenuBook.uasset | 3 +++ Content/Blueprints/MainMenu/WBP_MainMenu.uasset | 3 +++ Content/Levels/Testing/MainMenuLevel.umap | 3 +++ 6 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 Content/Blueprints/BP_MainMenuActor.uasset create mode 100644 Content/Blueprints/MainMenu/BP_MainMenuBook.uasset create mode 100644 Content/Blueprints/MainMenu/WBP_MainMenu.uasset create mode 100644 Content/Levels/Testing/MainMenuLevel.umap diff --git a/Content/Blueprints/BP_MainMenuActor.uasset b/Content/Blueprints/BP_MainMenuActor.uasset new file mode 100644 index 0000000..3352dc1 --- /dev/null +++ b/Content/Blueprints/BP_MainMenuActor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffc8d1f7e9f92f5223ee1a1f8edfe2f2a69c6a07f05b50853402a3caa1000601 +size 23553 diff --git a/Content/Blueprints/Combat_UI/BookWorldWidget.uasset b/Content/Blueprints/Combat_UI/BookWorldWidget.uasset index 218e2d7..757d9fd 100644 --- a/Content/Blueprints/Combat_UI/BookWorldWidget.uasset +++ b/Content/Blueprints/Combat_UI/BookWorldWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6aea2b49abbfdd1ac0da1147e3419e5f6410fa4e940075c7e56262d90c703fb2 -size 23653 +oid sha256:38d13fd9a0a0a9c0af31988193b77e896f955dbe157f27653ad3e71b1d0c7307 +size 23737 diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index 1b1d3f6..31cf933 100644 --- a/Content/Blueprints/Combat_UI/CombatCharacter.uasset +++ b/Content/Blueprints/Combat_UI/CombatCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1cede40c31d3cb3cde60064203ae42e0035f14885f2d48f361ac9f0f8a754cd -size 157935 +oid sha256:849acd6e0956b68f5e1b925399903059795a0f1a4f86c9be9798a2e26bba9daa +size 158886 diff --git a/Content/Blueprints/MainMenu/BP_MainMenuBook.uasset b/Content/Blueprints/MainMenu/BP_MainMenuBook.uasset new file mode 100644 index 0000000..360d9a7 --- /dev/null +++ b/Content/Blueprints/MainMenu/BP_MainMenuBook.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64b4fa7276600fa716b70bcaecf262436ca9aa2a7d7f7504f18a67c1137e6d7e +size 30519 diff --git a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset new file mode 100644 index 0000000..4596909 --- /dev/null +++ b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2d0d7ea383a1e4ed58c3909e4f025392bbf9bcf41a38ef2e271bd14666f13a7 +size 127169 diff --git a/Content/Levels/Testing/MainMenuLevel.umap b/Content/Levels/Testing/MainMenuLevel.umap new file mode 100644 index 0000000..4f7713a --- /dev/null +++ b/Content/Levels/Testing/MainMenuLevel.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5db0ad7c5abd5fb9bef4e20dfe218614b355575e5c99f8d1fc192cfef71b2f2f +size 46874 From dd1ab033577271fbc3757a8b2d6e39392e9dfa21 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 27 Apr 2023 17:18:46 +0100 Subject: [PATCH 3/6] Changed UI to 2D to make it look 3D on the book --- Content/Blueprints/BP_MainMenuActor.uasset | 3 --- Content/Blueprints/MainMenu/WBP_MainMenu.uasset | 4 ++-- Content/Levels/Testing/MainMenuLevel.umap | 4 ++-- Content/MainMenu/GM_MainMenu.uasset | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 Content/Blueprints/BP_MainMenuActor.uasset diff --git a/Content/Blueprints/BP_MainMenuActor.uasset b/Content/Blueprints/BP_MainMenuActor.uasset deleted file mode 100644 index 3352dc1..0000000 --- a/Content/Blueprints/BP_MainMenuActor.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ffc8d1f7e9f92f5223ee1a1f8edfe2f2a69c6a07f05b50853402a3caa1000601 -size 23553 diff --git a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset index 4596909..28b45c0 100644 --- a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset +++ b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2d0d7ea383a1e4ed58c3909e4f025392bbf9bcf41a38ef2e271bd14666f13a7 -size 127169 +oid sha256:7488f4b0c0d0d84b3ef2b1c5646c729a43998a0090e39f381b90b0ac0108a5f6 +size 32960 diff --git a/Content/Levels/Testing/MainMenuLevel.umap b/Content/Levels/Testing/MainMenuLevel.umap index 4f7713a..8d965f9 100644 --- a/Content/Levels/Testing/MainMenuLevel.umap +++ b/Content/Levels/Testing/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5db0ad7c5abd5fb9bef4e20dfe218614b355575e5c99f8d1fc192cfef71b2f2f -size 46874 +oid sha256:f104ad48364df3027e84b0b07b0b2b4e1a3f49fd2367854c0f56fb291fb2f2f4 +size 46616 diff --git a/Content/MainMenu/GM_MainMenu.uasset b/Content/MainMenu/GM_MainMenu.uasset index 44fe9e2..620ce82 100644 --- a/Content/MainMenu/GM_MainMenu.uasset +++ b/Content/MainMenu/GM_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cf2f5360fb0a3e331064edf993da7e191e74c0d81ab438854946de85141fa11 -size 40074 +oid sha256:ce4b8d801d550a156377fbb74e7a85202d40bb14d457fd319fdf993ed0835b63 +size 40055 From 38caa46e5888c91a2cef57a7104c502d94cc6500 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 27 Apr 2023 17:19:01 +0100 Subject: [PATCH 4/6] Updated Interaction.cpp to fix certain crashes --- Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp index 7d152ac..a3ee695 100644 --- a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp +++ b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp @@ -25,8 +25,8 @@ void AInteraction::BeginPlay() Super::BeginPlay(); //Character & Camera refs - TempCharacterRef = Cast(GetWorld()->GetFirstPlayerController()->GetCharacter()); - MainCamera = Cast(TempCharacterRef->FindComponentByClass()); + if (TempCharacterRef != nullptr) TempCharacterRef = Cast(GetWorld()->GetFirstPlayerController()->GetCharacter()); + if (MainCamera != nullptr) MainCamera = Cast(TempCharacterRef->FindComponentByClass()); //Item refs TargetHealingLocation = HealingItem->GetActorLocation(); From b0615eafdd830194eec09da0aa7da0d78cd98070 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 27 Apr 2023 17:19:16 +0100 Subject: [PATCH 5/6] Added Volumetric fog and fine tuned --- Content/Blueprints/Game_UI/WBP_IntroText.uasset | 4 ++-- Content/Levels/Build.umap | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Blueprints/Game_UI/WBP_IntroText.uasset b/Content/Blueprints/Game_UI/WBP_IntroText.uasset index a87fa21..b6b8bcb 100644 --- a/Content/Blueprints/Game_UI/WBP_IntroText.uasset +++ b/Content/Blueprints/Game_UI/WBP_IntroText.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ca740590a87dd60ef7d9cc53cfa1aa0b0c13bae1c5b79c0b88ef44b830c428c -size 51485 +oid sha256:7b64b40d6029e1eec678723c595583809765c4e87103ad5a6a28b78b180e4a75 +size 52656 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index f5e1226..4747416 100644 --- a/Content/Levels/Build.umap +++ b/Content/Levels/Build.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd26446047cac6a7b1f7802aa96499140b9d95854d21d26a9e168a3d5e11c925 -size 3477029 +oid sha256:56a63a656f064913878defec4f49729fa62830b1849fb40d0c93f41b5ee42592 +size 3477425 From 06b9586fd39d96bfb2358682f243d2532957dbba Mon Sep 17 00:00:00 2001 From: MarcelHara Date: Sun, 30 Apr 2023 13:04:19 +0100 Subject: [PATCH 6/6] Duplicated Build for merge --- Content/Levels/Build.umap | 4 ++-- Content/Levels/Build1.umap | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 Content/Levels/Build1.umap diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 4747416..db53333 100644 --- a/Content/Levels/Build.umap +++ b/Content/Levels/Build.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56a63a656f064913878defec4f49729fa62830b1849fb40d0c93f41b5ee42592 -size 3477425 +oid sha256:e1666ceea1e523917f0969e94a3ccf1ba81a0125f588755f456fa421531d6fee +size 3477153 diff --git a/Content/Levels/Build1.umap b/Content/Levels/Build1.umap new file mode 100644 index 0000000..f0cc717 --- /dev/null +++ b/Content/Levels/Build1.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f3b2c5a2b47ee8d2c90591de82524910ff28f2c2ccb0119676d1d4f0aa133ec +size 3469312