Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Merge branch 'recolour-merchantUI' into dev

Browse Source
This commit is contained in:
MarcelHara 2023-05-13 18:16:59 +01:00
commit 70ee7e5e98
14 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Blueprints/Combat_UI/CombatCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Game_UI/WBP_PlayerInventory.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Game_UI/WBP_Settings.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Merchant/Merchant_UI/BuyUI.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Merchant/Merchant_UI/CancelUi.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Merchant/Merchant_UI/ExitButtonBlack.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Merchant/Merchant_UI/whitearrowleft.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Merchant/Merchant_UI/whitearrowright.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Player/BP_MyTempCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

10
Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
View File

@ -50,13 +50,13 @@ void ATempCharacter::BeginPlay()
CrossHairWidget->SetVisibility(ESlateVisibility::Visible); CrossHairWidget->SetVisibility(ESlateVisibility::Visible);
CrossHairWidget->AddToViewport(); CrossHairWidget->AddToViewport();
// ImportantStatsWidget = CreateWidget<UUserWidget>(GetWorld(), ImportantStatsSub);
// ImportantStatsWidget->SetVisibility(ESlateVisibility::Visible);
// ImportantStatsWidget->AddToViewport();
InventoryWidget = CreateWidget<UUserWidget>(GetWorld(), InventoryMenuSub); InventoryWidget = CreateWidget<UUserWidget>(GetWorld(), InventoryMenuSub);
InventoryWidget->SetVisibility(ESlateVisibility::Hidden); InventoryWidget->SetVisibility(ESlateVisibility::Hidden);
InventoryWidget->AddToViewport(); InventoryWidget->AddToViewport();
EscapeMenuWidget = CreateWidget<UUserWidget>(GetWorld(), EscapeMenuSub);
EscapeMenuWidget->SetVisibility(ESlateVisibility::Hidden);
EscapeMenuWidget->AddToViewport();
} }
//Binds the input we made in the setup player component to the forward vector //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(); APlayerController* PlayerController = GetWorld()->GetFirstPlayerController();
PlayerController->SetInputMode(FInputModeGameOnly()); PlayerController->SetInputMode(FInputModeGameOnly());
PlayerController->bShowMouseCursor = false; PlayerController->bShowMouseCursor = false;
PlayerController->SetIgnoreMoveInput(false);
PlayerController->SetIgnoreLookInput(false);
UE_LOG(LogTemp, Display, TEXT("Enabling Inputs")); UE_LOG(LogTemp, Display, TEXT("Enabling Inputs"));
disableTab = true; disableTab = true;

6
Source/the_twilight_abyss/PlayerTemp/TempCharacter.h
View File

@ -120,6 +120,9 @@ public:
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets") UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets")
UUserWidget* InventoryWidget; UUserWidget* InventoryWidget;
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets")
UUserWidget* EscapeMenuWidget;
UPROPERTY(EditAnywhere, Category= "Widgets") UPROPERTY(EditAnywhere, Category= "Widgets")
TSubclassOf<UUserWidget> ImportantStatsSub; TSubclassOf<UUserWidget> ImportantStatsSub;
@ -127,6 +130,9 @@ public:
UPROPERTY(EditAnywhere, Category= "Widgets") UPROPERTY(EditAnywhere, Category= "Widgets")
TSubclassOf<UUserWidget> InventoryMenuSub; TSubclassOf<UUserWidget> InventoryMenuSub;
UPROPERTY(EditAnywhere, Category= "Widgets")
TSubclassOf<UUserWidget> EscapeMenuSub;
UPROPERTY(EditAnywhere, Category= "Widgets") UPROPERTY(EditAnywhere, Category= "Widgets")
TSubclassOf<UUserWidget> CrossHairSub; TSubclassOf<UUserWidget> CrossHairSub;