-
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
89fda39
commit c189e7b
Showing
7 changed files
with
180 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| ############################################################################### | ||
| # Set default behavior to automatically normalize line endings. | ||
| ############################################################################### | ||
| * text=auto | ||
|
|
||
| ############################################################################### | ||
| # Set default behavior for command prompt diff. | ||
| # | ||
| # This is need for earlier builds of msysgit that does not have it on by | ||
| # default for csharp files. | ||
| # Note: This is only used by command line | ||
| ############################################################################### | ||
| *.cs diff=csharp | ||
|
|
||
| ############################################################################### | ||
| # Set the merge driver for project and solution files | ||
| # | ||
| # Merging from the command prompt will add diff markers to the files if there | ||
| # are conflicts (Merging from VS is not affected by the settings below, in VS | ||
| # the diff markers are never inserted). Diff markers may cause the following | ||
| # file extensions to fail to load in VS. An alternative would be to treat | ||
| # these files as binary and thus will always conflict and require user | ||
| # intervention with every merge. To do so, just uncomment the entries below | ||
| ############################################################################### | ||
| *.sln merge=binary | ||
| *.csproj merge=binary | ||
| *.vbproj merge=binary | ||
| *.vcxproj merge=binary | ||
| *.vcproj merge=binary | ||
| *.dbproj merge=binary | ||
| *.fsproj merge=binary | ||
| *.lsproj merge=binary | ||
| *.wixproj merge=binary | ||
| *.modelproj merge=binary | ||
| *.sqlproj merge=binary | ||
| *.wwaproj merge=binary | ||
| *.user merge=binary | ||
|
|
||
| ############################################################################### | ||
| # behavior for image files | ||
| # | ||
| # image files are treated as binary by default. | ||
| ############################################################################### | ||
| *.jpg binary | ||
| *.jpeg binary | ||
| *.png binary | ||
| *.gif binary | ||
| *.tif binary | ||
| *.tiff binary | ||
| *.ico binary | ||
| # SVG treated as an asset (binary) by default. | ||
| # *.svg text | ||
| # If you want to treat it as binary, | ||
| # use the following line instead. | ||
| *.svg binary | ||
| *.eps binary | ||
| *.webp binary | ||
|
|
||
| ############################################################################### | ||
| # diff behavior for common document formats | ||
| # | ||
| # Convert binary document formats to text before diffing them. This feature | ||
| # is only available from the command line. Turn it on by uncommenting the | ||
| # entries below. | ||
| ############################################################################### | ||
| *.doc diff=astextplain | ||
| *.DOC diff=astextplain | ||
| *.docx diff=astextplain | ||
| *.DOCX diff=astextplain | ||
| *.dot diff=astextplain | ||
| *.DOT diff=astextplain | ||
| *.pdf diff=astextplain | ||
| *.PDF diff=astextplain | ||
| *.rtf diff=astextplain | ||
| *.RTF diff=astextplain | ||
| *.bibtex text diff=bibtex | ||
| *.md text | ||
| *.tex text diff=tex | ||
| *.adoc text | ||
| *.textile text | ||
| *.mustache text | ||
| *.csv text | ||
| *.tab text | ||
| *.tsv text | ||
| *.txt text | ||
| *.sql text | ||
| *.ps1 text | ||
| *.props text | ||
| *.config text | ||
| .DotSettings text | ||
| LICENSE text | ||
|
|
||
| # Scripts | ||
| *.bash text eol=lf | ||
| *.fish text eol=lf | ||
| *.sh text eol=lf | ||
| # These are explicitly windows files and should use crlf | ||
| *.bat text eol=crlf | ||
| *.cmd text eol=crlf | ||
|
|
||
| # Serialisation | ||
| *.json text | ||
| *.toml text | ||
| *.xml text | ||
| *.yaml text | ||
| *.yml text | ||
|
|
||
| # Archives | ||
| *.7z binary | ||
| *.gz binary | ||
| *.tar binary | ||
| *.tgz binary | ||
| *.zip binary | ||
| *.rar binary | ||
|
|
||
| # Unity | ||
| *.unitypackage binary | ||
| *.manifest merge=binary | ||
|
|
||
| # Text files where line endings should be preserved | ||
| *.patch -text | ||
|
|
||
| # | ||
| # Exclude files from exporting | ||
| # | ||
| .gitattributes export-ignore | ||
| .gitignore export-ignore | ||
| .gitkeep export-ignore |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| // This file is used by Code Analysis to maintain SuppressMessage | ||
| // attributes that are applied to this project. | ||
| // Project-level suppressions either have no target or are given | ||
| // a specific target and scoped to a namespace, type, member, etc. | ||
|
|
||
| using System.Diagnostics.CodeAnalysis; | ||
|
|
||
| [assembly: SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "<Pending>", Scope = "member", Target = "~M:Digitalroot.Valheim.Common.Utils.Spawn(System.String,UnityEngine.GameObject,UnityEngine.Vector3,UnityEngine.Transform)~UnityEngine.GameObject")] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters