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 14:46:43 +03:00

parent 68fc00d310 42caa8611a

commit 55f53bed32

3 changed files with 8 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

BIN

Content/UI_Assets/Button_Hovered.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/UI_Assets/Button_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/main_menu.uasset (Stored with Git LFS)

Binary file not shown.