Keeper317/open-conflict
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Main Rebase #5

Merged
Keeper317 merged 16 commits from main into MenusAndStuffpt2 2026-01-03 06:25:24 +00:00
Conversation 0 Commits 16 Files Changed 12 +3
3 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5f827eeadf - Show all commits

BIN
Content/ProofOfConcept/DDICharacter_BP.uasset
View File

Binary file not shown.

1
Source/OpenConflict/PlayerCharacter/DDICharacter.cpp
View File

@@ -83,6 +83,7 @@ void ADDICharacter::Server_SpawnProjectile_Implementation()
void ADDICharacter::Client_CharacterHit_Implementation() void ADDICharacter::Client_CharacterHit_Implementation()
{ {
TakeDamage(10); TakeDamage(10);
OnDamageTaken();
} }
bool ADDICharacter::Client_CharacterHit_Validate() bool ADDICharacter::Client_CharacterHit_Validate()

2
Source/OpenConflict/PlayerCharacter/DDICharacter.h
View File

@@ -24,6 +24,8 @@ protected:
/*Properties*/ /*Properties*/
/*Functions*/ /*Functions*/
UFUNCTION(BlueprintImplementableEvent, Category = "Events")
void OnDamageTaken();
public: public:
/*Properties*/ /*Properties*/