AzureAbyss

History

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

Icons

Updated Item Icons for Buff and Healing Jellies

2023-05-13 16:55:49 +01:00

ItemMaterials

Added All Item ammo types

2023-03-13 17:00:08 +00:00

ItemsInWorld

Changed Item tooltips to look better and overhauled item logic

2023-05-13 17:10:36 +01:00

AmmoItem.uasset

Added All Item ammo types