diff --git a/.gitattributes b/.gitattributes index 390d9ff..ccf500c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,24 @@ +# Unreal Engine file types. *.uasset filter=lfs diff=lfs merge=lfs -text *.umap filter=lfs diff=lfs merge=lfs -text + +# Raw Content file types. +*.3ds filter=lfs diff=lfs merge=lfs -text +*.bmp filter=lfs diff=lfs merge=lfs -text +*.exr filter=lfs diff=lfs merge=lfs -text +*.fbx filter=lfs diff=lfs merge=lfs -text +*.jpeg filter=lfs diff=lfs merge=lfs -text +*.jpg filter=lfs diff=lfs merge=lfs -text +*.mov filter=lfs diff=lfs merge=lfs -text +*.mp3 filter=lfs diff=lfs merge=lfs -text +*.mp4 filter=lfs diff=lfs merge=lfs -text +*.obj filter=lfs diff=lfs merge=lfs -text +*.ogg filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.psd filter=lfs diff=lfs merge=lfs -text +*.tga filter=lfs diff=lfs merge=lfs -text +*.wav filter=lfs diff=lfs merge=lfs -text +*.xcf filter=lfs diff=lfs merge=lfs -text + +# Anything in `/RawContent` dir. +/RawContent/**/* filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/.gitignore b/.gitignore index c68e330..2155d96 100644 --- a/.gitignore +++ b/.gitignore @@ -72,4 +72,9 @@ Intermediate/* Plugins/*/Intermediate/* # Cache files for the editor to use -DerivedDataCache/* \ No newline at end of file +<<<<<<< HEAD +DerivedDataCache/* +======= +DerivedDataCache/* + +>>>>>>> a569397409cdf09d35fb17d765fba8657450e883 diff --git a/README.md b/README.md new file mode 100644 index 0000000..74189fb --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# CrownOfAshes +