main map merge solved

Browse Source

...

This commit is contained in:

Kristo Krikmann

2026-01-13 16:42:44 +02:00

parent f0cda14f8a 00e734158d

commit 75b1776bbc

36 changed files with 106 additions and 4 deletions

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

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

Content/SD_Art/Industrial_Architecture/Materials/Rust/Textures/T_Tiling_Rust_Albedo_Mat.uasset

LFS

BIN

Binary file not shown.

Content/SD_Art/source/Glass.uasset

LFS

BIN

Binary file not shown.

Content/SD_Art/source/Glass01.uasset

LFS

BIN

Binary file not shown.

Content/SD_Art/source/WIndow01_Glass01_BaseColor.uasset

LFS

BIN

Binary file not shown.

Content/SD_Art/source/WIndow01_Glass01_Normal.uasset

LFS

BIN

Binary file not shown.

Content/SD_Art/source/WIndow01_Glass01_OcclusionRoughnessMetallic.uasset

LFS

BIN

Binary file not shown.

Content/SD_Art/source/WIndow01_Window_Painted_BaseColor.uasset

LFS

BIN

Binary file not shown.

Content/SD_Art/source/WIndow01_Window_Painted_Normal.uasset

LFS

BIN

Binary file not shown.

Content/SD_Art/source/WIndow01_Window_Painted_OcclusionRoughnessMetallic.uasset

LFS

BIN

Binary file not shown.

Content/SD_Art/source/Window.fbm/WIndow01_Glass01_BaseColor.png

LFS

BIN

Binary file not shown.

Content/SD_Art/source/Window.fbm/WIndow01_Glass01_Normal.png

LFS

BIN

Binary file not shown.

Content/SD_Art/source/Window.fbm/WIndow01_Glass01_OcclusionRoughnessMetallic.png

LFS

BIN

Binary file not shown.

Content/SD_Art/source/Window.fbm/WIndow01_Window_Painted_BaseColor.png

LFS

BIN

Binary file not shown.

Content/SD_Art/source/Window.fbm/WIndow01_Window_Painted_Normal.png

LFS

BIN

Binary file not shown.

Content/SD_Art/source/Window.fbm/WIndow01_Window_Painted_OcclusionRoughnessMetallic.png

LFS

BIN

Binary file not shown.

Content/SD_Art/source/Window.fbx

LFS

BIN

Binary file not shown.

Content/SD_Art/source/Window_Frame.uasset

LFS

BIN

Binary file not shown.

Content/SD_Art/source/Window_Painted.uasset

LFS

BIN

Binary file not shown.

Content/SD_Art/textures/Glass01_Alpha.png

LFS

BIN

Binary file not shown.

Content/SD_Art/textures/Glass01_Alpha.uasset

LFS

BIN

Binary file not shown.

Content/SD_Art/textures/Glass01_Metallic.png

LFS

BIN

Binary file not shown.

Content/SD_Art/textures/Glass01_Metallic.uasset

LFS

BIN

Binary file not shown.

Content/SD_Art/textures/Glass01_Normal.png

LFS

BIN

Binary file not shown.

Content/SD_Art/textures/Glass01_Normal.uasset

LFS

BIN

Binary file not shown.

Content/SD_Art/textures/Glass01_Roughness.png

LFS

BIN

Binary file not shown.

Content/SD_Art/textures/Glass01_Roughness.uasset

LFS

BIN

Binary file not shown.

Content/SD_Art/textures/WIndow01_Glass01_BaseColor.png

LFS

BIN

Binary file not shown.

Content/SD_Art/textures/WIndow01_Glass01_BaseColor.uasset

LFS

BIN

Binary file not shown.

Content/SD_Art/textures/WIndow01_Window_Painted_Normal.png

LFS

BIN

Binary file not shown.

Content/SD_Art/textures/WIndow01_Window_Painted_Normal.uasset

LFS

BIN

Binary file not shown.

Content/SD_Art/textures/Window_Painted_BaseColor.png

LFS

BIN

Binary file not shown.

Content/SD_Art/textures/Window_Painted_BaseColor.uasset

LFS

BIN

Binary file not shown.

Content/SD_Art/textures/Window_Painted_Roughness.png

LFS

BIN

Binary file not shown.

Content/SD_Art/textures/Window_Painted_Roughness.uasset

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Main_Level/Gameplay_Map.umap

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Main_Level/_GENERATED/jander/CubeGridToolOutput_3F49CE67.uasset

LFS

BIN

Binary file not shown.