Commit Graph

346 Commits

Author SHA1 Message Date
Rafal Swierczek
cbf89a2c93 Implemented Mini Waypoint Direction Toggle 2023-11-26 22:45:21 +00:00
Rafal Swierczek
5a8d8e8284 Implemented Mini Waypoint Appearing When Main Waypoint is Out of Focus 2023-11-26 21:23:54 +00:00
Rafal Swierczek
153e026354 Added New Mini Waypoint Class with Visibility Toggle 2023-11-26 16:39:39 +00:00
Rafal Swierczek
787c9c76f1 Removed Test Mini Waypoint BP 2023-11-26 16:16:45 +00:00
Rafal Swierczek
0e937e3e5e Implemented Main Waypoint Visibility Toggle 2023-11-26 16:14:01 +00:00
Rafal Swierczek
4c2ba9b3e5 Added New Object Collision Channel Waypoint 2023-11-26 15:14:48 +00:00
Rafal Swierczek
012328b34c Implemented Basic Screen Space UI For Checkpoint Icon 2023-11-25 19:29:07 +00:00
Rafal Swierczek
62d33c6856 Added Tips to All Checkpoints 2023-11-25 16:43:28 +00:00
Rafal Swierczek
9020cdb284 Implemented Text to Checkpoint Completed UI 2023-11-25 15:53:52 +00:00
Rafal Swierczek
c955020483 Re-Added Bounty Director to Tutorial Level and Fixed Missing Tag on ArtTest Rifle 2023-11-25 15:25:46 +00:00
LOUIS HORNE
f4deb1500f Added door. Colour can can be changed in the mat
Open the material, change the value from 1 - 3 to change the colour (whole numbers)
2023-11-23 12:05:54 +00:00
MARCEL HARA
ad2d62dc73 Added Start Functionality for weapons to inventory 2023-11-23 12:03:15 +00:00
MADELINE SPRUCE
db50bd002f Put bathroomassets in 2023-11-23 10:44:38 +00:00
MH261677
5bdee1fbaf Merge branch 'door-mechanic' into dev 2023-11-21 14:36:24 +00:00
MH261677
a88faa3ef8 Changed Weapon Values to their True Values 2023-11-21 14:35:54 +00:00
MH261677
55e160eb80 Finished Door opening mechanic 2023-11-21 14:31:33 +00:00
a450f68d7c Merge branch 'main' into dev 2023-11-20 19:29:58 +00:00
LOUIS HORNE
7990224334 Added Kirstians modular kit, started putting it together 2023-11-20 15:38:34 +00:00
MARCEL HARA
14c1874c53 Added Cutout to doorwall to test door opening 2023-11-20 14:58:09 +00:00
MARCEL HARA
bbcf052b04 Added Basic Door to Level 2023-11-20 14:33:33 +00:00
MARCEL HARA
83beb696f2 Added Door Interact UI with FadeIns 2023-11-20 14:33:33 +00:00
MARCEL HARA
59f813050d Added Base Door Functionality 2023-11-20 14:33:32 +00:00
MARCEL HARA
0cf77cbcde Got rid of old Logs in BaseWeapon 2023-11-20 14:33:31 +00:00
REBECCA WYNN
932d485409 added table textures into unreal and adjusted lighting
added everything done over weekend into unreal
2023-11-20 12:18:06 +00:00
MARCEL HARA
ba11c7f12f Added Door Testing Level 2023-11-20 12:06:24 +00:00
LOUIS HORNE
297700cc7f Added lavalamp to bedroom 2023-11-17 10:17:43 +00:00
LOUIS HORNE
91391eafaf Added shelves and changed lighting to tutorial
Added some assets and edited the lighting in the bedroom of the tutorial hit
2023-11-16 13:27:46 +00:00
6ff29fa551 Add UI for Weapon Slots 2023-11-16 10:52:19 +00:00
Marcel Hara
065984e21b Added Appropriate Weapon Switching for Both Primary and Secondary 2023-11-14 17:43:01 +00:00
Marcel Hara
9da3eed21b Added Primary and Secondary Tags to All Weapons 2023-11-14 17:40:28 +00:00
Marcel Hara
8886dda901 Added Weapon Saving 2023-11-14 17:00:58 +00:00
f9b0bc74c6 Update Inventory UI for Locaton & Hover Colour 2023-11-13 14:18:50 +00:00
2b238e240a Update Inventory UI for Hover Over Effects 2023-11-13 12:44:33 +00:00
81c9df4940 Update Inventory to Update Size During Runtime 2023-11-13 12:43:44 +00:00
7b923429db Merge remote-tracking branch 'origin/shotgun-creation' into dev 2023-11-09 13:33:07 +00:00
00011764c3 Add Respawn Point to Prevent Restarting Whole Level 2023-11-09 13:32:37 +00:00
ac1400019c Merge remote-tracking branch 'origin/living-room-placeholder' into dev 2023-11-09 13:15:27 +00:00
91c3e8163b Update AI Attack Task for Instigating Damage 2023-11-09 13:14:28 +00:00
3721fff015 Bugfix Regen Health Whilst Being Taking Damage 2023-11-09 13:13:41 +00:00
dac2f1f708 Add Health Bar for Placeholder Information 2023-11-09 12:53:33 +00:00
REBECCA WYNN
6b42f887de added living room assets into UE5 scene
also adjusted light(s) in that room too
2023-11-09 12:31:56 +00:00
f56aece550 Update Crosshair for More Readability 2023-11-09 12:26:29 +00:00
9f931693b2 Add Regen Health After 5 Seconds for Placeholder Regen 2023-11-09 12:25:49 +00:00
LOUIS HORNE
9af5dc3b4d Added some more textures to the tutorial hit
Nearly finished the first texture pass of the bedroom
2023-11-08 18:10:56 +00:00
LOUIS HORNE
53edc72c54 Added props and textures to the tutorial Hit
Added carpet to the top floor - planned to only be for the bedroom but might aswell be everywhere whilst theres no other textures.
Added a bed and textured some more assets
2023-11-08 17:28:01 +00:00
Marcel Hara
4e4267cb38 ReAdded back old values. Finished Shotgun Class 2023-11-06 17:27:05 +00:00
Marcel Hara
783e7bd136 Added Full Weapon Damage Drop Off To All Guns 2023-11-06 17:21:34 +00:00
Marcel Hara
34ef5c6e40 Added a temporary weapon damage for Damage Fall Off 2023-11-06 15:58:01 +00:00
Marcel Hara
0608015705 Added editable weapon spread to all shotguns 2023-11-06 15:57:34 +00:00
Marcel Hara
a790a4a790 Added Shotgun Functionality Firing 2023-11-06 14:01:57 +00:00
Marcel Hara
425ceb05d0 Edited BaseShotgun Values for more Realism 2023-11-06 14:01:44 +00:00
REBECCA WYNN
64a07ab294 Merge branch 'asset-lights' into Blockout
# Conflicts:
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ceiling_light_01.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ceiling_light_02.uasset
#	EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap
2023-11-06 13:56:12 +00:00
REBECCA WYNN
caf1668b9c added all lights to tut level 2023-11-06 13:53:32 +00:00
LOUIS HORNE
42dab4464b Added assets to the tutorial hit
added some bedroom assets
2023-11-06 12:59:19 +00:00
b0229af645 Bugfix Unable to Compile due to Missing Comma 2023-11-06 12:42:20 +00:00
Rafal Swierczek
06a3dd04ad Updated List of Maps to Include in Build to Include New Miami Map 2023-11-03 17:57:50 +00:00
Rafal Swierczek
368a68a7e2 Fixed Crashes Caused By Destroying InValid Characters For Some Gadget Tutorials 2023-11-03 17:32:59 +00:00
Rafal Swierczek
384db6c241 Enabled Hidden In Game Settings for Example Areas in All Gadget Tutorials 2023-11-03 17:00:34 +00:00
Rafal Swierczek
d43053febe Fixed Checkpoint Confirmation UI Being Overriden Post Merge 2023-11-03 16:46:20 +00:00
Rafal Swierczek
a08f671114 Merge remote-tracking branch 'origin/Inventory-System' into dev
# Conflicts:
#	EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
#	EndlessVendetta/Content/Levels/TrainingFacility.umap
2023-11-03 16:28:51 +00:00
Rafal Swierczek
9688c71a31 Merge remote-tracking branch 'origin/Shotgun-weapon-creation' into dev 2023-11-03 16:27:00 +00:00
Rafal Swierczek
c522a39410 Updated PickUpWeapon Checkpoint To Include Actual Pickupable Weapons 2023-11-03 16:19:53 +00:00
Rafal Swierczek
31b190208b Added Combat Gadget Training Checkpoint 2023-11-03 15:36:14 +00:00
Rafal Swierczek
345e5acd08 Implemented Overload Module Gadget Tutorial 2023-11-03 15:12:18 +00:00
Rafal Swierczek
61117272ef Added Go Downstairs Checkpoint 2023-11-03 13:49:00 +00:00
Rafal Swierczek
7ac557f166 Implemented Recon Tutorial Checkpoint 2023-11-03 13:35:26 +00:00
Rafal Swierczek
e78cc47989 Fixed Gadgets not Despawning After Being Switched Out 2023-11-03 13:22:30 +00:00
Rafal Swierczek
971e28bb61 Implemented Ring Module Gadget Tutorial 2023-11-02 18:57:01 +00:00
Rafal Swierczek
7ee592f1f0 Implemented Vision Link Gadget Tutorial 2023-11-02 02:27:04 +00:00
Rafal Swierczek
8694b8746b Implemented Base Gadget Tutorial Class 2023-11-01 21:52:47 +00:00
Rafal Swierczek
d705e61070 Implemented Gadget Switching Workbench 2023-11-01 21:18:18 +00:00
Rafal Swierczek
6a14693826 Implemented UGadgetMenu and it's Functionality 2023-10-30 18:00:41 +00:00
Rafal Swierczek
c53b7c7988 Updated Base Gadget Class to Include UI Info 2023-10-28 17:36:54 +01:00
Rafal Swierczek
3b5a2b6119 Adjusted Parkour Areas Final Jump 2023-10-28 14:42:00 +01:00
Rafal Swierczek
54dc93ded0 Reduced Target Amount for Both Firing Ranges 2023-10-28 14:31:32 +01:00
Rafal Swierczek
ce5bde5f34 Added Checkpoint Completion Confirmation UI 2023-10-28 14:21:58 +01:00
MH261677
8678376ba6 Added Shotgun Base Weapon 2023-10-26 16:00:46 +01:00
MH261677
6c8e5276f9 Updating Magazine Size Back To Default 2023-10-26 15:50:25 +01:00
MH261677
848430aebd Finished Creating Sniper Weapon 2023-10-26 15:49:11 +01:00
c794a905da Updated Inventory Component for Resising Functionality 2023-10-26 11:59:50 +01:00
2553f471e5 Updated Inventory for Cleanup 2023-10-26 11:27:03 +01:00
50791b67c3 Bugfix Able to Place Items Outside of Grid 2023-10-26 10:52:42 +01:00
58931ab222 Bugfix Inventory UI Not Refreshing on Dirty 2023-10-25 16:58:38 +01:00
53ecbbb472 Bugfix Get Item At Index Returning Invaild Result 2023-10-23 17:24:58 +01:00
MARCEL HARA
d12573f6cc Added Sniper Weapon and started creating Base Functionality 2023-10-23 14:01:09 +01:00
Rafal Swierczek
7ab8735ed1 Fixed AI Gun Animations Merge Issue 2023-10-23 13:18:40 +01:00
Rafal Swierczek
4c04c45d49 Fixed Merge Issues 2023-10-23 11:50:20 +01:00
Rafal Swierczek
14fa4621e3 Merge remote-tracking branch 'origin/dev' into dev 2023-10-23 11:49:16 +01:00
MARCEL HARA
c5bf15f6fd Fixed not being able to fire after switching weapons when reloading 2023-10-23 11:46:23 +01:00
Rafal Swierczek
0ff4d76e00 Merge branch 'Inventory-System' into dev
# Conflicts:
#	EndlessVendetta/Content/AI/Enemy/Basic/BT_BasicEnemy.uasset
#	EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
#	EndlessVendetta/Content/FirstPerson/Input/IMC_Default.uasset
2023-10-23 11:34:54 +01:00
MARCEL HARA
37c93fcfe8 Fixed weapon system information bug 2023-10-23 11:29:48 +01:00
Rafal Swierczek
fd41495cc7 Merge branch 'TutorialBounty' into dev
# Conflicts:
#	EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
2023-10-23 11:16:06 +01:00
Rafal Swierczek
9c57740b45 Fixed Gun Stat Prompt Starting Spawned In 2023-10-23 11:13:23 +01:00
Rafal Swierczek
ddfb44b2e7 Merge branch 'WeaponPickupSystem' into TutorialBounty
# Conflicts:
#	EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset
#	EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap
2023-10-23 10:45:10 +01:00
8cfe3b97a9 Update Inventory Component for UI [WIP] 2023-10-23 06:35:59 +01:00
7191dd7302 Implemented Escape From The Area Checkpoint 2023-10-21 20:23:13 +01:00
b4c8ac75c6 Implemented Target Elimination Checkpoint 2023-10-21 17:08:53 +01:00
88f5824f24 Added Enter The Bounty Simulation Facility Checkpoint 2023-10-21 14:30:56 +01:00
3fe90716af Added Parkour Checkpoint to Tutorial 2023-10-21 12:36:17 +01:00
36daaaed16 Bugfix TTuple Error Cannot be Macroed 2023-10-20 23:10:10 +01:00