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

Difficulty
korras
2023-10-01 12:34:06 +03:00 · 2023-10-01 12:33:45 +03:00 · 2023-10-01 11:22:14 +02:00 · 2023-10-01 09:25:08 +02:00 · 2023-10-01 09:22:52 +02:00 · 2023-10-01 10:20:52 +03:00
23 changed files with 55 additions and 28 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
+GameInstanceClass=/Game/GameInstance.GameInstance_C
-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_FirstPersonGameMode.uasset
+++ b/Content/FirstPerson/Blueprints/BP_FirstPersonGameMode.uasset
--- a/Content/FirstPerson/Blueprints/BP_FirstPersonPlayerController.uasset
+++ b/Content/FirstPerson/Blueprints/BP_FirstPersonPlayerController.uasset
--- a/Content/GameInstance.uasset
+++ b/Content/GameInstance.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/Levels/Start_level.umap
+++ b/Content/Levels/Start_level.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/button.uasset
+++ b/Content/button.uasset
--- a/Content/credits.uasset
+++ b/Content/credits.uasset
--- a/Content/endscreen.uasset
+++ b/Content/endscreen.uasset
--- a/Content/gameover_screen.uasset
+++ b/Content/gameover_screen.uasset
--- a/Content/highscore.uasset
+++ b/Content/highscore.uasset
--- a/Content/main_menu.uasset
+++ b/Content/main_menu.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
--- a/Content/props/oda/odamidaaa.uasset
+++ b/Content/props/oda/odamidaaa.uasset
--- a/Content/starting_screen.uasset
+++ b/Content/starting_screen.uasset
Author	SHA1	Message	Date
THICCmees	635a288222	Merge branch 'master' of https://cgvrgit.ulno.net/Kaspar/GameJam202309	2023-10-01 12:34:06 +03:00
THICCmees	403d64f829	Difficulty	2023-10-01 12:33:45 +03:00
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
THICCmees	7d329dd204	ssssss	2023-10-01 10:20:52 +03:00
THICCmees	3eb03a7dff	ajsaduuedvärgidsärgid	2023-10-01 10:20:35 +03:00