|
|
7aecf2a69c
|
Merge remote-tracking branch 'origin/CheckpointUI' into Inventory-System
# Conflicts:
# EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
# EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
|
2023-11-27 00:45:32 +00:00 |
|
|
|
3ac6ea3a27
|
Updated Inventory Component for Dropping of Items
|
2023-11-27 00:43:10 +00:00 |
|
Rafal Swierczek
|
53c64e90f4
|
Fixed Mini Waypoint Being Stuck to Center of Screen When Main Waypoint Spawns Behind Player
|
2023-11-27 00:12:45 +00:00 |
|
Rafal Swierczek
|
797653132e
|
Fixed Multiple Main Waypoints Becoming Focused When Looking at Just One
|
2023-11-26 23:59:53 +00:00 |
|
|
|
e4ff0735df
|
Merge remote-tracking branch 'origin/Weapon-To-Inventory' into Inventory-System
# Conflicts:
# EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
# EndlessVendetta/Content/Levels/TrainingFacility.umap
# EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
# EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h
|
2023-11-26 23:48:30 +00:00 |
|
Rafal Swierczek
|
c51f2ab7b6
|
Added a Directional Arrow to Mini Waypoints
|
2023-11-26 23:26:01 +00:00 |
|
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 |
|
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 |
|
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 |
|
KRISTIAN CHARNLEY-PARR
|
38b8de140d
|
Merge pull request #7 from Games-Academy-Student-Work-23-24/Tutorial-Enviroment
Tutorial enviroment
|
2023-11-20 14:05:29 +00:00 |
|
KRISTIAN CHARNLEY-PARR
|
7a2156df26
|
Modular assets added
|
2023-11-20 14:04:24 +00:00 |
|
MADELINE SPRUCE
|
ae3341083b
|
Put toilet in asset folder
|
2023-11-20 12:40:36 +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 |
|
Rebecca Wynn
|
b0a3bf453d
|
uploading textures to Assets folder (notUE5)
forgot to incl. in previous push, side table/coffee table textures
|
2023-11-20 11:41:41 +00:00 |
|
Rebecca Wynn
|
27743e896b
|
update LR models with Uvs
tranfered form laptop so i can work from uni computers
|
2023-11-20 11:38:35 +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 |
|
|
|
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 |
|
