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

# Conflicts: # Content/Levels/Moving_tikis.umap
MAP!!!
2023-09-30 14:46:43 +03:00 · 2023-09-30 14:43:25 +03:00
2 changed files with 4 additions and 4 deletions
--- a/Content/Levels/Moving_tikis.umap
+++ b/Content/Levels/Moving_tikis.umap
--- a/Content/Moving_objects/Moving_obstacle.uasset
+++ b/Content/Moving_objects/Moving_obstacle.uasset
Author	SHA1	Message	Date
THICCmees	55f53bed32	Merge branch 'master' of https://cgvrgit.ulno.net/Kaspar/GameJam202309 # Conflicts: # Content/Levels/Moving_tikis.umap	2023-09-30 14:46:43 +03:00
THICCmees	68fc00d310	MAP!!!	2023-09-30 14:43:25 +03:00