Merge remote-tracking branch 'origin/Tutorial-Enviroment' into dev

Browse Source

# 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

...

This commit is contained in:

Philip W 2023-11-27 02:03:30 +00:00

parent c9d5ab73a6 db50bd002f

commit 69bf3555e3

14 changed files with 41 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN

Assets/Bathroom/Mirror.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Bathroom/Shower_Export.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Bathroom/Sink_Export.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Bathroom/Tap_Export.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Doorway.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Floor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Floor_Small.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Pillar_1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Pillar_2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Wall.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Wall_Short.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_stairs.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Levels/TrainingFacility.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Levels/Training_Put_Together.umap (Stored with Git LFS) Normal file

View File

Binary file not shown.