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

..

Characters

Changed Item tooltips to look better and overhauled item logic

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

Elements

Built Lighting for Build Level

2023-05-13 01:08:06 +01:00

Gun

Rebuilt lighting

2023-05-12 11:22:41 +01:00

InventoryImages

Added InventoryImage to Inventory UI

2023-02-27 17:45:58 +00:00

Objects

Bugfix Collisions & UV's in Maze

2023-05-13 16:42:26 +01:00

TutorialAssets

Reorganised Build Level for Easy Searchability

2023-04-30 21:25:10 +01:00