PHILIP White 7e81387247 Merge remote-tracking branch 'origin/merchant-system-v4' into Turn-Based-Combat ...

# Conflicts:
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset

2023-01-31 00:50:59 +00:00

..

Combat_UI

Bugfix Clicking Instantly Activates Combat

2023-01-31 00:30:45 +00:00

Display_UI

Changed BP_GoldCount to BP_ImportantStats

2023-01-14 22:11:15 +00:00

Inventory_UI

Updated ItemDisplay WBP

2023-01-12 13:56:02 +00:00

Items

Updated Items

2022-11-29 15:44:00 +00:00

Merchant

Updated WBP_ShopSelector

2023-01-30 17:20:22 +00:00

Player

Updated WBP_ShopSelector

2023-01-30 17:20:22 +00:00

BP_HealingJellyItem.uasset

Created Inventory_UI Folder

2022-11-23 17:29:14 +00:00

BP_Interaction.uasset

Organized Content Browser

2022-11-23 17:26:35 +00:00