Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity
521 Commits 1 Branch 15 Tags 5.3 GiB
2f74de4889
Commit Graph

170 Commits

Author SHA1 Message Date
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
PHILIP White
2e6398da59 Bugfix Input Not Being Re-Enabled On Respawn 2023-03-28 05:19:41 +01:00
PHILIP White
b51ac385cd Bugfix Inventory Widget Anchors Not Correctly Set 2023-03-28 04:56:56 +01:00
PHILIP White
1b4a2673e3 Updated Combat UI for New Conventions (WIP) 2023-03-28 04:36:27 +01:00
PHILIP White
544de9810c Updated Combat Character Increased Sprint Speed 2023-03-28 03:46:35 +01:00
PHILIP White
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
PHILIP White
7d078cbb4c Added Sprint using Left Shift 2023-03-14 04:40:13 +00:00
PHILIP White
7585520586 Added Death Screen 2023-03-14 04:17:29 +00:00
PHILIP White
c5409fcaa7 Removed Merchant Soft Lock for Build 
Merchant SEVERELY BUGGY FUNCTIONALITY HAS BEEN DISABLED
 2023-03-14 04:01:09 +00:00
PHILIP White
b27f6ef064 Added Flashlight Tutorial 2023-03-14 00:34:06 +00:00
PHILIP White
63b6c20c13 Updated Combat Character to Toggle Flashlight 2023-03-14 00:31:06 +00:00
PHILIP White
4d77431338 Merge branch 'Quest-&-Dialogue-System' into dev 2023-03-13 22:02:36 +00:00
PHILIP White
af86084f3e Updated Quest UI to Display Tasks 2023-03-13 18:11:42 +00:00
PHILIP White
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
Marcel Hara
cffbe29981 Imported Font to replace all ui fonts 
Replaced all the ui fonts with the new imported font
 2023-03-13 15:55:34 +00:00
PHILIP White
3a99e71bde Added Base Stub for Quest System 2023-03-13 05:19:13 +00:00
PHILIP White
76b2d78f0e Updated Dialogue for Choices 2023-03-13 04:49:09 +00:00
MH261677
93ed73e678 Changed Inventory_UI to Game_UI folder 
Changed folder names and added a Quit button to the settings menu
 2023-03-07 14:25:08 +00:00
MH261677
f90a75f599 Added Icons to replace MainWidg text 
Imported the icons into unreal and replaced all the text on Mainwidget to the respected icons
 2023-03-07 14:18:48 +00:00
MH261677
b88f787315 Updated MainWidg to change hover colour 
Added a hovor colour to make it more obvious what the user is clicking on
 2023-03-07 14:09:09 +00:00
MH261677
0c2dc067da Updated PlayerInv,TempChar to enable hotkeys 
Enabled pressing tab to go straight to inventory instead of having to go to settings via escape key and then switching to inventory manually
 2023-03-07 13:36:04 +00:00
MH261677
72d6ac39fc Created WBP_Gear,WBP_Lore and fixed scaling issues 
Created the final widgets for the menu and fixed some issues of buttons being out of place and not anchored properly
 2023-03-07 13:18:45 +00:00
MH261677
3cac587f30 Updated MainWidget, TempCharacter to menu opening 
Fixed the menu not being able to close properly
 2023-03-07 13:00:24 +00:00
Marcel Hara
17df5728d9 Added WBP_Maps,WBP_Settings to MainMenuWidg 
Added new widgets and now adding functionaity to escape button to make it close and re-open the menu
 2023-03-06 17:27:16 +00:00
Emily Taylor
3982712189 Uploaded MerchantCharacter, Merchant Shop assets and Goat into engine 
Goat enemy fbx and material, merchant character and material and merchant shop untextured meshes in engine.
 2023-03-06 16:28:04 +00:00
Emily Taylor
c4a668c2e9 Added Merchant Shop assets 
Added Merchant shop FBX
 2023-03-06 15:31:55 +00:00
Marcel Hara
0da833f0f7 Created Combos,MainWidget to allow widget switch 
Created a Combos and MainMenu Widget screen. Also reworked the inventory UI and fixed layering and scaling issues
 2023-03-06 15:12:06 +00:00
PHILIP White
b16f632537 Updated Combat to Hide Gold & Health Text 2023-03-06 05:25:36 +00:00
PHILIP White
b5048e4be3 Updated Project Settings for Build 2023-03-06 00:22:09 +00:00
PHILIP White
1cf40d1c05 Merge branch 'Hub-level-blockout' into dev 2023-03-06 00:20:01 +00:00
PHILIP White
704ba824e6 Merge branch 'Turn-Based-Combat' into Hub-level-blockout 2023-03-05 18:47:08 +00:00
MH261677
4357537009 Updated TempCharacter to create NoiseEmitter 
Got the NoiseEmitter component and then used the makenoise function to make it create noise everytime the player walks
 2023-03-05 17:41:39 +00:00
KACPER Szelest
ffac8b483f Updated build level with outline material and wall 
I added the big wall in to the build level and added some outlines into the level
 2023-03-03 21:10:47 +00:00
PHILIP White
69b235030a Updated Combat Character to Add a Flashlight 2023-03-03 18:39:59 +00:00
Kacper Szelest
26c93284d0 Updated build level 
Added a few dressing assets and dressed the level
 2023-03-03 18:13:30 +00:00
PHILIP White
c742abfce4 Added DamageOverTime Status Effect for Combat 2023-03-02 15:06:31 +00:00
PHILIP White
0be235f6b1 Updated Thorns Status Effect to Trigger OnPlayerDamage 2023-03-02 03:25:00 +00:00
PHILIP White
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