Commit Graph

338 Commits

Author SHA1 Message Date
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
KRISTIAN CHARNLEY-PARR
c6575a21e2 Asset addition
Added target and modular
2023-11-09 15:59:27 +00:00
75c1976ec4 Merge pull request #6 from Games-Academy-Student-Work-23-24/dev
Dev
2023-11-09 14:33:27 +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
Rebecca Wynn
d995a6f73f added assets to folder
not implimented into UE yet
2023-11-09 11:43:58 +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
65f7112805 Merge pull request #5 from Games-Academy-Student-Work-23-24/dev
Dev
2023-11-03 19:17:41 +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