korras

Merge branch 'master' of https://cgvrgit.ulno.net/Kaspar/GameJam202309
# Conflicts: # Content/Levels/Moving_tikis.umap
2023-10-01 11:22:14 +02:00 · 2023-10-01 09:25:08 +02:00 · 2023-10-01 09:22:52 +02:00
7 changed files with 17 additions and 5 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/credits.uasset
+++ b/Content/credits.uasset
--- a/Content/pictures/karlio.uasset
+++ b/Content/pictures/karlio.uasset
--- a/Content/pictures/kasparki.uasset
+++ b/Content/pictures/kasparki.uasset
--- a/Content/pictures/kevino.uasset
+++ b/Content/pictures/kevino.uasset
--- a/Content/pictures/krissuli.uasset
+++ b/Content/pictures/krissuli.uasset
Author	SHA1	Message	Date
FatCat2627	77e723f623	korras	2023-10-01 11:22:14 +02:00
FatCat2627	9e01da89c0	Merge branch 'master' of https://cgvrgit.ulno.net/Kaspar/GameJam202309 # Conflicts: # Content/Levels/Moving_tikis.umap	2023-10-01 09:25:08 +02:00
FatCat2627	02d6dab238	ggrip	2023-10-01 09:22:52 +02:00