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

# Conflicts: # Content/Levels/Moving_tikis.umap
2023-09-30 22:45:17 +03:00 · 2023-09-30 22:45:17 +03:00 · 88417c6f7e
parent 326e138e45 09c46fde29
commit 88417c6f7e
19 changed files with 54 additions and 6 deletions
--- a/Content/Levels/Moving_tikis.umap
+++ b/Content/Levels/Moving_tikis.umap
--- a/Content/Levels/Start_level.umap
+++ b/Content/Levels/Start_level.umap
--- a/Content/audio/Menuu.uasset
+++ b/Content/audio/Menuu.uasset
--- a/Content/audio/tikiteeth.uasset
+++ b/Content/audio/tikiteeth.uasset
--- a/Content/props/mand/Material_tik_010.uasset
+++ b/Content/props/mand/Material_tik_010.uasset
--- a/Content/props/mand/manbdast2_.uasset
+++ b/Content/props/mand/manbdast2_.uasset
--- a/Content/props/mand/platform_texture.uasset
+++ b/Content/props/mand/platform_texture.uasset
--- a/Content/props/tiki_blue/Material_tik_005.uasset
+++ b/Content/props/tiki_blue/Material_tik_005.uasset
--- a/Content/props/tiki_blue/Tikid_blue_2_.uasset
+++ b/Content/props/tiki_blue/Tikid_blue_2_.uasset
--- a/Content/props/tiki_blue/sadge_tiki_texture.uasset
+++ b/Content/props/tiki_blue/sadge_tiki_texture.uasset
--- a/Content/props/tiki_green/Material_tiki_004.uasset
+++ b/Content/props/tiki_green/Material_tiki_004.uasset
--- a/Content/props/tiki_green/Tikid_green2_.uasset
+++ b/Content/props/tiki_green/Tikid_green2_.uasset
--- a/Content/props/tiki_green/disgustang_tiki_texture.uasset
+++ b/Content/props/tiki_green/disgustang_tiki_texture.uasset
--- a/Content/props/tiki_red/Material_tik_001.uasset
+++ b/Content/props/tiki_red/Material_tik_001.uasset
--- a/Content/props/tiki_red/Tikid_rederere_2_.uasset
+++ b/Content/props/tiki_red/Tikid_rederere_2_.uasset
--- a/Content/props/tiki_red/angy_tiki_texture.uasset
+++ b/Content/props/tiki_red/angy_tiki_texture.uasset
--- a/Content/props/tiki_yellow/Material_tik_003.uasset
+++ b/Content/props/tiki_yellow/Material_tik_003.uasset
--- a/Content/props/tiki_yellow/Tikid_yellow_2_.uasset
+++ b/Content/props/tiki_yellow/Tikid_yellow_2_.uasset
--- a/Content/props/tiki_yellow/happy_tiki_texture.uasset
+++ b/Content/props/tiki_yellow/happy_tiki_texture.uasset