Commit Graph

42 Commits

Author SHA1 Message Date
Bryce Douglas Olcott
5138042732 Auto stash before rebase of "main" onto "main/main" 2025-10-14 10:48:23 -06:00
Bryce Douglas Olcott
2b794e6836 Auto stash before rebase of "main" onto "main/main" 2025-10-14 10:43:10 -06:00
Nyx
b1249b756e fixed missing BP 2025-10-13 21:52:52 -06:00
Nyx
fbc63350a3 fixing thinbgs 2025-10-09 07:17:27 -06:00
Nyx
599cd852d0 fixing things 2025-10-09 07:16:38 -06:00
Nyx
cc0a691b31 fixing things 2025-10-07 13:41:34 -06:00
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
Nyx
f32d8cf0d6 Misc Fixes 2025-10-06 04:18:03 -06:00
Nyx
eddf4b0ad9 Misc Fixes 2025-10-05 10:12:44 -06:00
Lily Wilson
1879ac91ff More UI Updates
help this sh--tuff sucks
2025-10-03 04:10:53 -06:00
Lily Wilson
4b79e5b3d1 Magick UI Update 2025-10-03 00:24:44 -06:00
Lily Wilson
79f5033967 Quest UI Updates 2025-10-02 14:41:13 -06:00
Lily Wilson
0692e8c911 Magick System Update 07 2025-10-01 13:58:00 -06:00
Lily Wilson
c9787efae2 Magick System Update 06 2025-10-01 05:38:44 -06:00
Nyx
95a2ff8de6 sync 2025-09-30 17:34:28 -06:00
Nyx
b94ca32d44 Magick stuffs 2025-09-30 12:05:13 -06:00
Nyx
dc2c5af68a magic update #2 2025-09-26 17:50:32 -06:00
Lily Wilson
fbaff3beaf Magick System UI Base + Other Shtuff 2025-09-23 17:02:41 -06:00
Nyx
d24a911761 completed climbing system 2025-09-17 22:18:55 -06:00
Nyx
90a02164bc work on climbing animations 2025-09-17 20:13:10 -06:00
Lily Wilson
09f6e8aca0 Player Movement Bug Fix + Draft Indoor Level G House 01 2025-09-09 01:30:24 -06:00
Nyx
161f8e6ade Completed crafting 2025-09-08 21:17:33 -06:00
Nyx
2009803158 fixed some errors when opening crafting menu 2025-09-08 13:49:18 -06:00
Nyx
45bd23d271 switched recipe container to wrapbox instead of uniform grid 2025-09-02 12:16:44 -06:00
Nyx
f33c22ef73 worked on inventory system 2025-09-01 23:20:18 -06:00
Nyx
d0073dda4e started on refactoring for multiplayer, started crafting system 2025-08-29 00:55:23 -06:00
Lily Wilson
9a5c058dcd Player, Dummy, AI-Dummy Damage Bug Fix 2025-04-17 09:52:51 -06:00
Kaitlyn Kinsey
f3970af546 AI Enemy Hearing Detection and Dealing Damage 2025-04-16 20:55:25 -06:00
Lily Wilson
ffba4575c0 City #1 Update Shrine + Quest System Bug Fixes 2025-04-16 16:32:38 -06:00
Lily Wilson
3851066d72 Lighting, Volcano Particle Effects, Water Adjustments 2025-04-13 15:42:39 -06:00
Lily Wilson
0db21d8e62 Bug Fixes 2025-04-01 23:34:51 -06:00
Lily Wilson
24570f9383 Equipment System: Bow + Shield Equip, Menu Bug Fixes 2025-04-01 22:44:00 -06:00
Kaitlyn Kinsey
50bdbd061d Added Quest Objectives and Quest Giver Dialogue 2025-03-28 22:24:13 -06:00
Lily Wilson
c294b06952 Equipment System: UI Menu Panel and Equippable Button Slotss 2025-03-27 20:21:38 -06:00
Lily Wilson
0ee611ac7d Combat System: Target Locking + Dodge Rolling 2025-03-26 09:51:07 -06:00
Lily Wilson
17cea6de78 Combat VFX + UI: Blood Particles, Enemy Health + Death 2025-03-26 07:20:35 -06:00
Lily Wilson
ed11931352 Combat System: Punch/Kick Hit Detection + Audio 2025-03-26 06:16:33 -06:00
Kaitlyn Kinsey
0285e10782 Basic Quest System and UI 2025-03-26 03:33:03 -06:00
Lily Wilson
cf31e9126a Combat System: Punch Attack Combo + Audio 2025-03-25 23:52:55 -06:00
Lily Wilson
64498dea39 Audio: Walking, Running, Jump, Vault, and UI 2025-03-25 22:15:32 -06:00
Lily Wilson
2c6b7b5cb9 Player Stats: Level + XP, with UI 2025-03-25 21:00:37 -06:00
Lily Wilson
e31a9b2879 Player Stats: Health, Stamina, XP, with UI 2025-03-25 09:33:23 -06:00