PHILIP WHITE 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

..

Bathroom

Added mirror to assets folder

2023-11-23 09:47:32 +00:00

Fridge

Added fridge asset

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

living room

uploading textures to Assets folder (notUE5)

2023-11-20 11:41:41 +00:00

Modular_pieces

Modular assets added

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

Textures

Asset addition

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