Commit Graph

194 Commits

Author SHA1 Message Date
5634557af2 Bugfix Game End on Player Death & Lock Combat on Tutorial 2023-04-26 05:28:02 +01:00
b1bdcb7618 Merge remote-tracking branch 'origin/Tutorial' into Combat
# Conflicts:
#	Content/Blueprints/Combat_UI/CombatTutorial.uasset
2023-04-26 04:18:42 +01:00
32f20c12c3 Updated Combat to Include Damage Stacking 2023-04-26 03:52:22 +01:00
15d2734c52 Bugfix Pointer Retaining Position After Combat Has Ended 2023-04-26 03:51:17 +01:00
0c13de4668 Bugfix BindAction Consuming Left Mouse Input 2023-04-26 03:22:13 +01:00
f7c4fdac3f Updated Combat to Include a Reload Effect 2023-04-26 02:10:01 +01:00
cf2a198c3e Updated BookUI to Display Turn State and Escape Percentage 2023-04-25 04:23:51 +01:00
32e65e3f47 Updated BookUI for Cast & Clear Buttons 2023-04-25 03:46:52 +01:00
d0eaf37de7 Updated BookUI for Icon Positioning 2023-04-25 01:13:04 +01:00
e7121dbb49 Updated BookUI to Include Escape Button & Percent 2023-04-25 01:08:26 +01:00
eb43c252af Updated BookUI to Include Element Icons 2023-04-25 01:07:35 +01:00
18ceedfa03 Updated Character to Convert Screen Space to World for Interaction 2023-04-24 18:01:51 +01:00
Kacper Szelest
0384c4977d Changed location of text int tutorial
I changed the lovation of the text in the tutorial to fit the page better.
2023-04-24 16:08:45 +01:00
Kacper Szelest
00a22d1c39 Changed tutorial text
I shortened the text on the tutorial to condense it and not dump the player with text.
2023-04-24 16:07:09 +01:00
ba35cfd06e Bound Health Percent UI to Get Combat Character Health 2023-04-24 12:08:59 +01:00
fa3a811553 Added Tutorial Widget with Functionality 2023-04-24 11:54:28 +01:00
bc94d3aeae Updated Intro Text for Cosmetic Changes 2023-04-21 14:41:06 +01:00
b5d451d948 Updated BookUI for Small Cosmetic Changes 2023-04-21 14:35:36 +01:00
7c39553dd2 Updated Book UI to Display Only Valid Combos 2023-04-21 04:26:09 +01:00
11a58bb836 Added 1st and 2nd Element UI Book Elements 2023-04-21 04:16:46 +01:00
02e1ec436c Updated TurnBasedCombat to Use New Book UI 2023-04-21 03:44:01 +01:00
94f45d99c3 Added Combat UI Asset for World Space 2023-04-21 02:57:18 +01:00
793e096ed5 Merge remote-tracking branch 'origin/tutorial-functionality' into Book-UI
# Conflicts:
#	Content/Levels/Build.umap
2023-04-20 22:30:57 +01:00
Kacper Szelest
b50e9dc161 Added UI elements and collisions
I added ui elements and collisions
2023-04-20 16:46:27 +01:00
MARCEL HARA
2f74de4889 Updated IntroText to add close button 2023-04-17 17:34:26 +01:00
MARCEL HARA
c412e8c163 Added TutorialText to game
added a ui and made it appear at the start of the game
2023-04-17 17:33:40 +01:00
MARCEL HARA
5e534b3af9 Updated Flashlight brightness 2023-03-29 17:16:11 +01:00
EMILY TAYLOR
7ec5c4442f Added Book and Material
Implemented book asset in game and material.
2023-03-29 16:19:37 +01:00
CHARLIE SEYMOUR
5307c9c02d Added combat and material bars 2023-03-29 15:48:08 +01:00
2e6398da59 Bugfix Input Not Being Re-Enabled On Respawn 2023-03-28 05:19:41 +01:00
b51ac385cd Bugfix Inventory Widget Anchors Not Correctly Set 2023-03-28 04:56:56 +01:00
1b4a2673e3 Updated Combat UI for New Conventions (WIP) 2023-03-28 04:36:27 +01:00
544de9810c Updated Combat Character Increased Sprint Speed 2023-03-28 03:46:35 +01:00
3f5c7bcf1c Bugfix Merchant Unable to Purchase Items 2023-03-28 03:43:31 +01:00
Charlie Seymour
cef9cd9d7b Added Custom Health bars
Health only
2023-03-23 17:55:59 +00:00
Marcel Hara
0779e31c75 Updated Positions of Items to Merchant Shop
Fixed the origin of the items and properly positioned and scaled items to make the merchant shop work fully
2023-03-16 17:18:01 +00:00
Marcel Hara
6f9f95ab9d Attempted fix widget to merchant system 2023-03-14 13:04:33 +00:00
7d078cbb4c Added Sprint using Left Shift 2023-03-14 04:40:13 +00:00
7585520586 Added Death Screen 2023-03-14 04:17:29 +00:00
c5409fcaa7 Removed Merchant Soft Lock for Build
Merchant SEVERELY BUGGY FUNCTIONALITY HAS BEEN DISABLED
2023-03-14 04:01:09 +00:00
b27f6ef064 Added Flashlight Tutorial 2023-03-14 00:34:06 +00:00
63b6c20c13 Updated Combat Character to Toggle Flashlight 2023-03-14 00:31:06 +00:00
4d77431338 Merge branch 'Quest-&-Dialogue-System' into dev 2023-03-13 22:02:36 +00:00
af86084f3e Updated Quest UI to Display Tasks 2023-03-13 18:11:42 +00:00
bfa6c24ee9 Bugfix New UI Not Displaying 2023-03-13 18:10:02 +00:00
Marcel Hara
688a724a62 Merge branch 'dev' into UI-Implementation
# Conflicts:
#	Content/Blueprints/Player/BP_MyTempCharacter.uasset
#	Content/Levels/Top_layer_level.umap
2023-03-13 17:13:56 +00:00
Marcel Hara
7e8ded362a Added All Item ammo types
Added every item ammo type to the game
2023-03-13 17:00:08 +00:00
Marcel Hara
7343484038 Updated MainWidget to fix scaling issues 2023-03-13 16:13:27 +00:00
Charlie Seymour
e0f7a2682a Bugfix Old Version of the Character with Missing References 2023-03-13 16:11:44 +00:00
Marcel Hara
e8000eb823 Updated GameUI to Rounded buttons and optimisation
removed unwanted blueprints to speed up menus and make them work better and made all the buttons rounded to make it look nicer
2023-03-13 16:06:41 +00:00