Commit Graph

310 Commits

Author SHA1 Message Date
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
e308661c67 Removed Resource Reset on Combat Start 2023-05-11 04:01:57 +01:00
7b185adaf4 Updated Combat UI for Damage & Status Indicator, Miss Chance & Removed Battle Log 2023-05-11 04:00:03 +01:00
6e21026fcb Updated Eatable Items to Balance Resource Amounts 2023-05-11 01:17:21 +01:00
MARCEL HARA
8a68ac5213 Merge pull request #35 from Games-Academy-Student-Work-22-23/implimenting-miningcrystals
Implimenting miningcrystals
2023-05-10 13:28:52 +01:00
MarcelHara
4ad0959f08 Bug Fixed Mining crashing the game
When pressing E on the crystals it kept on crashing due to destroy being executed before pointer checks
2023-05-10 13:27:27 +01:00
MarcelHara
fc25c8adf0 Updated TempCharacter to start fixing bugs 2023-05-09 16:22:35 +01:00
2638e71f97 Updated Combat UI to Make Extra Turn More Readable 2023-05-09 13:29:52 +01:00
6a94ce98ec Merge pull request #34 from Games-Academy-Student-Work-22-23/merchant-polish
Merchant polish
2023-05-09 13:10:38 +01:00
MarcelHara
b3c83f161f Updated TempCharacter to stop crashes 2023-05-09 12:50:34 +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
487c46d7b8 Updated Combat System to Include Healing During Combat 2023-05-09 05:40:31 +01:00
cef7b1895b Updated Boss Character to Trigger Animations 2023-05-09 04:29:19 +01:00
aa78522127 Updated Combat UI for User Experience Improvements
Hide buttons until they are available to use and disable resource buttons if there isn't any resources left
2023-05-09 02:55:31 +01:00
0115b7db1f Updated Combat System to Hide Quest Widget in Combat 2023-05-09 00:42:03 +01:00
b32e3c21d9 Applied New Gun Model to Combat Character 2023-05-08 23:40:44 +01:00