Commit Graph

39 Commits

Author SHA1 Message Date
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
fa6ca7835a Updated Merchant Sister Quest for Improved Dialogue 2023-05-13 19:49:04 +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
b8709401da Updated Boss for Dialogue and End Game Dialogue 2023-05-13 16:25:07 +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
fea2ccface Updated Dialogue System to Call Custom Blueprint Functions 2023-05-11 06:32:11 +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
6d8a4c82b0 Updated Dialogue for User Experience Improvements
In dialogue make arrow only appear when the animation is finished, Made things Bigger
2023-05-09 06:05:59 +01:00
c7f7619e09 Bugfix Unknown Characters in Merchant Sisters Dialogue 2023-05-04 06:59:39 +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
25e9a4f4fc Updated Dialogue UI for Style Consistency 2023-05-01 05:22:56 +01:00
dcab1c483f Updated Quest Text for Consistentcy 2023-04-28 05:44:07 +01:00
9ecbd9c52d Updated GoatAI to Trigger Attack Animations 2023-04-28 03:40:41 +01:00
825e2a7631 Added Movement Animation to Goats 2023-04-28 02:40:18 +01:00
9199db00df Bugfix Merchant Unable to Interact 2023-04-28 01:40:49 +01:00
bc171eba80 Added Idle Merchant Animations 2023-04-28 01:23:18 +01:00
Kacper Szelest
1d076b851b Implemented the quest system
I implemented the quest system into the game
2023-04-27 16:42:40 +01:00
af86084f3e Updated Quest UI to Display Tasks 2023-03-13 18:11:42 +00:00
3a99e71bde Added Base Stub for Quest System 2023-03-13 05:19:13 +00:00
76b2d78f0e Updated Dialogue for Choices 2023-03-13 04:49:09 +00:00
e8c20e2d67 Merge branch 'dev' into Turn-Based-Combat
# Conflicts:
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
#	Content/BungeeMan/Mat_BungeeMan_Rubber.uasset
#	Content/Dialogue/NPCTest.uasset
#	Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
2023-02-28 15:29:35 +00:00
2f47693608 Bugfix Expiry Timers Not Getting Invalidated 2023-02-25 01:25:32 +00:00
26f21a9136 Updated DialogueNPC to use Ranged For Loops 2023-02-20 09:50:09 +00:00
d1fab9f9a1 Updated DialogueNPC for Structs and Dialogue Paths 2023-02-09 03:12:27 +00:00
7f3e3cbb52 Updated DialogueNPC to Add Dialogue via Blueprints 2023-02-06 03:28:53 +00:00
e5b624411d Updated TextPrompt for Choices 2023-02-06 03:27:49 +00:00
acefce8bbc Added InteractNPC to Line Trace for Interact 2023-02-02 03:15:50 +00:00
3433254463 Added DialogueNPC Actor Component with Text Animation 2023-02-02 01:59:33 +00:00
5988272890 Added Base Text Prompt Widget Blueprint 2023-02-01 23:47:59 +00:00
42ce95b84e Added Dialogue Testing Map with Temp NPC 2023-02-01 23:47:22 +00:00