Merge branch 'Kaja' into dev

Browse Source

# Conflicts:
#	SeagullGame/Content/Props/game_jam_veg_rack_export_1.uasset

...

This commit is contained in:

KAJA MARYNIEWSKA 2024-01-28 14:18:12 +00:00

parent dbba90074a c2050e2b56

commit d6a7bbb90f

10 changed files with 24 additions and 12 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

SeagullGame/Content/Mart.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

SeagullGame/Content/Ossie_Props/littlebin.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Props/Textures/fridge_door_blue.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

SeagullGame/Content/Props/Till_black.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Props/biblically_correct_bench.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

SeagullGame/Content/Props/card_board.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Props/game_jam_chest_freezer.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

SeagullGame/Content/Props/game_jam_veg_rack_export_1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

SeagullGame/Content/Props/pringles_green.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

SeagullGame/Content/Street/M_Street.uasset (Stored with Git LFS)

View File

Binary file not shown.