PHILIP White d8dcef64e8 Merge branch 'merchant-system' into Turn-Base-System ...

# Conflicts:
#	Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp

2022-11-14 22:41:33 +00:00

..

Combat_UI

Updated Combat_UI for Battle Log

2022-11-14 22:30:31 +00:00

Items

Added HealingJelly Item, Added PlayerInventory

2022-11-14 19:22:50 +00:00

BP_CrossHair.uasset

Working on TraceChannel for merchant hit detect

2022-11-10 16:38:38 +00:00

BP_Interaction.uasset

Updated Interaction,TempCharacter to cleanup

2022-11-13 22:21:51 +00:00

BP_MyTempCharacter.uasset

Updated AllInventory BP's

2022-11-14 22:40:09 +00:00

WBP_ItemDisplay.uasset

Updated AllInventory BP's

2022-11-14 22:40:09 +00:00

WBP_PlayerInventory.uasset

Updated AllInventory BP's

2022-11-14 22:40:09 +00:00