Merge branch 'master' of https://cgvrgit.ulno.net/Kaspar/GameJam202309

Browse Source

# Conflicts:
#	Content/Levels/Moving_tikis.umap

...

This commit is contained in:

THICCmees 2023-09-30 22:45:17 +03:00

parent 326e138e45 09c46fde29

commit 88417c6f7e

19 changed files with 54 additions and 6 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/Levels/Moving_tikis.umap (Stored with Git LFS)

Binary file not shown.

BIN

Content/Levels/Start_level.umap (Stored with Git LFS)

Binary file not shown.

BIN

Content/audio/Menuu.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/audio/tikiteeth.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/props/mand/Material_tik_010.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/props/mand/manbdast2_.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/props/mand/platform_texture.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/props/tiki_blue/Material_tik_005.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/props/tiki_blue/Tikid_blue_2_.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/props/tiki_blue/sadge_tiki_texture.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/props/tiki_green/Material_tiki_004.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/props/tiki_green/Tikid_green2_.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/props/tiki_green/disgustang_tiki_texture.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/props/tiki_red/Material_tik_001.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/props/tiki_red/Tikid_rederere_2_.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/props/tiki_red/angy_tiki_texture.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/props/tiki_yellow/Material_tik_003.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/props/tiki_yellow/Tikid_yellow_2_.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/props/tiki_yellow/happy_tiki_texture.uasset (Stored with Git LFS) Normal file

Binary file not shown.