Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021
This commit is contained in:
		
							
								
								
									
										
											BIN
										
									
								
								Assets/Models/pyramid_02.fbx
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Assets/Models/pyramid_02.fbx
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Assets/Sprites/background.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Assets/Sprites/background.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 153 KiB  | 
@@ -8,7 +8,7 @@ EditorBuildSettings:
 | 
				
			|||||||
  - enabled: 1
 | 
					  - enabled: 1
 | 
				
			||||||
    path: Assets/Scenes/Vasek.unity
 | 
					    path: Assets/Scenes/Vasek.unity
 | 
				
			||||||
    guid: 127deaeaf7712824f83ee4cba639e023
 | 
					    guid: 127deaeaf7712824f83ee4cba639e023
 | 
				
			||||||
  - enabled: 1
 | 
					  - enabled: 0
 | 
				
			||||||
    path: Assets/Scenes/Filip.unity
 | 
					    path: Assets/Scenes/Filip.unity
 | 
				
			||||||
    guid: 326dea585e0ea574389529eaae8a0ab4
 | 
					    guid: 326dea585e0ea574389529eaae8a0ab4
 | 
				
			||||||
  m_configObjects: {}
 | 
					  m_configObjects: {}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user