Merge branch 'master' of https://cgvrgit.ulno.net/Kaspar/GameJam202309
# Conflicts: # Content/Levels/Moving_tikis.umap
This commit is contained in:
		
						commit
						9e01da89c0
					
				| @ -4,14 +4,14 @@ | |||||||
| +EditProfiles=(Name="Trigger",CustomResponses=((Channel=Projectile, Response=ECR_Ignore))) | +EditProfiles=(Name="Trigger",CustomResponses=((Channel=Projectile, Response=ECR_Ignore))) | ||||||
| 
 | 
 | ||||||
| [/Script/EngineSettings.GameMapsSettings] | [/Script/EngineSettings.GameMapsSettings] | ||||||
| EditorStartupMap=/Game/Levels/Moving_tikis.Moving_tikis | EditorStartupMap=/Game/Levels/Start_level.Start_level | ||||||
| LocalMapOptions= | LocalMapOptions= | ||||||
| TransitionMap= | TransitionMap= | ||||||
| bUseSplitscreen=True | bUseSplitscreen=True | ||||||
| TwoPlayerSplitscreenLayout=Horizontal | TwoPlayerSplitscreenLayout=Horizontal | ||||||
| ThreePlayerSplitscreenLayout=FavorTop | ThreePlayerSplitscreenLayout=FavorTop | ||||||
| GameInstanceClass=/Script/Engine.GameInstance | GameInstanceClass=/Script/Engine.GameInstance | ||||||
| GameDefaultMap=/Game/Levels/Moving_tikis.Moving_tikis | GameDefaultMap=/Game/Levels/Start_level.Start_level | ||||||
| ServerDefaultMap=/Engine/Maps/Entry | ServerDefaultMap=/Engine/Maps/Entry | ||||||
| GlobalDefaultGameMode=/Game/FirstPerson/Blueprints/BP_FirstPersonGameMode.BP_FirstPersonGameMode_C | GlobalDefaultGameMode=/Game/FirstPerson/Blueprints/BP_FirstPersonGameMode.BP_FirstPersonGameMode_C | ||||||
| GlobalDefaultServerGameMode=None | GlobalDefaultServerGameMode=None | ||||||
|  | |||||||
							
								
								
									
										
											BIN
										
									
								
								Content/Difficulty.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Difficulty.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/FirstPerson/Blueprints/BP_FirstPersonPlayerController.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/FirstPerson/Blueprints/BP_FirstPersonPlayerController.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/HAMBAD/uued_hambad/hambadltekstuuritud02_Cube_001.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/HAMBAD/uued_hambad/hambadltekstuuritud02_Cube_001.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Levels/Moving_tikis.umap
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Levels/Moving_tikis.umap
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Moving_objects/Moving_obstacle.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Moving_objects/Moving_obstacle.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Options.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Options.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/endscreen.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/endscreen.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/highscore.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/highscore.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/main_menu.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/main_menu.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/props/oda/odamidaaa.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/props/oda/odamidaaa.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user