merge ?

Browse Source

...

This commit is contained in:

HSellis 2025-01-26 08:51:01 +02:00

parent fe7cfcda13 1693401f95

commit 51fce7d3b5

40 changed files with 119 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

Content/Custom

Audio

impulse.uassettitle_track.uasset

Maps/GameMap_sharedassets

Layer_2_LayerInfo.uasset

Models

Artboard_1.uassetArtboard_1_Mat.uassetBush_dead.uassetCranberry_NO_berry.uassetCranberry_YES_berry.uassetFabric_Clothes_Cotton_Plain_Weave_White_xfeced0qx_2K_AO.uassetFabric_Clothes_Cotton_Plain_Weave_White_xfeced0qx_2K_AO_Mat.uassetFabric_Clothes_Cotton_Plain_Weave_White_xfeced0qx_2K_Displacement.uassetFabric_Clothes_Cotton_Plain_Weave_White_xfeced0qx_2K_Normal.uassetFabric_Clothes_Cotton_Plain_Weave_White_xfeced0qx_2K_Roughness.uassetFern1.uassetGrass.uassetGround_Log.uassetGround_Stump__1_.uassetMaterial.uassetMoss_green.uassetMushroom_brown.uassetMushroom_red.uassetTexture_Assets1_trimsheet_DisplacementMap.uassetTexture_Assets1_trimsheet_DisplacementMap__1_.uassetTexture_Assets1_trimsheet_NormalMap.uassetTexture_Assets1_trimsheet_NormalMap__1_.uassetTexture_Assets1_trimsheet_SpecularMap.uassetTexture_Assets1_trimsheet_SpecularMap__1_.uassetTexture_Assets1_trimsheet_color.uassetTexture_Assets1_trimsheet_color_Mat.uassetTexture_Assets1_trimsheet_color__1_.uassetTexture_Assets1_trimsheet_color__1__Mat.uassetTree_dead2__1_.uassetTree_dead2__2_.uassetTree_dead3.uassetTree_leaves.uassetTree_pine.uassetkratt_skull.uassetkrattskull1.uassetkrattskull1_Mat.uassetkäsi_rusikas_bones.uasset

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Content/Custom/Models/käsi_rusikas_bones.uasset (Stored with Git LFS)

Binary file not shown.