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

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

BIN

Content/Custom/Audio/BogFather/sosinblooper3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Audio/BogFather/sosintest.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Audio/Flute/flööt0.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Audio/Flute/flööt1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Audio/Flute/flööt1_5.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Audio/Flute/flööt2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Audio/Flute/flööt2_5.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Audio/flööt0.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Audio/flööt1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Audio/flööt1_5.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Audio/flööt2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Audio/flööt2_5.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Blueprints/BP_BogFather.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Blueprints/BP_RandomAmbientAudio.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Maps/BogEnvTest.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Maps/GameMap_sharedassets/road_LayerInfo.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Materials/M_GlowingEye.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Menus/WP_Main_Menu.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Models/Kratt/Material_001.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Kratt/Material_002.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Kratt/Material_003.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Kratt/kratt_hark.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Kratt/kratt_ratas.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Kratt/kratt_vikat1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Kratt/kratt_vikat2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Latern/Material_008.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Latern/Material_009.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Latern/Material_012.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Latern/lantern.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Material_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Models/Material_002.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Models/Material_003.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Models/Material_008.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Models/Material_009.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Models/Material_012.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Cube.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Cube_001.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Cube_002.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Cube_003.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Cube_004.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Material_001.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Material_002.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Material_003.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Material_004.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Material_005.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Material_006.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Material_007.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Material_008.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Material_009.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Plane.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Plane_001.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Plane_003.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Soovana/Plane_021.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Custom/Models/Texture_Assets1_trimsheet_color__1__Mat.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Models/kratt_hark.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Models/kratt_ratas.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Models/kratt_vikat1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Models/kratt_vikat2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Custom/Models/lantern.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/3/0N/JD0YP3ESQ743BHWHH47JM4.uasset (Stored with Git LFS)

View File

Binary file not shown.