|
|
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 |
|
|
|
c9d5ab73a6
|
Merge remote-tracking branch 'origin/asset-lights' into dev
|
2023-11-27 01:22:33 +00:00 |
|
MADELINE SPRUCE
|
39e71ac8f7
|
Added mirror to assets folder
|
2023-11-23 09:47:32 +00:00 |
|
MADELINE SPRUCE
|
84df2436da
|
Added bathroom assets to assets folder
|
2023-11-23 09:43:38 +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
|
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 |
|
KRISTIAN CHARNLEY-PARR
|
c6575a21e2
|
Asset addition
Added target and modular
|
2023-11-09 15:59:27 +00:00 |
|
Rebecca Wynn
|
d995a6f73f
|
added assets to folder
not implimented into UE yet
|
2023-11-09 11:43:58 +00:00 |
|
KRISTIAN CHARNLEY-PARR
|
15b73d8749
|
Added fridge asset
|
2023-10-19 09:58:54 +01:00 |
|
