200 Commits

Author SHA1 Message Date
Rafal Swierczek
b1383864a6 Merge branch 'Open-world-blockout' into dev 2024-01-14 20:29:39 +00:00
Rafal Swierczek
5d9903ff7e Added Gun Range 2024-01-14 03:25:06 +00:00
Rafal Swierczek
8219bcfda2 Added Gadget Room 2024-01-14 01:11:33 +00:00
Rafal Swierczek
0ed56268d4 Added Parkour Room without Upstairs and Dynamic Obstacles 2024-01-13 21:35:05 +00:00
Rafal Swierczek
f56e3f7877 Added Reception Area to Training Facility 2024-01-13 14:22:43 +00:00
LOUIS HORNE
6bf2d0e93f Added bookshelf Edges 2024-01-12 18:38:30 +00:00
LOUIS HORNE
3bd14441c0 Added Decals 2024-01-12 17:48:18 +00:00
LOUIS HORNE
768fc014b0 Added clock and improved Collision 2024-01-12 16:26:35 +00:00
LOUIS HORNE
56be1f02e8 Wave Survival Blockout 2024-01-12 12:47:37 +00:00
LOUIS HORNE
247081d774 Road changes to open world 2024-01-12 10:49:59 +00:00
LOUIS HORNE
9612ac9f7b Added Smaller wall pieces 2024-01-11 11:11:12 +00:00
LOUIS HORNE
2680332dce Added Radio
RADIO ONLY PLAYS RAM RANCH
2024-01-10 16:29:07 +00:00
LOUIS HORNE
8d8e0e262c Added bookshelf 2024-01-10 14:59:59 +00:00
LOUIS HORNE
c942e23ba9 Updated level to be most recent hit blockout 2024-01-10 10:35:43 +00:00
LOUIS HORNE
7b5aff2f60 Merge remote-tracking branch 'origin/LevelDesign2' into Tutorial-Enviroment
# Conflicts:
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_re.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_bl.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_orange.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/lamp_01/lamp_01_orange.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/wall_light_01/wall_light_01_orange.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/wall_light_02/wall_light_02_orange.uasset
#	EndlessVendetta/Content/Levels/TrainingFacility.umap
#	EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
2024-01-10 09:20:56 +00:00
LOUIS HORNE
ea43f7b509 Added buildings and minor roads to miami blockout 2024-01-08 18:24:57 +00:00
KACPER Szelest
4a4e0e6302 Edited and implemented road
I edited a spline layer into the level landscape and have created road pathways in the level
2024-01-07 13:12:33 +00:00
KACPER Szelest
26f8edc17f Added road mesh
I have added a road mesh object so that we can use it to create roads throughout our level
2024-01-07 12:40:07 +00:00
LOUIS HORNE
8c3d78f8d7 Added chamber prop to tutorial level
Sci fi thing that looks cool
2023-12-12 18:40:31 +00:00
LOUIS HORNE
d0e0ed1980 Added walls to tutorial House 2023-12-11 14:33:04 +00:00
MADELINE SPRUCE
a41ad5846b added bathroom textures, ad reimported the bathroom assets. 2023-12-11 13:26:34 +00:00
REBECCA WYNN
a0917021b4 added all textures to living room
finished living room minus set dressing
2023-12-07 10:13:58 +00:00
LOUIS HORNE
576df13ca3 Added table to tutorial level 2023-12-04 13:55:31 +00:00
LOUIS HORNE
ead9c35fb9 Set Dressing 2023-11-30 11:41:24 +00:00
REBECCA WYNN
2fc1f760fe added cabinet texture 2023-11-30 11:12:46 +00:00
CHRIS FARRER
18ac795daf Added: Kitchen Cupboard and Counter to tutorial
Added both models and textures
2023-11-30 10:43:47 +00:00
LOUIS HORNE
5c06187575 More Tv work
It dosent work
2023-11-28 18:47:03 +00:00
LOUIS HORNE
ef7ad130f9 Added tv to tutorial
Added a tv, still need to set up a scren for it
2023-11-28 17:15:14 +00:00
REBECCA WYNN
52f1869b6e Added textured sofa and adjusted living room layout
added lights to livingroom
2023-11-27 13:09:50 +00:00
69bf3555e3 Merge remote-tracking branch 'origin/Tutorial-Enviroment' into dev
# Conflicts:
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset
#	EndlessVendetta/Content/Levels/TrainingFacility.umap
#	EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
#	EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset
#	EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset
2023-11-27 02:03:30 +00:00
e0ac8804c7 Built Lighting for Training Facility 2023-11-27 01:22:00 +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
MADELINE SPRUCE
db50bd002f Put bathroomassets in 2023-11-23 10:44:38 +00:00
LOUIS HORNE
7990224334 Added Kirstians modular kit, started putting it together 2023-11-20 15:38:34 +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
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
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
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
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
58931ab222 Bugfix Inventory UI Not Refreshing on Dirty 2023-10-25 16:58:38 +01:00
Rafal Swierczek
3631fbe5ba Implemented Intro Cutscene 2023-10-19 12:03:23 +01:00
14107df96c Created Training Facility Level 2023-10-18 18:40:13 +01:00
ab76177b16 Merge remote-tracking branch 'origin/WeaponPickupSystem' into TutorialBounty
# Conflicts:
#	EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset
2023-10-17 22:45:52 +01:00
Chris Farrer
ce25923886 Added Kitchen Props to tutorial 2023-10-16 16:25:50 +01:00
rebecca wynn
fa0d15aa53 added lights assets (ceiling 1 and 2) 2023-10-16 16:23:55 +01:00
Louis Horne
f34d7500f9 Added Placeholder props to tutorial level
Added: bed, bookshelf, wardrobe, desk, small desk
2023-10-16 15:53:46 +01:00