diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index 80cb558..e2ed262 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:a180096cc5560177bf7977224b3f7d238fe14be0a789a8955f39dbeec3931ac0 -size 193430 +oid sha256:36c9ebe9529f030aefe1303c8810815999d714fdd5ed92db182cbcc0b967a593 +size 193433 diff --git a/Content/Blueprints/Game_UI/WBP_PlayerInventory.uasset b/Content/Blueprints/Game_UI/WBP_PlayerInventory.uasset index 8813046..845d124 100644 --- a/Content/Blueprints/Game_UI/WBP_PlayerInventory.uasset +++ b/Content/Blueprints/Game_UI/WBP_PlayerInventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f5abbdb76b47f2f03f673a2d9b3356518196a19d2d95c689917179799291ea5 -size 122856 +oid sha256:22c2a132cd17fcda7502297f0b909b44cd8112b456b9c1fb3a2fd01c36f5b32d +size 123731 diff --git a/Content/Blueprints/Game_UI/WBP_Settings.uasset b/Content/Blueprints/Game_UI/WBP_Settings.uasset index a13dffd..72373b5 100644 --- a/Content/Blueprints/Game_UI/WBP_Settings.uasset +++ b/Content/Blueprints/Game_UI/WBP_Settings.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cf7561dc6488950258c4b96686cf7a521c5796e70ad3fb1eb7c002f51ece3ed -size 44996 +oid sha256:fac05e817f3c430126ceddb0635de0e5669b36fe18f9a659258db4f0644a5918 +size 87206 diff --git a/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset index 555d903..e7b3db4 100644 --- a/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset +++ b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb8747465ea11ce180bdba25539e7625e09e20685688b6302fe79bdd522d8fc6 -size 56996 +oid sha256:aec7ba24ce247fd76c78b8e63154e1e66ccb77ed2e8b55bb6df0293e5ccefd3d +size 59275 diff --git a/Content/Blueprints/Merchant/Merchant_UI/BuyUI.uasset b/Content/Blueprints/Merchant/Merchant_UI/BuyUI.uasset new file mode 100644 index 0000000..0ffb1d6 --- /dev/null +++ b/Content/Blueprints/Merchant/Merchant_UI/BuyUI.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:642e20b08a4ad568449590d0ab1a6b949640b7e268c4aa7806803bf2bd406d0f +size 73813 diff --git a/Content/Blueprints/Merchant/Merchant_UI/CancelUi.uasset b/Content/Blueprints/Merchant/Merchant_UI/CancelUi.uasset new file mode 100644 index 0000000..52c5369 --- /dev/null +++ b/Content/Blueprints/Merchant/Merchant_UI/CancelUi.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8964d3b715a28f6ef51e7c1b72bd9d4b19537396852a29c83c61856ef7c6bd3 +size 74451 diff --git a/Content/Blueprints/Merchant/Merchant_UI/ExitButtonBlack.uasset b/Content/Blueprints/Merchant/Merchant_UI/ExitButtonBlack.uasset new file mode 100644 index 0000000..8d96518 --- /dev/null +++ b/Content/Blueprints/Merchant/Merchant_UI/ExitButtonBlack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d92651c0a8880be38ac200e86ac89e68809bb7263793ed8f140fc3f472f026a5 +size 58963 diff --git a/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset index 5126614..914fd9a 100644 --- a/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset +++ b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8f26346ad1ab9c7efbfa41c4f94c4b4c9427283cfef16a06e9d7ac8abcea960 -size 68987 +oid sha256:78f9bd03821449914bca7960ae0090fea1cbedd7c9ad184db32eadcd9ca99396 +size 70670 diff --git a/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset index c521a6f..e1a5bd8 100644 --- a/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset +++ b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56186ac7df1d92f8e57d4ccc87f80187e3e4fd090de6a261a15f193b7dd54939 -size 69067 +oid sha256:546345d3635e5ee96e6957c4ea50339826cb7c8014d92ce53b8d22fb8f2eb43f +size 70900 diff --git a/Content/Blueprints/Merchant/Merchant_UI/whitearrowleft.uasset b/Content/Blueprints/Merchant/Merchant_UI/whitearrowleft.uasset new file mode 100644 index 0000000..7a74839 --- /dev/null +++ b/Content/Blueprints/Merchant/Merchant_UI/whitearrowleft.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13632f32e2df869c1e015f0f7f1a5c29fc8d93471c06006450c5093f5c324e46 +size 45699 diff --git a/Content/Blueprints/Merchant/Merchant_UI/whitearrowright.uasset b/Content/Blueprints/Merchant/Merchant_UI/whitearrowright.uasset new file mode 100644 index 0000000..b2e4cb0 --- /dev/null +++ b/Content/Blueprints/Merchant/Merchant_UI/whitearrowright.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb0f29c2d8812b42c87214239ab0b5eb719eaa63bf8fed89175d64488ccd2a63 +size 45281 diff --git a/Content/Blueprints/Player/BP_MyTempCharacter.uasset b/Content/Blueprints/Player/BP_MyTempCharacter.uasset index 550cb13..9e8fa10 100644 --- a/Content/Blueprints/Player/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/Player/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:daf074d26576c0c59567ebbc044edc0475e2e92c636ec8efcf86ad12f7b57839 -size 98874 +oid sha256:343af60d6c68788e9d14acc8091db587b2f1170bedad5efb1f0df8c5f4ea6765 +size 144542 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index c97a2cf..d67f3d0 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -50,13 +50,13 @@ void ATempCharacter::BeginPlay() CrossHairWidget->SetVisibility(ESlateVisibility::Visible); CrossHairWidget->AddToViewport(); - // ImportantStatsWidget = CreateWidget(GetWorld(), ImportantStatsSub); - // ImportantStatsWidget->SetVisibility(ESlateVisibility::Visible); - // ImportantStatsWidget->AddToViewport(); - InventoryWidget = CreateWidget(GetWorld(), InventoryMenuSub); InventoryWidget->SetVisibility(ESlateVisibility::Hidden); InventoryWidget->AddToViewport(); + + EscapeMenuWidget = CreateWidget(GetWorld(), EscapeMenuSub); + EscapeMenuWidget->SetVisibility(ESlateVisibility::Hidden); + EscapeMenuWidget->AddToViewport(); } //Binds the input we made in the setup player component to the forward vector @@ -278,6 +278,8 @@ void ATempCharacter::InputEnabler() APlayerController* PlayerController = GetWorld()->GetFirstPlayerController(); PlayerController->SetInputMode(FInputModeGameOnly()); PlayerController->bShowMouseCursor = false; + PlayerController->SetIgnoreMoveInput(false); + PlayerController->SetIgnoreLookInput(false); UE_LOG(LogTemp, Display, TEXT("Enabling Inputs")); disableTab = true; diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 34d6aac..57e55b9 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -120,6 +120,9 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets") UUserWidget* InventoryWidget; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets") + UUserWidget* EscapeMenuWidget; UPROPERTY(EditAnywhere, Category= "Widgets") TSubclassOf ImportantStatsSub; @@ -127,6 +130,9 @@ public: UPROPERTY(EditAnywhere, Category= "Widgets") TSubclassOf InventoryMenuSub; + UPROPERTY(EditAnywhere, Category= "Widgets") + TSubclassOf EscapeMenuSub; + UPROPERTY(EditAnywhere, Category= "Widgets") TSubclassOf CrossHairSub;