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

..

Bathroom

Added bathroom assets and textures

2023-12-11 12:40:25 +00:00

Fridge

Added fridge asset

2023-10-19 09:58:54 +01:00

living room

Added textured sofa and adjusted living room layout

2023-11-27 13:09:50 +00:00

Modular_pieces

Modular assets added

2023-11-20 14:04:24 +00:00

Pistol

Pistol

2024-01-04 10:06:03 +00:00

Textures

Asset addition

2023-11-09 15:59:27 +00:00