5 Commits

Author	SHA1	Message	Date
MarcelHara	e3d3061843	Merge branch 'dev' into inventory-ui-overhaul ... # Conflicts: # Content/Assets/Characters/Merchant/AMerchant.uasset # Content/Blueprints/Combat_UI/CombatCharacter.uasset # Content/Blueprints/Items/BP_BuffJelly.uasset # Content/Blueprints/Items/BP_HealingJelly.uasset # Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset # Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset # Content/Blueprints/Quests/Quest_SistersPendant.uasset # Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset # Content/Dialogue/SM_Merchant_Blueprint.uasset	2023-05-13 17:15:48 +01:00
MarcelHara	e241c76d89	Changed Item tooltips to look better and overhauled item logic	2023-05-13 17:10:36 +01:00
PHILIP White	ea9c05fd88	Updated Item Icons for Buff and Healing Jellies	2023-05-13 16:55:49 +01:00
PHILIP White	c2e3ef5168	Updated UI for New Designs	2023-05-13 01:02:47 +01:00
PHILIP White	902163d4fe	Updated Merchant for Pendant Quest & Attempted to Replace Open Dialogue	2023-05-11 08:52:30 +01:00