Merge branch 'main' of github.com:TheRiverNyx/ElistriaCalling

Browse Source

# Conflicts:
#	Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BPC_PlayerStats.uasset
#	Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset
#	Elistria_Calling/Content/MAIN_CONTENT/UI/WB_MainHUD.uasset
#	Elistria_Calling/Source/Elistria_Calling/Private/Attributes/LevelAttributeSet.cpp
#	Elistria_Calling/Source/Elistria_Calling/Private/Attributes/StaminaAttributeSet.cpp
#	Elistria_Calling/Source/Elistria_Calling/Private/Player/MagickPlayerState.cpp
#	Elistria_Calling/Source/Elistria_Calling/Public/Attributes/StaminaAttributeSet.h
#	Elistria_Calling/Source/Elistria_Calling/Public/Player/MagickPlayerState.h

...

This commit is contained in:

Nyx

2025-10-06 04:22:29 -06:00

parent f32d8cf0d6 eddf4b0ad9

commit cf27248f9c

3 changed files with 6 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BPC_PlayerStats.uasset LFS

Binary file not shown.

BIN

Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset LFS

Binary file not shown.