Skip to content

Instantly share code, notes, and snippets.

@BaalEvan
Created December 14, 2017 16:07
Show Gist options
  • Select an option

  • Save BaalEvan/524be53f47b3cc57e6d7371b4b59a4d3 to your computer and use it in GitHub Desktop.

Select an option

Save BaalEvan/524be53f47b3cc57e6d7371b4b59a4d3 to your computer and use it in GitHub Desktop.

Revisions

  1. @tinjaw tinjaw revised this gist Oct 15, 2016. 1 changed file with 2 additions and 2 deletions.
    4 changes: 2 additions & 2 deletions .gitattributes
    Original file line number Diff line number Diff line change
    @@ -11,9 +11,9 @@
    *.meta merge=unityyamlmerge eol=lf
    *.physicsMaterial merge=unityyamlmerge eol=lf
    *.physicsMaterial2D merge=unityyamlmerge eol=lf
    *.prefab merge=unityyamlmerge eol=lf filter=lfs diff=lfs -text
    *.unity merge=unityyamlmerge eol=lf filter=lfs diff=lfs -text

    *.prefab filter=lfs diff=lfs merge=lfs eol=lf -text
    *.unity filter=lfs diff=lfs merge=lfs eol=lf -text
    *.unitypackage filter=lfs diff=lfs merge=lfs -text
    *.cubemap filter=lfs diff=lfs merge=lfs -text

  2. @tinjaw tinjaw revised this gist Oct 15, 2016. 1 changed file with 5 additions and 8 deletions.
    13 changes: 5 additions & 8 deletions .gitattributes
    Original file line number Diff line number Diff line change
    @@ -11,8 +11,11 @@
    *.meta merge=unityyamlmerge eol=lf
    *.physicsMaterial merge=unityyamlmerge eol=lf
    *.physicsMaterial2D merge=unityyamlmerge eol=lf
    *.prefab merge=unityyamlmerge eol=lf
    *.unity merge=unityyamlmerge eol=lf
    *.prefab merge=unityyamlmerge eol=lf filter=lfs diff=lfs -text
    *.unity merge=unityyamlmerge eol=lf filter=lfs diff=lfs -text

    *.unitypackage filter=lfs diff=lfs merge=lfs -text
    *.cubemap filter=lfs diff=lfs merge=lfs -text


    ## git-lfs ##
    @@ -68,9 +71,3 @@
    *.rns filter=lfs diff=lfs merge=lfs -text
    *.tga filter=lfs diff=lfs merge=lfs -text
    *.ttf filter=lfs diff=lfs merge=lfs -text

    #Unity
    *.unity filter=lfs diff=lfs merge=lfs -text
    *.unitypackage filter=lfs diff=lfs merge=lfs -text
    *.cubemap filter=lfs diff=lfs merge=lfs -text
    *.prefab filter=lfs diff=lfs merge=lfs -text
  3. @tinjaw tinjaw revised this gist Jul 8, 2016. 1 changed file with 2 additions and 1 deletion.
    3 changes: 2 additions & 1 deletion .gitattributes
    Original file line number Diff line number Diff line change
    @@ -72,4 +72,5 @@
    #Unity
    *.unity filter=lfs diff=lfs merge=lfs -text
    *.unitypackage filter=lfs diff=lfs merge=lfs -text
    *.cubemap filter=lfs diff=lfs merge=lfs -text
    *.cubemap filter=lfs diff=lfs merge=lfs -text
    *.prefab filter=lfs diff=lfs merge=lfs -text
  4. @tinjaw tinjaw revised this gist Jul 5, 2016. 1 changed file with 1 addition and 0 deletions.
    1 change: 1 addition & 0 deletions .gitattributes
    Original file line number Diff line number Diff line change
    @@ -21,6 +21,7 @@
    *.ai filter=lfs diff=lfs merge=lfs -text
    *.bmp filter=lfs diff=lfs merge=lfs -text
    *.eps filter=lfs diff=lfs merge=lfs -text
    *.exr filter=lfs diff=lfs merge=lfs -text
    *.gif filter=lfs diff=lfs merge=lfs -text
    *.jpeg filter=lfs diff=lfs merge=lfs -text
    *.jpg filter=lfs diff=lfs merge=lfs -text
  5. @tinjaw tinjaw revised this gist Jul 5, 2016. 1 changed file with 1 addition and 0 deletions.
    1 change: 1 addition & 0 deletions .gitattributes
    Original file line number Diff line number Diff line change
    @@ -71,3 +71,4 @@
    #Unity
    *.unity filter=lfs diff=lfs merge=lfs -text
    *.unitypackage filter=lfs diff=lfs merge=lfs -text
    *.cubemap filter=lfs diff=lfs merge=lfs -text
  6. @tinjaw tinjaw revised this gist Jul 5, 2016. 1 changed file with 38 additions and 21 deletions.
    59 changes: 38 additions & 21 deletions .gitattributes
    Original file line number Diff line number Diff line change
    @@ -4,53 +4,70 @@
    *.cginc text
    *.shader text

    *.mat merge=unityyamlmerge eol=lf
    *.anim merge=unityyamlmerge eol=lf
    *.unity merge=unityyamlmerge eol=lf
    *.prefab merge=unityyamlmerge eol=lf
    *.physicsMaterial2D merge=unityyamlmerge eol=lf
    *.physicsMaterial merge=unityyamlmerge eol=lf
    *.asset merge=unityyamlmerge eol=lf
    *.meta merge=unityyamlmerge eol=lf
    *.controller merge=unityyamlmerge eol=lf
    *.mat merge=unityyamlmerge eol=lf
    *.meta merge=unityyamlmerge eol=lf
    *.physicsMaterial merge=unityyamlmerge eol=lf
    *.physicsMaterial2D merge=unityyamlmerge eol=lf
    *.prefab merge=unityyamlmerge eol=lf
    *.unity merge=unityyamlmerge eol=lf


    ## git-lfs ##

    #Image
    *.jpg filter=lfs diff=lfs merge=lfs -text
    *.ai filter=lfs diff=lfs merge=lfs -text
    *.bmp filter=lfs diff=lfs merge=lfs -text
    *.eps filter=lfs diff=lfs merge=lfs -text
    *.gif filter=lfs diff=lfs merge=lfs -text
    *.jpeg filter=lfs diff=lfs merge=lfs -text
    *.jpg filter=lfs diff=lfs merge=lfs -text
    *.png filter=lfs diff=lfs merge=lfs -text
    *.gif filter=lfs diff=lfs merge=lfs -text
    *.psd filter=lfs diff=lfs merge=lfs -text
    *.ai filter=lfs diff=lfs merge=lfs -text
    *.svg filter=lfs diff=lfs merge=lfs -text
    *.tga filter=lfs diff=lfs merge=lfs -text
    *.tif filter=lfs diff=lfs merge=lfs -text

    #Audio
    *.mp3 filter=lfs diff=lfs merge=lfs -text
    *.wav filter=lfs diff=lfs merge=lfs -text
    *.ogg filter=lfs diff=lfs merge=lfs -text
    *.wav filter=lfs diff=lfs merge=lfs -text

    #Video
    *.mp4 filter=lfs diff=lfs merge=lfs -text
    *.avi filter=lfs diff=lfs merge=lfs -text
    *.flv filter=lfs diff=lfs merge=lfs -text
    *.mov filter=lfs diff=lfs merge=lfs -text
    *.mp4 filter=lfs diff=lfs merge=lfs -text
    *.mpg filter=lfs diff=lfs merge=lfs -text
    *.wmv filter=lfs diff=lfs merge=lfs -text

    #3D Object
    *.FBX filter=lfs diff=lfs merge=lfs -text
    *.fbx filter=lfs diff=lfs merge=lfs -text
    *.blend filter=lfs diff=lfs merge=lfs -text
    *.fbx filter=lfs diff=lfs merge=lfs -text
    *.obj filter=lfs diff=lfs merge=lfs -text

    #Compressed Archives
    *.7z filter=lfs diff=lfs merge=lfs -text
    *.gz filter=lfs diff=lfs merge=lfs -text
    *.rar filter=lfs diff=lfs merge=lfs -text
    *.zip filter=lfs diff=lfs merge=lfs -text

    #ETC
    *.a filter=lfs diff=lfs merge=lfs -text
    *.aif filter=lfs diff=lfs merge=lfs -text
    *.dds filter=lfs diff=lfs merge=lfs -text
    *.dll filter=lfs diff=lfs merge=lfs -text
    *.exr filter=lfs diff=lfs merge=lfs -text
    *.tga filter=lfs diff=lfs merge=lfs -text
    *.lxo filter=lfs diff=lfs merge=lfs -text
    *.otf filter=lfs diff=lfs merge=lfs -text
    *.pdf filter=lfs diff=lfs merge=lfs -text
    *.zip filter=lfs diff=lfs merge=lfs -text
    *.dll filter=lfs diff=lfs merge=lfs -text
    *.unitypackage filter=lfs diff=lfs merge=lfs -text
    *.aif filter=lfs diff=lfs merge=lfs -text
    *.ttf filter=lfs diff=lfs merge=lfs -text
    *.rns filter=lfs diff=lfs merge=lfs -text
    *.reason filter=lfs diff=lfs merge=lfs -text
    *.lxo filter=lfs diff=lfs merge=lfs -text
    *.rns filter=lfs diff=lfs merge=lfs -text
    *.tga filter=lfs diff=lfs merge=lfs -text
    *.ttf filter=lfs diff=lfs merge=lfs -text

    #Unity
    *.unity filter=lfs diff=lfs merge=lfs -text
    *.unitypackage filter=lfs diff=lfs merge=lfs -text
  7. @nemotoo nemotoo revised this gist Apr 13, 2016. 1 changed file with 1 addition and 0 deletions.
    1 change: 1 addition & 0 deletions .gitattributes
    Original file line number Diff line number Diff line change
    @@ -28,6 +28,7 @@
    #Audio
    *.mp3 filter=lfs diff=lfs merge=lfs -text
    *.wav filter=lfs diff=lfs merge=lfs -text
    *.ogg filter=lfs diff=lfs merge=lfs -text

    #Video
    *.mp4 filter=lfs diff=lfs merge=lfs -text
  8. @nemotoo nemotoo created this gist Apr 13, 2016.
    55 changes: 55 additions & 0 deletions .gitattributes
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,55 @@
    ## Unity ##

    *.cs diff=csharp text
    *.cginc text
    *.shader text

    *.mat merge=unityyamlmerge eol=lf
    *.anim merge=unityyamlmerge eol=lf
    *.unity merge=unityyamlmerge eol=lf
    *.prefab merge=unityyamlmerge eol=lf
    *.physicsMaterial2D merge=unityyamlmerge eol=lf
    *.physicsMaterial merge=unityyamlmerge eol=lf
    *.asset merge=unityyamlmerge eol=lf
    *.meta merge=unityyamlmerge eol=lf
    *.controller merge=unityyamlmerge eol=lf


    ## git-lfs ##

    #Image
    *.jpg filter=lfs diff=lfs merge=lfs -text
    *.jpeg filter=lfs diff=lfs merge=lfs -text
    *.png filter=lfs diff=lfs merge=lfs -text
    *.gif filter=lfs diff=lfs merge=lfs -text
    *.psd filter=lfs diff=lfs merge=lfs -text
    *.ai filter=lfs diff=lfs merge=lfs -text

    #Audio
    *.mp3 filter=lfs diff=lfs merge=lfs -text
    *.wav filter=lfs diff=lfs merge=lfs -text

    #Video
    *.mp4 filter=lfs diff=lfs merge=lfs -text
    *.mov filter=lfs diff=lfs merge=lfs -text

    #3D Object
    *.FBX filter=lfs diff=lfs merge=lfs -text
    *.fbx filter=lfs diff=lfs merge=lfs -text
    *.blend filter=lfs diff=lfs merge=lfs -text
    *.obj filter=lfs diff=lfs merge=lfs -text

    #ETC
    *.a filter=lfs diff=lfs merge=lfs -text
    *.exr filter=lfs diff=lfs merge=lfs -text
    *.tga filter=lfs diff=lfs merge=lfs -text
    *.pdf filter=lfs diff=lfs merge=lfs -text
    *.zip filter=lfs diff=lfs merge=lfs -text
    *.dll filter=lfs diff=lfs merge=lfs -text
    *.unitypackage filter=lfs diff=lfs merge=lfs -text
    *.aif filter=lfs diff=lfs merge=lfs -text
    *.ttf filter=lfs diff=lfs merge=lfs -text
    *.rns filter=lfs diff=lfs merge=lfs -text
    *.reason filter=lfs diff=lfs merge=lfs -text
    *.lxo filter=lfs diff=lfs merge=lfs -text