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

..

Headcut

Updated UI for New Designs

2023-05-13 01:02:47 +01:00

Quest_SistersPendant_PT2.uasset

Merge branch 'dev' into inventory-ui-overhaul

2023-05-13 17:15:48 +01:00

Quest_SistersPendant.uasset

Merge branch 'dev' into inventory-ui-overhaul

2023-05-13 17:15:48 +01:00

Quest_Start2.uasset

Updated Quest System for UI

2023-05-04 05:04:37 +01:00

Quest_Start.uasset

Updated Build for Pick Up Book & Gun Quest

2023-05-11 04:50:45 +01:00