Rafal/EndlessVendetta
Rafal/EndlessVendetta
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Fixed Merge Errors

Browse Source
This commit is contained in:
Rafal Swierczek 2024-02-29 02:21:32 +00:00
parent 6e7450f3fa
commit 664ece2858
10 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/CG_HeatBlast.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Levels/MainMenuLevel.umap (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Levels/TempOpenWorld.umap (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset (Stored with Git LFS)
View File

Binary file not shown.

2
EndlessVendetta/EndlessVendetta.sln.DotSettings.user Normal file
View File

@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/Environment/Highlighting/HighlightingSourceSnapshotLocation/@EntryValue">C:\Users\Rafal\AppData\Local\JetBrains\Rider2023.3\resharper-host\temp\Rider\vAny\CoverageData\_EndlessVendetta.-1253833435\Snapshot\snapshot.utdcvr</s:String></wpf:ResourceDictionary>

1
EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.cpp
View File

@ -35,7 +35,6 @@ void AEnemyCharacter::OnDeath()
AlertLevelDelegateHandle.Reset(); AlertLevelDelegateHandle.Reset();
HuntPlayerDelegateHandle.Reset(); HuntPlayerDelegateHandle.Reset();
EnemyDied.Broadcast(); EnemyDied.Broadcast();
DelegatedControlHub->RemoveEnemyActor(this);
} }
// Called every frame // Called every frame

2
EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h
View File

@ -139,7 +139,7 @@ public:
UFUNCTION(BlueprintCallable) UFUNCTION(BlueprintCallable)
void DecrementRestrictedBoundsCount(); void DecrementRestrictedBoundsCount();
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FRestrictedAreaStatusChangedSignature, bool, bIsInRestrictedArea); DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FRestrictedAreaStatusChangedSignature, bool, bIsInRestrictedAreaLmao);
UPROPERTY(BlueprintAssignable, Category = "Restricted Area") UPROPERTY(BlueprintAssignable, Category = "Restricted Area")
FRestrictedAreaStatusChangedSignature RestrictedAreaStatusChanged; FRestrictedAreaStatusChangedSignature RestrictedAreaStatusChanged;