Skip to content

Commit c8126d3

Browse files
committed
Merge branch 'prepare_upm_release' into develop
2 parents 04a5d49 + 37dac67 commit c8126d3

68 files changed

Lines changed: 767 additions & 2334 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 62 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,43 @@
1-
/[Ll]ibrary/
2-
/[Tt]emp/
3-
/[Oo]bj/
4-
/[Bb]uild/
5-
/[Bb]uilds/
6-
/Assets/AssetStoreTools*
7-
8-
# Autogenerated VS/MD solution and project files
1+
# This .gitignore file should be placed at the root of your Unity project directory
2+
#
3+
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
4+
#
5+
[Ll]ibrary/
6+
[Tt]emp/
7+
[Oo]bj/
8+
[Bb]uild/
9+
[Bb]uilds/
10+
[Ll]ogs/
11+
[Uu]ser[Ss]ettings/
12+
13+
# Unity samples :
14+
[Ss]amples/
15+
[Ss]amples.meta
16+
17+
# MemoryCaptures can get excessive in size.
18+
# They also could contain extremely sensitive data
19+
[Mm]emoryCaptures/
20+
21+
# Asset meta data should only be ignored when the corresponding asset is also ignored
22+
!/[Aa]ssets/**/*.meta
23+
24+
# Uncomment this line if you wish to ignore the asset store tools plugin
25+
# /[Aa]ssets/AssetStoreTools*
26+
27+
# Autogenerated Jetbrains Rider plugin
28+
[Aa]ssets/Plugins/Editor/JetBrains*
29+
30+
# Visual Studio & VSCode cache directory
31+
.vs/
32+
.vscode/
33+
.idea/
34+
35+
# Gradle cache directory
36+
.gradle/
37+
38+
# Autogenerated VS/MD/Consulo solution and project files
939
ExportedObj/
40+
.consulo/
1041
*.csproj
1142
*.unityproj
1243
*.sln
@@ -17,68 +48,39 @@ ExportedObj/
1748
*.pidb
1849
*.booproj
1950
*.svd
20-
51+
*.pdb
52+
*.mdb
53+
*.opendb
54+
*.VC.db
2155

2256
# Unity3D generated meta files
2357
*.pidb.meta
58+
*.pdb.meta
59+
*.mdb.meta
2460

25-
# Unity3D Generated File On Crash Reports
61+
# Unity3D generated file on crash reports
2662
sysinfo.txt
63+
debug.log
2764

2865
# Builds
2966
*.apk
67+
*.aab
68+
*.unitypackage
3069

31-
# =========================
32-
# Operating System Files
33-
# =========================
34-
35-
# OSX
36-
# =========================
37-
38-
.DS_Store
39-
.AppleDouble
40-
.LSOverride
41-
42-
# Thumbnails
43-
._*
44-
45-
# Files that might appear in the root of a volume
46-
.DocumentRevisions-V100
47-
.fseventsd
48-
.Spotlight-V100
49-
.TemporaryItems
50-
.Trashes
51-
.VolumeIcon.icns
52-
53-
# Directories potentially created on remote AFP share
54-
.AppleDB
55-
.AppleDesktop
56-
Network Trash Folder
57-
Temporary Items
58-
.apdisk
59-
60-
# Windows
61-
# =========================
62-
63-
# Windows image file caches
64-
Thumbs.db
65-
ehthumbs.db
66-
67-
# Folder config file
68-
Desktop.ini
69-
70-
# Recycle Bin used on file shares
71-
$RECYCLE.BIN/
70+
# Crashlytics generated file
71+
crashlytics-build.properties
7272

73-
# Windows Installer files
74-
*.cab
75-
*.msi
76-
*.msm
77-
*.msp
73+
# Packed Addressables
74+
**/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
7875

79-
# Windows shortcuts
80-
*.lnk
76+
# Addressables temporary file
77+
**/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/link.xml
78+
**/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/link.xml.meta
8179

82-
output_log.txt
80+
# Temporary auto-generated Android Assets
81+
**/[Aa]ssets/[Ss]treamingAssets/aa.meta
82+
**/[Aa]ssets/[Ss]treamingAssets/aa/*
8383

84-
.vscode
84+
# Projet specific
85+
Outputs/
86+
Inputs/

Assets/StandaloneFileBrowser/Sample/BasicSample.cs

Lines changed: 0 additions & 119 deletions
This file was deleted.

Assets/StandaloneFileBrowser/Sample/BasicSample.cs.meta

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)