Commit Graph

325 Commits

Author SHA1 Message Date
81a306f7b0 Bugfix Able to Open Dialogue in Merchant 2023-05-21 21:30:27 +01:00
2157a3f264 Bugfix Main Menu Setting Drop Downs Not Working 2023-05-21 20:03:16 +01:00
8b87098cf8 Updated Book & Gun to be Pickupable by Interact Key 2023-05-21 19:06:16 +01:00
d17ba9e064 Updated Cursor for Change when Hovering on Interactable Object 2023-05-21 18:55:22 +01:00
e0e2286852 Bugfix Crash on Level Change if Player Still has Status Effects 2023-05-21 17:40:54 +01:00
b4b248b5e7 Bugfix Able to Shoot in Menus 2023-05-21 17:24:58 +01:00
5104a21b2f Bugfix Initiating Combat with the Inventory Open Blocks Input 2023-05-21 15:20:11 +01:00
14f4ff4d35 Bugfix Focus Issues in Inventory & Able to Open Inventory in Shop
Able to consistently open & close the inventory without losing focus on root widget
2023-05-21 15:19:18 +01:00
e5b26c20ed Updated Combat to Disable Escaping in Boss Battle 2023-05-20 02:01:28 +01:00
e67e32387c Bugfix Able to See Status Text on Boss Combat 2023-05-20 01:46:13 +01:00
d2d67a5bea Bugfix Being In a Menu Breaks Game 2023-05-20 00:55:20 +01:00
8108050bd6 Bugfix Character Unable to Climb Stairs Consistently 2023-05-20 00:43:05 +01:00
2953e6d50a Bugfix Switches Target if Multiple Enemies Try to Initiate Combat 2023-05-19 12:57:45 +01:00
df08924046 Bugfix Random Fatal Crash After Combat 2023-05-19 02:38:10 +01:00
09b55ac425 Bugfix Pressing E in Dialogue Stops Player from Moving 2023-05-19 02:20:15 +01:00
12a7881592 Bugfix Boss End Dialogue Duplicating And Removing Input 2023-05-15 04:13:29 +01:00
0d7e8c5187 Bugfix Quest System for Pendant Quest 2023-05-15 04:02:05 +01:00
5682929e82 Added Enemy Attack Noises 2023-05-15 03:05:02 +01:00
3b828bb01c Updated Quests for Final Kill Boss Quest 2023-05-14 23:02:09 +01:00
d24194b1cb Updated Healing & Buff Jelly to Change Max Values to 20 2023-05-14 21:34:08 +01:00
027a48bbec Bugfix Crash on Boss Kill 2023-05-14 21:09:34 +01:00
85394b0b72 Rebuilt All Images as Some Were Corrupted Failing Build 2023-05-13 22:35:50 +01:00
bc0aad5f6b Updated Combat UI to Display Enemy Name 2023-05-13 19:58:29 +01:00
MarcelHara
7c7fb0db01 Updated TempCharacter to fix merchant exit bug and cached escapemenu 2023-05-13 17:58:13 +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
MarcelHara
5ec863f4cf Changed TempCharacter to cache InventoryUI 2023-05-13 16:27:39 +01:00
b8709401da Updated Boss for Dialogue and End Game Dialogue 2023-05-13 16:25:07 +01:00
c6e5cb5e00 Updated Combat to Reward on Goat Kill 2023-05-13 01:17:59 +01:00
c2e3ef5168 Updated UI for New Designs 2023-05-13 01:02:47 +01:00
72308aabb0 Updated Boss to Add Combat Variation (Scream) 2023-05-13 00:42:38 +01:00
1254abfd0e Added Inventory Notification Functionality 2023-05-12 23:50:30 +01:00
b9985228d2 Updated Combat System for Minor Cosmetic Changes 2023-05-12 21:45:51 +01:00
2f582cb507 Updated Status Effects to Add Damage Down for Enemy & Player 2023-05-12 20:44:46 +01:00
99b1763f4f Bugfix Changed Max Ammo for Resource Bars 2023-05-12 16:51:06 +01:00
afd166c868 Bugfix Camera Shake Due to Spam of Animations 2023-05-12 16:48:14 +01:00
ec1ebc729d Bugfix for Overriding Local Rotation on Character Camera 2023-05-12 16:32:02 +01:00
73204efa31 Updated Combat so that the Camera Stays Locked on During Combat 2023-05-12 14:38:58 +01:00
dd72b47a6d Bugfix Able to Open Inventory During Combat 2023-05-12 13:51:08 +01:00
3aca076981 Updated Sisters Quest & Wrapped Text on Selections 2023-05-12 13:08:00 +01:00
MARCEL HARA
5bf8d73d21 Fixed UI not being interactable 2023-05-11 11:56:03 +01:00
067bb41820 Bugfix Stack Overflow on Adding Reward Items 2023-05-11 11:27:54 +01:00
902163d4fe Updated Merchant for Pendant Quest & Attempted to Replace Open Dialogue 2023-05-11 08:52:30 +01:00
814c2d6aaa Bugfix Quest System Not Item Matching Correctly 2023-05-11 07:40:14 +01:00
fea2ccface Updated Dialogue System to Call Custom Blueprint Functions 2023-05-11 06:32:11 +01:00
e8e4e86873 Updated Status System to Add Buff Jelly Functionality 2023-05-11 05:59:49 +01:00
f4a27fa5fe Updated StatusSystem for One Status Effect of Each Type Can be Active 2023-05-11 05:13:19 +01:00
aa2f1fabcb Updated Combat to Change the Chance to Miss Based on Enemy Type 2023-05-11 04:55:41 +01:00
88f73fe5db Updated Build for Pick Up Book & Gun Quest 2023-05-11 04:50:45 +01:00
53126c6b10 Exposed Base Damage for Enemies 2023-05-11 04:12:00 +01:00