From cf652c65df462d082382fa6ef50566fa646edb32 Mon Sep 17 00:00:00 2001 From: GageM Date: Thu, 8 Feb 2024 15:04:00 -0500 Subject: [PATCH 1/4] - Changed some blueprints --- Content/Unbread/Art/Materials/M_Diffuse_Material.uasset | 4 ++-- Content/Unbread/Art/Materials/M_Shiny_Material.uasset | 4 ++-- Content/Unbread/Core/Character/BP_Character.uasset | 4 ++-- Content/Unbread/Core/GameModes/BP_GameMode.uasset | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Content/Unbread/Art/Materials/M_Diffuse_Material.uasset b/Content/Unbread/Art/Materials/M_Diffuse_Material.uasset index 389dec79..0d2268d6 100644 --- a/Content/Unbread/Art/Materials/M_Diffuse_Material.uasset +++ b/Content/Unbread/Art/Materials/M_Diffuse_Material.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40faf17bdb71e46434ba9253d2e1a258dfc65f3decf08fcd94c875be17fe7768 -size 11173 +oid sha256:d947579a05c83e4783f712e7dbca0ac2ae076d6bf442d40d1df15ab84dc88176 +size 12405 diff --git a/Content/Unbread/Art/Materials/M_Shiny_Material.uasset b/Content/Unbread/Art/Materials/M_Shiny_Material.uasset index c248572b..d286a2a5 100644 --- a/Content/Unbread/Art/Materials/M_Shiny_Material.uasset +++ b/Content/Unbread/Art/Materials/M_Shiny_Material.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f6d41878dbc9094ed753a1988c11f8d79eeacb559a0d3066ab976e67ff700a1 -size 11823 +oid sha256:cf77bab2e03b1d1fceef38e1f9d35707e820323f2c98b5a5d5f55d958e354c0d +size 12874 diff --git a/Content/Unbread/Core/Character/BP_Character.uasset b/Content/Unbread/Core/Character/BP_Character.uasset index e7965a81..a1d362f7 100644 --- a/Content/Unbread/Core/Character/BP_Character.uasset +++ b/Content/Unbread/Core/Character/BP_Character.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:518b56ff0cc4b4e08165abade2e7fd6bce37e54382f688f800fcd9f1efd62df5 -size 261501 +oid sha256:99aff1017d883fb00036b75672a290733a81c8a041ef355053e0a01d358f3630 +size 373783 diff --git a/Content/Unbread/Core/GameModes/BP_GameMode.uasset b/Content/Unbread/Core/GameModes/BP_GameMode.uasset index 01535c55..21cea205 100644 --- a/Content/Unbread/Core/GameModes/BP_GameMode.uasset +++ b/Content/Unbread/Core/GameModes/BP_GameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afacb9f4706703d9e026d6601bf5b797ccf013ced4e9e86ebc6a0c42b6adda5e -size 19696 +oid sha256:da815b1573c98093da7bcae918a2bee48b7e0d6590c1f4a47d7c7214c28368fa +size 20183 From 39e12c04fc4fb6f82a9c91c9ef8cd42e7f3916f3 Mon Sep 17 00:00:00 2001 From: GageM Date: Thu, 8 Feb 2024 17:48:13 -0500 Subject: [PATCH 2/4] - Added meshes for the body and head - player now launches their head - Added a crumble pile that the player can use to turn back into a whole character - Worked on my blockout test level to test new features - updated CameraRegisterLookAtTarget to default to farther away from its target - messed with the controls (Inttteract now splits player, Utility now rejoins the player - Added a Cookie Interface which will probably never be used --- .../Characters/GingerbreadMan/GBM_Body.uasset | 3 +++ .../GBM_Body_PhysicsAsset.uasset | 3 +++ .../Characters/GingerbreadMan/GBM_Head.uasset | 3 +++ .../Core/Character/BP_Character.uasset | 4 +-- .../Core/Character/BP_ExplodingBody.uasset | 3 +++ .../BP_CameraRegisterLookAtTarget.uasset | 4 +-- .../Core/Interactables/BP_CrumblePile.uasset | 3 +++ Content/Unbread/Maps/BlockoutLevelTest.umap | 4 +-- Source/unbread/Private/CookieInterface.cpp | 6 +++++ Source/unbread/Public/CookieInterface.h | 27 +++++++++++++++++++ Source/unbread/Public/InteractInterface.h | 3 +++ 11 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 Content/Unbread/Art/Characters/GingerbreadMan/GBM_Body.uasset create mode 100644 Content/Unbread/Art/Characters/GingerbreadMan/GBM_Body_PhysicsAsset.uasset create mode 100644 Content/Unbread/Art/Characters/GingerbreadMan/GBM_Head.uasset create mode 100644 Content/Unbread/Core/Character/BP_ExplodingBody.uasset create mode 100644 Content/Unbread/Core/Interactables/BP_CrumblePile.uasset create mode 100644 Source/unbread/Private/CookieInterface.cpp create mode 100644 Source/unbread/Public/CookieInterface.h diff --git a/Content/Unbread/Art/Characters/GingerbreadMan/GBM_Body.uasset b/Content/Unbread/Art/Characters/GingerbreadMan/GBM_Body.uasset new file mode 100644 index 00000000..18d0c708 --- /dev/null +++ b/Content/Unbread/Art/Characters/GingerbreadMan/GBM_Body.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:538151b71f31566c2e08336a42bcfaed1866d89431662a9d42a288c888e5f6fd +size 5031141 diff --git a/Content/Unbread/Art/Characters/GingerbreadMan/GBM_Body_PhysicsAsset.uasset b/Content/Unbread/Art/Characters/GingerbreadMan/GBM_Body_PhysicsAsset.uasset new file mode 100644 index 00000000..eed0d9d6 --- /dev/null +++ b/Content/Unbread/Art/Characters/GingerbreadMan/GBM_Body_PhysicsAsset.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cf6393ce923e4f57eee733a2a66c430a0cfa3a60d384d74d5cc90599ceb21af +size 11984 diff --git a/Content/Unbread/Art/Characters/GingerbreadMan/GBM_Head.uasset b/Content/Unbread/Art/Characters/GingerbreadMan/GBM_Head.uasset new file mode 100644 index 00000000..3783b1e9 --- /dev/null +++ b/Content/Unbread/Art/Characters/GingerbreadMan/GBM_Head.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:befae33e92d8b8f407a82a553d64aa5fa9e98e5fec15821ca6b2af61b09aa344 +size 2486798 diff --git a/Content/Unbread/Core/Character/BP_Character.uasset b/Content/Unbread/Core/Character/BP_Character.uasset index a1d362f7..9292d690 100644 --- a/Content/Unbread/Core/Character/BP_Character.uasset +++ b/Content/Unbread/Core/Character/BP_Character.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99aff1017d883fb00036b75672a290733a81c8a041ef355053e0a01d358f3630 -size 373783 +oid sha256:ff5e1e63270755677552de52e25445566dc89775463d10e614c16e23b6e54c04 +size 440062 diff --git a/Content/Unbread/Core/Character/BP_ExplodingBody.uasset b/Content/Unbread/Core/Character/BP_ExplodingBody.uasset new file mode 100644 index 00000000..5d4863d4 --- /dev/null +++ b/Content/Unbread/Core/Character/BP_ExplodingBody.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:070463f1610846a9ebe8f8157474a021d5a31878b07f202d3e87874ff560f629 +size 30917 diff --git a/Content/Unbread/Core/DynamicCamera/Release/BP_CameraRegisterLookAtTarget.uasset b/Content/Unbread/Core/DynamicCamera/Release/BP_CameraRegisterLookAtTarget.uasset index 8b2a6ea5..629a56dd 100644 --- a/Content/Unbread/Core/DynamicCamera/Release/BP_CameraRegisterLookAtTarget.uasset +++ b/Content/Unbread/Core/DynamicCamera/Release/BP_CameraRegisterLookAtTarget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1bd1b9b66291005cb1d3680a48e7a3373e3dd6b3b26352c2345cc302863e4e32 -size 86759 +oid sha256:7cadc7fc4d445ce91dba178fb4fb7ec88a5e3442092c90a66dcea75235b1bbfb +size 113130 diff --git a/Content/Unbread/Core/Interactables/BP_CrumblePile.uasset b/Content/Unbread/Core/Interactables/BP_CrumblePile.uasset new file mode 100644 index 00000000..1878cdfd --- /dev/null +++ b/Content/Unbread/Core/Interactables/BP_CrumblePile.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd0f8d38b8d1806c05958a0d734f3f84d4623c202d86f7772ec39d02862dad97 +size 71656 diff --git a/Content/Unbread/Maps/BlockoutLevelTest.umap b/Content/Unbread/Maps/BlockoutLevelTest.umap index d7090358..b3c3bf81 100644 --- a/Content/Unbread/Maps/BlockoutLevelTest.umap +++ b/Content/Unbread/Maps/BlockoutLevelTest.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afee160c5e2a5caf6758d389e41779f37ff99449c643f14cf69560de131ae899 -size 101423 +oid sha256:1494459ed2cb5dabf1771efea1d32180111a7eadf9eacf121918b94e2f609ce0 +size 103595 diff --git a/Source/unbread/Private/CookieInterface.cpp b/Source/unbread/Private/CookieInterface.cpp new file mode 100644 index 00000000..4c08cd6f --- /dev/null +++ b/Source/unbread/Private/CookieInterface.cpp @@ -0,0 +1,6 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "CookieInterface.h" + +// Add default functionality here for any ICookieInterface functions that are not pure virtual. diff --git a/Source/unbread/Public/CookieInterface.h b/Source/unbread/Public/CookieInterface.h new file mode 100644 index 00000000..3cea17a1 --- /dev/null +++ b/Source/unbread/Public/CookieInterface.h @@ -0,0 +1,27 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "UObject/Interface.h" +#include "CookieInterface.generated.h" + +// This class does not need to be modified. +UINTERFACE(MinimalAPI) +class UCookieInterface : public UInterface +{ + GENERATED_BODY() +}; + +/** + * + */ +class UNBREAD_API ICookieInterface +{ + GENERATED_BODY() + + // Add interface functions to this class. This is the class that will be inherited to implement this interface. +public: + UFUNCTION(BlueprintCallable, BlueprintNativeEvent, Category = "Camera Interface Events") + void SetCanRevert(AActor* CameraActor); +}; diff --git a/Source/unbread/Public/InteractInterface.h b/Source/unbread/Public/InteractInterface.h index 77f7acf0..bc8a90b8 100644 --- a/Source/unbread/Public/InteractInterface.h +++ b/Source/unbread/Public/InteractInterface.h @@ -31,4 +31,7 @@ class UNBREAD_API IInteractInterface void BeginFocus(); UFUNCTION(BlueprintNativeEvent, BlueprintCallable, Category="Interact") void EndFocus(); + + UFUNCTION(BlueprintNativeEvent, BlueprintCallable, Category="Interact") + void CrumbleInteraction(AActor* InstigatingActor); }; From 15fa04fcf6661c25b976542c73e254e15e7a614e Mon Sep 17 00:00:00 2001 From: GageM Date: Thu, 8 Feb 2024 18:00:37 -0500 Subject: [PATCH 3/4] - Fixed SpawnVolume to register pawns on overlap - Changed the cameras in DeathTesting to reset to default when the player leaves their area --- Content/Unbread/Core/Character/BP_Character.uasset | 4 ++-- Content/Unbread/Environment/SpawnVolume.uasset | 4 ++-- Content/Unbread/Maps/DeathTesting.umap | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Content/Unbread/Core/Character/BP_Character.uasset b/Content/Unbread/Core/Character/BP_Character.uasset index 9292d690..d77e759e 100644 --- a/Content/Unbread/Core/Character/BP_Character.uasset +++ b/Content/Unbread/Core/Character/BP_Character.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff5e1e63270755677552de52e25445566dc89775463d10e614c16e23b6e54c04 -size 440062 +oid sha256:b13c4b2a978736c437dff699ba54eea2ca88483968dc1330786619238ed52139 +size 433507 diff --git a/Content/Unbread/Environment/SpawnVolume.uasset b/Content/Unbread/Environment/SpawnVolume.uasset index 7457876c..9f361b38 100644 --- a/Content/Unbread/Environment/SpawnVolume.uasset +++ b/Content/Unbread/Environment/SpawnVolume.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8d94e3724c699515cdf7df2fc5d4d10c745a9aca84485e75dc233ee30519423 -size 56811 +oid sha256:9ec96438e8886b588bdea3bd76039821e04617f37ef4b986b6897ce4623a6041 +size 55873 diff --git a/Content/Unbread/Maps/DeathTesting.umap b/Content/Unbread/Maps/DeathTesting.umap index fc07fd9c..04d02022 100644 --- a/Content/Unbread/Maps/DeathTesting.umap +++ b/Content/Unbread/Maps/DeathTesting.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9503a2c5f4c84507df3e1921fa5fc6397a5ae9dbfc57c2eb93e78c385b6f62e2 -size 75690 +oid sha256:5416f5886a8726096a083e28c9a6b84810afd24e99d5f4df1e646d55903827d3 +size 75927 From 3dab38b3b5fe1303286c832d5e52efa9a605cf6d Mon Sep 17 00:00:00 2001 From: GageM Date: Thu, 8 Feb 2024 18:03:51 -0500 Subject: [PATCH 4/4] Updated split controls to be more intuitive - Interact splits and rejoins player - Utility explodes any current bodies --- Content/Unbread/Core/Character/BP_Character.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Unbread/Core/Character/BP_Character.uasset b/Content/Unbread/Core/Character/BP_Character.uasset index d77e759e..9c155fca 100644 --- a/Content/Unbread/Core/Character/BP_Character.uasset +++ b/Content/Unbread/Core/Character/BP_Character.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b13c4b2a978736c437dff699ba54eea2ca88483968dc1330786619238ed52139 -size 433507 +oid sha256:e1615bd0f1005933ddd5ec08ecffe3aa6b7b8bc80ec9c1af2ef97630e7117e34 +size 436980