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

# 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

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

..

BP_AnimNotify_KickTrace.uasset

AI Enemy Hearing Detection and Dealing Damage

2025-04-16 20:55:25 -06:00

BP_AnimNotify_PunchTrace.uasset

AI Enemy Hearing Detection and Dealing Damage

2025-04-16 20:55:25 -06:00

BP_GameState.uasset

started on refactoring for multiplayer, started crafting system

2025-08-29 00:55:23 -06:00

BP_MagickPlayerState.uasset

Misc Fixes

2025-10-06 04:18:03 -06:00

BP_PlayerController.uasset

Misc Fixes

2025-10-06 04:18:03 -06:00

BP_Punch_CameraShake.uasset

Combat System: Punch/Kick Hit Detection + Audio

2025-03-26 06:16:33 -06:00

BP_TestDummy.uasset

City #1 Update Shrine + Quest System Bug Fixes

2025-04-16 16:32:38 -06:00

BP_WaterBodyOcean.uasset

Lighting, Volcano Particle Effects, Water Adjustments

2025-04-13 15:42:39 -06:00

BPC_AttackSystem.uasset

worked on inventory system

2025-09-01 23:20:18 -06:00

BPC_PlayerStats.uasset

Misc Fixes

2025-10-06 04:18:03 -06:00

BPI_Assassination.uasset

Player Stats: Health, Stamina, XP, with UI

2025-03-25 09:33:23 -06:00

BPI_PlayerControlled.uasset

magic update #2

2025-09-26 17:50:32 -06:00