Merge branch 'master' into Kauri-movment-test
This commit is contained in:
		
						commit
						295a076707
					
				
							
								
								
									
										50
									
								
								.gitattributes
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										50
									
								
								.gitattributes
									
									
									
									
										vendored
									
									
								
							| @ -2,31 +2,31 @@ Content/** filter=lfs diff=lfs merge=lfs -text | |||||||
| # Auto detect text files and perform LF normalization | # Auto detect text files and perform LF normalization | ||||||
| * text=auto | * text=auto | ||||||
| # UE file types | # UE file types | ||||||
| *.uasset filter=lfs diff=lfs merge=lfs -text | *.uasset filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.umap filter=lfs diff=lfs merge=lfs -text | *.umap filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.udk filter=lfs diff=lfs merge=lfs -text | *.udk filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.upk filter=lfs diff=lfs merge=lfs -text | *.upk filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| # Anything in `/RawContent` dir. [You create this directory in your projects root folder] | # Anything in `/RawContent` dir. [You create this directory in your projects root folder] | ||||||
| /RawContent/**/* filter=lfs diff=lfs merge=lfs -text | /RawContent/**/* filter=lfs diff=lfs merge=lfs -text | ||||||
| # Raw Content types | # Raw Content types | ||||||
| *.blend filter=lfs diff=lfs merge=lfs -text | *.blend filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.duf filter=lfs diff=lfs merge=lfs -text | *.duf filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.bin.fbx filter=lfs diff=lfs merge=lfs -text | *.bin.fbx filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.fbx filter=lfs diff=lfs merge=lfs -text | *.fbx filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.obj filter=lfs diff=lfs merge=lfs -text | *.obj filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.png filter=lfs diff=lfs merge=lfs -text | *.png filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.jpg filter=lfs diff=lfs merge=lfs -text | *.jpg filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.jpeg filter=lfs diff=lfs merge=lfs -text | *.jpeg filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.hdr filter=lfs diff=lfs merge=lfs -text | *.hdr filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.exr filter=lfs diff=lfs merge=lfs -text | *.exr filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.mp3 filter=lfs diff=lfs merge=lfs -text | *.mp3 filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.mp4 filter=lfs diff=lfs merge=lfs -text | *.mp4 filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.mov filter=lfs diff=lfs merge=lfs -text | *.mov filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.wav filter=lfs diff=lfs merge=lfs -text | *.wav filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.3ds filter=lfs diff=lfs merge=lfs -text | *.3ds filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.psd filter=lfs diff=lfs merge=lfs -text | *.psd filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.mb filter=lfs diff=lfs merge=lfs -text | *.mb filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.tga filter=lfs diff=lfs merge=lfs -text | *.tga filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.cubemap filter=lfs diff=lfs merge=lfs -text | *.cubemap filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.tif filter=lfs diff=lfs merge=lfs -text | *.tif filter=lfs diff=lfs merge=lfs -text lockable | ||||||
| *.xcf filter=lfs diff=lfs merge=lfs -text | *.xcf filter=lfs diff=lfs merge=lfs -text lockable | ||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user