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
..
BaseItems	Changed Item tooltips to look better and overhauled item logic	2023-05-13 17:10:36 +01:00
Dialogue	Updated Boss for Dialogue and End Game Dialogue	2023-05-13 16:25:07 +01:00
InteractableEnvironment	Updated AI for Hearing Perception	2023-01-15 19:50:39 +00:00
MerchantInteraction	Updated Sisters Quest & Wrapped Text on Selections	2023-05-12 13:08:00 +01:00
PlayerTemp	Changed TempCharacter to cache InventoryUI	2023-05-13 16:27:39 +01:00
Quest	Updated Combat System for Minor Cosmetic Changes	2023-05-12 21:45:51 +01:00
TurnBasedCombatV2	Updated Boss for Dialogue and End Game Dialogue	2023-05-13 16:25:07 +01:00
the_twilight_abyss.Build.cs	Updated Combat to Include Camera Shake on Shoot & Wall Break	2023-04-27 05:13:41 +01:00
the_twilight_abyss.cpp	Added Blank Unreal 5 Project	2022-10-18 10:10:40 +01:00
the_twilight_abyss.h	Added Blank Unreal 5 Project	2022-10-18 10:10:40 +01:00