Merge branch 'Megabuilding-Test' into level-design-temp

Browse Source

# Conflicts:
#	EndlessVendetta/Content/Levels/NewMiamiOpenWorld.umap

...

This commit is contained in:

LOUIS HORNE 2024-03-15 11:17:05 +00:00

parent 1b7780b61c 9119fb0471

commit f2540ee8d4

23 changed files with 68 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

EndlessVendetta/Content/Assets/Megabuilding/Connector_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Sm_CornerPiece.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Sm_WindowSmall.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Beams/M_MegaBuildingAppartmentBeams.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Beams/beams_low_MegaBuildingAppartmentBeams_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Beams/beams_low_MegaBuildingAppartmentBeams_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Beams/beams_low_MegaBuildingAppartmentBeams_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Connector/Connector_low_MegaBuildingAppartmentConnector_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Connector/Connector_low_MegaBuildingAppartmentConnector_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Connector/Connector_low_MegaBuildingAppartmentConnector_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Connector/M_MegaBuildingAppartmentConnector.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Corner/M+MegaBuildingAppartmentCorner.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Corner/corner_low_MegaBuildingAppartmentCorner_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Corner/corner_low_MegaBuildingAppartmentCorner_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Corner/corner_low_MegaBuildingAppartmentCorner_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Windows/M_MegaBuildingAppartmentWindows.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Windows/Window_low_MegaBuildingAppartmentWindow_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Windows/Window_low_MegaBuildingAppartmentWindow_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Windows/Window_low_MegaBuildingAppartmentWindow_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Window_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/beams_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/corner_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.