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

# Conflicts: # Content/Levels/Moving_tikis.umap
2023-10-01 09:25:08 +02:00
parent 02d6dab238 7d329dd204
commit 9e01da89c0
12 changed files with 25 additions and 22 deletions
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@@ -4,14 +4,14 @@
 +EditProfiles=(Name="Trigger",CustomResponses=((Channel=Projectile, Response=ECR_Ignore)))

 [/Script/EngineSettings.GameMapsSettings]
-EditorStartupMap=/Game/Levels/Moving_tikis.Moving_tikis
+EditorStartupMap=/Game/Levels/Start_level.Start_level
 LocalMapOptions=
 TransitionMap=
 bUseSplitscreen=True
 TwoPlayerSplitscreenLayout=Horizontal
 ThreePlayerSplitscreenLayout=FavorTop
 GameInstanceClass=/Script/Engine.GameInstance
-GameDefaultMap=/Game/Levels/Moving_tikis.Moving_tikis
+GameDefaultMap=/Game/Levels/Start_level.Start_level
 ServerDefaultMap=/Engine/Maps/Entry
 GlobalDefaultGameMode=/Game/FirstPerson/Blueprints/BP_FirstPersonGameMode.BP_FirstPersonGameMode_C
 GlobalDefaultServerGameMode=None
--- a/Content/Difficulty.uasset
+++ b/Content/Difficulty.uasset
--- a/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
+++ b/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
--- a/Content/FirstPerson/Blueprints/BP_FirstPersonPlayerController.uasset
+++ b/Content/FirstPerson/Blueprints/BP_FirstPersonPlayerController.uasset
--- a/Content/HAMBAD/uued_hambad/hambadltekstuuritud02_Cube_001.uasset
+++ b/Content/HAMBAD/uued_hambad/hambadltekstuuritud02_Cube_001.uasset
--- 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
--- a/Content/Options.uasset
+++ b/Content/Options.uasset
--- a/Content/endscreen.uasset
+++ b/Content/endscreen.uasset
--- a/Content/highscore.uasset
+++ b/Content/highscore.uasset
--- a/Content/main_menu.uasset
+++ b/Content/main_menu.uasset
--- a/Content/props/oda/odamidaaa.uasset
+++ b/Content/props/oda/odamidaaa.uasset