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
..
BungeeManPortrait.uasset	Added Base Stub for Quest System	2023-03-13 05:19:13 +00:00
ButtonOutline.uasset	Updated Dialogue UI for Style Consistency	2023-05-01 05:22:56 +01:00
DialogueTest.umap	Updated Dialogue UI for Style Consistency	2023-05-01 05:22:56 +01:00
MerchantSisterHeadCut.uasset	Updated Dialogue UI for Style Consistency	2023-05-01 05:22:56 +01:00
NPCTest.uasset	Updated Dialogue UI for Style Consistency	2023-05-01 05:22:56 +01:00
SM_Merchant_Blueprint.uasset	Changed Item tooltips to look better and overhauled item logic	2023-05-13 17:10:36 +01:00
TextPrompt.uasset	Updated Boss for Dialogue and End Game Dialogue	2023-05-13 16:25:07 +01:00