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

Merge branch 'volumetric-fog' into dev

Browse Source 
# Conflicts:
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
#	Content/Levels/Build.umap
This commit is contained in:
MarcelHara 2023-04-30 13:06:51 +01:00
commit bef17b7f04
10 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Blueprints/MainMenu/BP_MainMenuBook.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/MainMenu/WBP_MainMenu.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

3
Content/Levels/Build1.umap Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7f3b2c5a2b47ee8d2c90591de82524910ff28f2c2ccb0119676d1d4f0aa133ec
size 3469312

BIN
Content/Levels/Testing/MainMenuLevel.umap (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Levels/Testing/SneakMechanicTesting.umap (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/MainMenu/GM_MainMenu.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Particles/Break.uasset (Stored with Git LFS)
View File

Binary file not shown.

4
Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp
View File

@ -25,8 +25,8 @@ void AInteraction::BeginPlay()
Super::BeginPlay(); Super::BeginPlay();
//Character & Camera refs //Character & Camera refs
TempCharacterRef = Cast<ATempCharacter>(GetWorld()->GetFirstPlayerController()->GetCharacter()); if (TempCharacterRef != nullptr) TempCharacterRef = Cast<ATempCharacter>(GetWorld()->GetFirstPlayerController()->GetCharacter());
MainCamera = Cast<UCameraComponent>(TempCharacterRef->FindComponentByClass<UCameraComponent>()); if (MainCamera != nullptr) MainCamera = Cast<UCameraComponent>(TempCharacterRef->FindComponentByClass<UCameraComponent>());
//Item refs //Item refs
TargetHealingLocation = HealingItem->GetActorLocation(); TargetHealingLocation = HealingItem->GetActorLocation();