Merge remote-tracking branch 'origin/programming' into leveldesign
This commit is contained in:
		
						commit
						b5f5a4e44c
					
				@ -140,6 +140,9 @@ PlayerSettings:
 | 
				
			|||||||
  bundleVersion: 0.1
 | 
					  bundleVersion: 0.1
 | 
				
			||||||
  preloadedAssets:
 | 
					  preloadedAssets:
 | 
				
			||||||
  - {fileID: 11400000, guid: be340e3c48769439d8d18a5a2bccd498, type: 2}
 | 
					  - {fileID: 11400000, guid: be340e3c48769439d8d18a5a2bccd498, type: 2}
 | 
				
			||||||
 | 
					  - {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260, type: 2}
 | 
				
			||||||
 | 
					  - {fileID: -8196854396901781169, guid: 1a4c68ca72a83449f938d669337cb305, type: 2}
 | 
				
			||||||
 | 
					  - {fileID: -64324148185763206, guid: a9a6963505ddf7f4d886008c6dc86122, type: 2}
 | 
				
			||||||
  metroInputSource: 0
 | 
					  metroInputSource: 0
 | 
				
			||||||
  wsaTransparentSwapchain: 0
 | 
					  wsaTransparentSwapchain: 0
 | 
				
			||||||
  m_HolographicPauseOnTrackingLoss: 1
 | 
					  m_HolographicPauseOnTrackingLoss: 1
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user