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
9dfbced885
Updated Combat Tutorial to Include New UI Elements
2023-05-13 20:11:58 +01:00
bc0aad5f6b
Updated Combat UI to Display Enemy Name
2023-05-13 19:58:29 +01:00
MarcelHara
f17baf1891
Updated PlayerInventory and Settings BP logic
2023-05-13 18:16:12 +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
MarcelHara
495f78a766
Added Functionality to new Inventory and fixed TAB not closing
2023-05-13 16:31:27 +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
Blue Probert
ded3f7881c
Changed player maximum ammo
2023-05-12 16:36:14 +01:00
73204efa31
Updated Combat so that the Camera Stays Locked on During Combat
2023-05-12 14:38:58 +01:00
6373a6bdc7
Updated Tooltip Function to Get Correct Display Name
2023-05-12 13:23:18 +01:00
2b66a5f804
Updated Combat Character for Camera Clipping
...
Enabled Generate Overlap Events During Level Streaming
2023-05-11 14:39:40 +01:00
902163d4fe
Updated Merchant for Pendant Quest & Attempted to Replace Open Dialogue
2023-05-11 08:52:30 +01:00
e8e4e86873
Updated Status System to Add Buff Jelly Functionality
2023-05-11 05:59:49 +01:00
d197dc4d7e
Updated Both Jellies to Use New Icons
2023-05-11 05:20:58 +01:00
d79159ef8a
Updated Combat Character to Have a Healing Jelly
2023-05-11 05:15:55 +01:00
88f73fe5db
Updated Build for Pick Up Book & Gun Quest
2023-05-11 04:50:45 +01:00
7b185adaf4
Updated Combat UI for Damage & Status Indicator, Miss Chance & Removed Battle Log
2023-05-11 04:00:03 +01:00
2638e71f97
Updated Combat UI to Make Extra Turn More Readable
2023-05-09 13:29:52 +01:00
487c46d7b8
Updated Combat System to Include Healing During Combat
2023-05-09 05:40:31 +01:00
cfde5f9d68
Added Healing Jelly Button in Combat Widget
2023-05-09 00:42:56 +01:00
b32e3c21d9
Applied New Gun Model to Combat Character
2023-05-08 23:40:44 +01:00
5b1abf1a70
Merge pull request #31 from Games-Academy-Student-Work-22-23/MainMenu-Creation
...
Main menu creation
2023-05-04 18:00:19 +01:00
MarcelHara
a82d277a26
Updated GunEffect to fix sparks not feeling realistic
2023-05-04 13:41:18 +01:00
f24fcc2d25
Updated Quest System for UI
2023-05-04 05:04:37 +01:00
d237e6c8de
Replaced Ripped Paper Image to Remove Padding
2023-05-02 11:23:35 +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
MarcelHara
fab7a72b84
Updated MainMenu Scene to have a background
...
Added new assets to the mainmenu to make it look better behind the book
2023-04-30 15:14:59 +01:00
MarcelHara
bef17b7f04
Merge branch 'volumetric-fog' into dev
...
# Conflicts:
# Content/Blueprints/Combat_UI/CombatCharacter.uasset
# Content/Levels/Build.umap
2023-04-30 13:06:51 +01:00
99f88bb31c
Bugfix Combat Initialisation Calculation Failure on Tutorial
2023-04-28 05:33:08 +01:00
cf433291a9
Bugfix Larger Health Values Break Health UI
2023-04-28 04:47:34 +01:00
38ffd4f339
Bugfix Force Look Pitch Not Correctly Set
2023-04-28 03:59:03 +01:00
Kacper Szelest
f8e130f727
Fixed quest system
...
I fixed the quest system and made it interactable
2023-04-27 16:47:26 +01:00
MarcelHara
3b725f53bb
Started to work on main menu
2023-04-27 12:31:32 +01:00
4f8f2b37d1
Updated Combat to Hide Book in Non-Combat
2023-04-27 07:19:19 +01:00
11c905613a
Updated Combat to Include Red Vignette on Damage Taken
2023-04-27 06:59:52 +01:00
9fd372ed9d
Updated Combat to Include Camera Shake on Shoot & Wall Break
2023-04-27 05:13:41 +01:00
19fcc0c063
Updated Combat to Include Enemy UI
2023-04-27 04:24:54 +01:00
2df31aa719
Bugfix Camera Clipping and Render Depth On Book & Gun
2023-04-27 03:47:24 +01:00
383a85449e
Merge branch 'Combat' into dev
2023-04-26 13:20:48 +01:00
MH261677
a845c079a4
Merge branch 'fx-creation' into dev
...
# Conflicts:
# Content/Blueprints/Combat_UI/__RealTime/CombatCharacterRT.uasset
2023-04-26 13:09:58 +01:00
MH261677
8d20b563e7
Updated Gun FX to make smoke smaller
2023-04-26 12:59:44 +01:00
MH261677
be31b90112
Updated Gun FX to making smoke more realistic and emission change
...
Updated the color and the way the smoke moves to look more realistic and made the emission a lot lower to prevent smoke from lighting up the whole scene
2023-04-26 12:55:38 +01:00
MH261677
a90fccd72e
Updated Gun Effects to add smoke and sparks
...
added smoke and spark effects to the gun upon firing
2023-04-26 12:12:50 +01:00
5634557af2
Bugfix Game End on Player Death & Lock Combat on Tutorial
2023-04-26 05:28:02 +01:00
