therivernyx/ElistriaCalling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Auto stash before rebase of "main" onto "main/main"

Browse Source
This commit is contained in:
Bryce Douglas Olcott
2025-10-14 10:43:10 -06:00
parent b1249b756e
commit 2b794e6836
7 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerState.uasset LFS
View File

Binary file not shown.

BIN
Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset LFS
View File

Binary file not shown.

BIN
Elistria_Calling/Content/MAIN_CONTENT/UI/WB_MainHUD.uasset LFS
View File

Binary file not shown.

3
Elistria_Calling/Source/Elistria_Calling/Public/Attributes/HealthAttributeSet.h
View File

@@ -13,8 +13,7 @@
/** /**
* *
*/ */
DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FAttributeChangedEvent, UAttributeSet*, AttributeSet, float, OldValue,
float, NewValue);
UCLASS() UCLASS()
class ELISTRIA_CALLING_API UHealthAttributeSet : public UElistriaAttributeSetBase class ELISTRIA_CALLING_API UHealthAttributeSet : public UElistriaAttributeSetBase
{ {

1
Elistria_Calling/Source/Elistria_Calling/Public/Attributes/LevelAttributeSet.h
View File

@@ -13,7 +13,6 @@
/** /**
* *
*/ */
DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FAttributeChangedEvent, UAttributeSet*, AttributeSet, float, OldValue, float, NewValue);
UCLASS() UCLASS()
class ELISTRIA_CALLING_API ULevelAttributeSet : public UElistriaAttributeSetBase class ELISTRIA_CALLING_API ULevelAttributeSet : public UElistriaAttributeSetBase
{ {

2
Elistria_Calling/Source/Elistria_Calling/Public/Attributes/StaminaAttributeSet.h
View File

@@ -11,7 +11,7 @@
/** /**
* *
*/ */
DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FAttributeChangedEvent, UAttributeSet*, AttributeSet, float, OldValue, float, NewValue);
UCLASS() UCLASS()
class ELISTRIA_CALLING_API UStaminaAttributeSet : public UElistriaAttributeSetBase class ELISTRIA_CALLING_API UStaminaAttributeSet : public UElistriaAttributeSetBase
{ {

1
Elistria_Calling/Source/Elistria_Calling/Public/ElistriaAttributeSetBase.h
View File

@@ -15,6 +15,7 @@
GAMEPLAYATTRIBUTE_VALUE_SETTER(PropertyName) \ GAMEPLAYATTRIBUTE_VALUE_SETTER(PropertyName) \
GAMEPLAYATTRIBUTE_VALUE_INITTER(PropertyName) GAMEPLAYATTRIBUTE_VALUE_INITTER(PropertyName)
DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FAttributeChangedEvent, UAttributeSet*, AttributeSet, float, OldValue, float, NewValue);
UCLASS() UCLASS()
class ELISTRIA_CALLING_API UElistriaAttributeSetBase : public UAttributeSet class ELISTRIA_CALLING_API UElistriaAttributeSetBase : public UAttributeSet
{ {