-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
## [2.1.0-preview.5] - 2020-06-09 ## Fixed - Fix error when partially publishing without the window open ## [2.1.0-preview.4] - 2020-04-03 ## Fixed - Fixed bug with process info not updating properly after canceled publish - Fixed bug with error message when refreshing changes
- Loading branch information
Unity Technologies
committed
Jun 9, 2020
1 parent
1cf29c7
commit 88c735c
Showing
195 changed files
with
16,380 additions
and
16,341 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 |
|---|---|---|
| @@ -1,86 +1,86 @@ | ||
| * text=auto | ||
| # Unity files | ||
| *.meta -text merge=unityyamlmerge diff | ||
| *.unity -text merge=unityyamlmerge diff | ||
| *.asset -text merge=unityyamlmerge diff | ||
| *.prefab -text merge=unityyamlmerge diff | ||
| *.mat -text merge=unityyamlmerge diff | ||
| *.anim -text merge=unityyamlmerge diff | ||
| *.controller -text merge=unityyamlmerge diff | ||
| *.overrideController -text merge=unityyamlmerge diff | ||
| *.physicMaterial -text merge=unityyamlmerge diff | ||
| *.physicsMaterial2D -text merge=unityyamlmerge diff | ||
| *.playable -text merge=unityyamlmerge diff | ||
| *.mask -text merge=unityyamlmerge diff | ||
| *.brush -text merge=unityyamlmerge diff | ||
| *.flare -text merge=unityyamlmerge diff | ||
| *.fontsettings -text merge=unityyamlmerge diff | ||
| *.guiskin -text merge=unityyamlmerge diff | ||
| *.giparams -text merge=unityyamlmerge diff | ||
| *.renderTexture -text merge=unityyamlmerge diff | ||
| *.spriteatlas -text merge=unityyamlmerge diff | ||
| *.terrainlayer -text merge=unityyamlmerge diff | ||
| *.mixer -text merge=unityyamlmerge diff | ||
| *.shadervariants -text merge=unityyamlmerge diff | ||
| # Image formats | ||
| *.psd 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 | ||
| *.bmp filter=lfs diff=lfs merge=lfs -text | ||
| *.tga filter=lfs diff=lfs merge=lfs -text | ||
| *.tiff filter=lfs diff=lfs merge=lfs -text | ||
| *.tif filter=lfs diff=lfs merge=lfs -text | ||
| *.iff filter=lfs diff=lfs merge=lfs -text | ||
| *.pict filter=lfs diff=lfs merge=lfs -text | ||
| *.dds filter=lfs diff=lfs merge=lfs -text | ||
| *.xcf filter=lfs diff=lfs merge=lfs -text | ||
| # Audio formats | ||
| *.mp3 filter=lfs diff=lfs merge=lfs -text | ||
| *.ogg filter=lfs diff=lfs merge=lfs -text | ||
| *.wav filter=lfs diff=lfs merge=lfs -text | ||
| *.aiff filter=lfs diff=lfs merge=lfs -text | ||
| *.aif filter=lfs diff=lfs merge=lfs -text | ||
| *.mod filter=lfs diff=lfs merge=lfs -text | ||
| *.it filter=lfs diff=lfs merge=lfs -text | ||
| *.s3m filter=lfs diff=lfs merge=lfs -text | ||
| *.xm filter=lfs diff=lfs merge=lfs -text | ||
| # Video formats | ||
| *.mov filter=lfs diff=lfs merge=lfs -text | ||
| *.avi filter=lfs diff=lfs merge=lfs -text | ||
| *.asf filter=lfs diff=lfs merge=lfs -text | ||
| *.mpg filter=lfs diff=lfs merge=lfs -text | ||
| *.mpeg filter=lfs diff=lfs merge=lfs -text | ||
| *.mp4 filter=lfs diff=lfs merge=lfs -text | ||
| # 3D formats | ||
| *.fbx filter=lfs diff=lfs merge=lfs -text | ||
| *.obj filter=lfs diff=lfs merge=lfs -text | ||
| *.max filter=lfs diff=lfs merge=lfs -text | ||
| *.blend filter=lfs diff=lfs merge=lfs -text | ||
| *.dae filter=lfs diff=lfs merge=lfs -text | ||
| *.mb filter=lfs diff=lfs merge=lfs -text | ||
| *.ma filter=lfs diff=lfs merge=lfs -text | ||
| *.3ds filter=lfs diff=lfs merge=lfs -text | ||
| *.dfx filter=lfs diff=lfs merge=lfs -text | ||
| *.c4d filter=lfs diff=lfs merge=lfs -text | ||
| *.lwo filter=lfs diff=lfs merge=lfs -text | ||
| *.lwo2 filter=lfs diff=lfs merge=lfs -text | ||
| *.abc filter=lfs diff=lfs merge=lfs -text | ||
| *.3dm filter=lfs diff=lfs merge=lfs -text | ||
| # Build | ||
| *.dll filter=lfs diff=lfs merge=lfs -text | ||
| *.pdb filter=lfs diff=lfs merge=lfs -text | ||
| *.mdb filter=lfs diff=lfs merge=lfs -text | ||
| # Packaging | ||
| *.zip filter=lfs diff=lfs merge=lfs -text | ||
| *.7z filter=lfs diff=lfs merge=lfs -text | ||
| *.gz filter=lfs diff=lfs merge=lfs -text | ||
| *.rar filter=lfs diff=lfs merge=lfs -text | ||
| *.tar filter=lfs diff=lfs merge=lfs -text | ||
| * text=auto | ||
|
|
||
| # Unity files | ||
| *.meta -text merge=unityyamlmerge diff | ||
| *.unity -text merge=unityyamlmerge diff | ||
| *.asset -text merge=unityyamlmerge diff | ||
| *.prefab -text merge=unityyamlmerge diff | ||
| *.mat -text merge=unityyamlmerge diff | ||
| *.anim -text merge=unityyamlmerge diff | ||
| *.controller -text merge=unityyamlmerge diff | ||
| *.overrideController -text merge=unityyamlmerge diff | ||
| *.physicMaterial -text merge=unityyamlmerge diff | ||
| *.physicsMaterial2D -text merge=unityyamlmerge diff | ||
| *.playable -text merge=unityyamlmerge diff | ||
| *.mask -text merge=unityyamlmerge diff | ||
| *.brush -text merge=unityyamlmerge diff | ||
| *.flare -text merge=unityyamlmerge diff | ||
| *.fontsettings -text merge=unityyamlmerge diff | ||
| *.guiskin -text merge=unityyamlmerge diff | ||
| *.giparams -text merge=unityyamlmerge diff | ||
| *.renderTexture -text merge=unityyamlmerge diff | ||
| *.spriteatlas -text merge=unityyamlmerge diff | ||
| *.terrainlayer -text merge=unityyamlmerge diff | ||
| *.mixer -text merge=unityyamlmerge diff | ||
| *.shadervariants -text merge=unityyamlmerge diff | ||
|
|
||
| # Image formats | ||
| *.psd 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 | ||
| *.bmp filter=lfs diff=lfs merge=lfs -text | ||
| *.tga filter=lfs diff=lfs merge=lfs -text | ||
| *.tiff filter=lfs diff=lfs merge=lfs -text | ||
| *.tif filter=lfs diff=lfs merge=lfs -text | ||
| *.iff filter=lfs diff=lfs merge=lfs -text | ||
| *.pict filter=lfs diff=lfs merge=lfs -text | ||
| *.dds filter=lfs diff=lfs merge=lfs -text | ||
| *.xcf filter=lfs diff=lfs merge=lfs -text | ||
|
|
||
| # Audio formats | ||
| *.mp3 filter=lfs diff=lfs merge=lfs -text | ||
| *.ogg filter=lfs diff=lfs merge=lfs -text | ||
| *.wav filter=lfs diff=lfs merge=lfs -text | ||
| *.aiff filter=lfs diff=lfs merge=lfs -text | ||
| *.aif filter=lfs diff=lfs merge=lfs -text | ||
| *.mod filter=lfs diff=lfs merge=lfs -text | ||
| *.it filter=lfs diff=lfs merge=lfs -text | ||
| *.s3m filter=lfs diff=lfs merge=lfs -text | ||
| *.xm filter=lfs diff=lfs merge=lfs -text | ||
|
|
||
| # Video formats | ||
| *.mov filter=lfs diff=lfs merge=lfs -text | ||
| *.avi filter=lfs diff=lfs merge=lfs -text | ||
| *.asf filter=lfs diff=lfs merge=lfs -text | ||
| *.mpg filter=lfs diff=lfs merge=lfs -text | ||
| *.mpeg filter=lfs diff=lfs merge=lfs -text | ||
| *.mp4 filter=lfs diff=lfs merge=lfs -text | ||
|
|
||
| # 3D formats | ||
| *.fbx filter=lfs diff=lfs merge=lfs -text | ||
| *.obj filter=lfs diff=lfs merge=lfs -text | ||
| *.max filter=lfs diff=lfs merge=lfs -text | ||
| *.blend filter=lfs diff=lfs merge=lfs -text | ||
| *.dae filter=lfs diff=lfs merge=lfs -text | ||
| *.mb filter=lfs diff=lfs merge=lfs -text | ||
| *.ma filter=lfs diff=lfs merge=lfs -text | ||
| *.3ds filter=lfs diff=lfs merge=lfs -text | ||
| *.dfx filter=lfs diff=lfs merge=lfs -text | ||
| *.c4d filter=lfs diff=lfs merge=lfs -text | ||
| *.lwo filter=lfs diff=lfs merge=lfs -text | ||
| *.lwo2 filter=lfs diff=lfs merge=lfs -text | ||
| *.abc filter=lfs diff=lfs merge=lfs -text | ||
| *.3dm filter=lfs diff=lfs merge=lfs -text | ||
|
|
||
| # Build | ||
| *.dll filter=lfs diff=lfs merge=lfs -text | ||
| *.pdb filter=lfs diff=lfs merge=lfs -text | ||
| *.mdb filter=lfs diff=lfs merge=lfs -text | ||
|
|
||
| # Packaging | ||
| *.zip filter=lfs diff=lfs merge=lfs -text | ||
| *.7z filter=lfs diff=lfs merge=lfs -text | ||
| *.gz filter=lfs diff=lfs merge=lfs -text | ||
| *.rar filter=lfs diff=lfs merge=lfs -text | ||
| *.tar filter=lfs diff=lfs merge=lfs -text |
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 |
|---|---|---|
| @@ -1,50 +1,50 @@ | ||
| [Ll]ibrary/ | ||
| [Tt]emp/ | ||
| [Oo]bj/ | ||
| [Bb]uild/ | ||
| [Bb]uilds/ | ||
| [Ll]ogs/ | ||
| # Uncomment this line if you wish to ignore the asset store tools plugin | ||
| # [Aa]ssets/AssetStoreTools* | ||
| # Visual Studio cache directory | ||
| .vs/ | ||
| # Gradle cache directory | ||
| .gradle/ | ||
| # Autogenerated VS/MD/Consulo/Rider/VSCode solution and project files | ||
| ExportedObj/ | ||
| .consulo/ | ||
| .vscode/ | ||
| .idea/ | ||
| *.csproj | ||
| *.unityproj | ||
| *.sln | ||
| *.suo | ||
| *.tmp | ||
| *.user | ||
| *.userprefs | ||
| *.pidb | ||
| *.booproj | ||
| *.svd | ||
| *.pdb | ||
| *.mdb | ||
| *.opendb | ||
| *.VC.db | ||
| # Unity3D generated meta files | ||
| *.pidb.meta | ||
| *.pdb.meta | ||
| *.mdb.meta | ||
| # Unity3D generated file on crash reports | ||
| sysinfo.txt | ||
| # Builds | ||
| *.apk | ||
| *.unitypackage | ||
| # Crashlytics generated file | ||
| crashlytics-build.properties | ||
| [Ll]ibrary/ | ||
| [Tt]emp/ | ||
| [Oo]bj/ | ||
| [Bb]uild/ | ||
| [Bb]uilds/ | ||
| [Ll]ogs/ | ||
|
|
||
| # Uncomment this line if you wish to ignore the asset store tools plugin | ||
| # [Aa]ssets/AssetStoreTools* | ||
|
|
||
| # Visual Studio cache directory | ||
| .vs/ | ||
|
|
||
| # Gradle cache directory | ||
| .gradle/ | ||
|
|
||
| # Autogenerated VS/MD/Consulo/Rider/VSCode solution and project files | ||
| ExportedObj/ | ||
| .consulo/ | ||
| .vscode/ | ||
| .idea/ | ||
| *.csproj | ||
| *.unityproj | ||
| *.sln | ||
| *.suo | ||
| *.tmp | ||
| *.user | ||
| *.userprefs | ||
| *.pidb | ||
| *.booproj | ||
| *.svd | ||
| *.pdb | ||
| *.mdb | ||
| *.opendb | ||
| *.VC.db | ||
|
|
||
| # Unity3D generated meta files | ||
| *.pidb.meta | ||
| *.pdb.meta | ||
| *.mdb.meta | ||
|
|
||
| # Unity3D generated file on crash reports | ||
| sysinfo.txt | ||
|
|
||
| # Builds | ||
| *.apk | ||
| *.unitypackage | ||
|
|
||
| # Crashlytics generated file | ||
| crashlytics-build.properties |
Oops, something went wrong.