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

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
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BPC_PlayerStats.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.

4
Elistria_Calling/Content/MAIN_CONTENT/UI/WB_MainHUD.uasset
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:420587b59805823464de8d2c8e1fa202dee011608b7c52e2cc8a947901099b2a oid sha256:e6499614f53125133cc54f123b53b6bc095ddf1bae8cedbc398cdb3b76077f6d
size 367136 size 135350