Merge remote-tracking branch 'origin/Gun-model' into dev
This commit is contained in:
		
						commit
						41d78d8846
					
				
							
								
								
									
										
											BIN
										
									
								
								Art Misc/Gun1/Gun.mb
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Art Misc/Gun1/Gun.mb
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Art Misc/Gun1/gun_low.fbx
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Art Misc/Gun1/gun_low.fbx
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_BaseColor.png
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_BaseColor.png
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Height.png
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Height.png
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Metallic.png
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Metallic.png
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Normal.png
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Normal.png
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Roughness.png
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Roughness.png
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user