Commit Graph

20 Commits

Author SHA1 Message Date
3f7c78d5a1 Updated Healing & Buff Jelly Item Icons 2023-05-20 01:16:08 +01:00
0d7e8c5187 Bugfix Quest System for Pendant Quest 2023-05-15 04:02:05 +01:00
3b828bb01c Updated Quests for Final Kill Boss Quest 2023-05-14 23:02:09 +01:00
85394b0b72 Rebuilt All Images as Some Were Corrupted Failing Build 2023-05-13 22:35:50 +01:00
4d21cf7fda Added Final Quest [WIP] 2023-05-13 20:21:21 +01:00
bef64d33e3 Bugfix Sisters Pendant Quests 2023-05-13 17:51:23 +01:00
MarcelHara
b446ba7691 Updated Tooltip for all the items 2023-05-13 17:22:30 +01:00
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
MarcelHara
e241c76d89 Changed Item tooltips to look better and overhauled item logic 2023-05-13 17:10:36 +01:00
ea9c05fd88 Updated Item Icons for Buff and Healing Jellies 2023-05-13 16:55:49 +01:00
c2e3ef5168 Updated UI for New Designs 2023-05-13 01:02:47 +01:00
3aca076981 Updated Sisters Quest & Wrapped Text on Selections 2023-05-12 13:08:00 +01:00
902163d4fe Updated Merchant for Pendant Quest & Attempted to Replace Open Dialogue 2023-05-11 08:52:30 +01:00
2ddb44d070 Added Sisters Pendant Quest Item for Side Quest 2023-05-11 06:15:45 +01:00
d197dc4d7e Updated Both Jellies to Use New Icons 2023-05-11 05:20:58 +01:00
88f73fe5db Updated Build for Pick Up Book & Gun Quest 2023-05-11 04:50:45 +01:00
daaa624dd9 Exposed Quest Flags to Dialogue System 2023-05-04 06:31:59 +01:00
f24fcc2d25 Updated Quest System for UI 2023-05-04 05:04:37 +01:00
d1f959a9dc Updated Quest & Dialogue to Add Quests from Dialogue 2023-05-02 07:16:40 +01:00
e3027fcd24 Updated Quest System for Functionality 2023-05-02 05:42:48 +01:00