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

slidermusic
2023-09-30 20:23:46 +02:00 · 2023-09-30 20:18:08 +02:00
6 changed files with 14 additions and 8 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/FirstPerson/Blueprints/BP_FirstPersonPlayerController.uasset
+++ b/Content/FirstPerson/Blueprints/BP_FirstPersonPlayerController.uasset
--- a/Content/Levels/Start_level.umap
+++ b/Content/Levels/Start_level.umap
--- a/Content/Options.uasset
+++ b/Content/Options.uasset
--- a/Content/audio/tikiteeth.uasset
+++ b/Content/audio/tikiteeth.uasset
--- a/Content/mastervolume.uasset
+++ b/Content/mastervolume.uasset
Author	SHA1	Message	Date
FatCat2627	8349c48e7e	Merge branch 'master' of https://cgvrgit.ulno.net/Kaspar/GameJam202309	2023-09-30 20:23:46 +02:00
FatCat2627	8be97f5869	slidermusic	2023-09-30 20:18:08 +02:00