Fix merge problem.

Browse Source

...

This commit is contained in:

kolbakilu

2025-01-26 09:02:39 +02:00

parent b0d1a66857 51fce7d3b5

commit 55c981c012

61 changed files with 154 additions and 49 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/Custom/Audio/BogFather/sosinblooper3.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/BogFather/sosintest.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/Flute/flööt0.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/Flute/flööt1.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/Flute/flööt1_5.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/Flute/flööt2.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/Flute/flööt2_5.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/flööt0.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/flööt1.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/flööt1_5.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/flööt2.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Audio/flööt2_5.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Blueprints/BP_BogFather.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Blueprints/BP_RandomAmbientAudio.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Maps/BogEnvTest.umap

LFS

BIN

Binary file not shown.

Content/Custom/Maps/GameMap_sharedassets/road_LayerInfo.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Materials/M_GlowingEye.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Menus/WP_Main_Menu.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Kratt/Material_001.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Kratt/Material_002.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Kratt/Material_003.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Kratt/kratt_hark.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Kratt/kratt_ratas.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Kratt/kratt_vikat1.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Kratt/kratt_vikat2.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Latern/Material_008.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Latern/Material_009.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Latern/Material_012.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Latern/lantern.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Material_001.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Material_002.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Material_003.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Material_008.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Material_009.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Material_012.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Soovana/Cube.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Soovana/Cube_001.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Soovana/Cube_002.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Soovana/Cube_003.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Soovana/Cube_004.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Soovana/Material_001.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Soovana/Material_002.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Soovana/Material_003.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Soovana/Material_004.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Soovana/Material_005.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Soovana/Material_006.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Soovana/Material_007.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Soovana/Material_008.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Soovana/Material_009.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Soovana/Plane.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Soovana/Plane_001.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Soovana/Plane_003.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Soovana/Plane_021.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/Texture_Assets1_trimsheet_color__1__Mat.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/kratt_hark.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/kratt_ratas.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/kratt_vikat1.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/kratt_vikat2.uasset

LFS

BIN

Binary file not shown.

Content/Custom/Models/lantern.uasset

LFS

BIN

Binary file not shown.