Merge pull request #31 from thedoritos/feature/build-with-unity-2019.…

…3.0a2 Feature/build with unity 2019.3.0a2
thedoritos · May 21, 2019 · a045593 · a045593
2 parents d9a3f16 + 7fd31b0
commit a045593
Show file tree

Hide file tree

Showing 16 changed files with 385 additions and 142 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,17 +10,33 @@ unimgpicker_ios/*
 
 .DS_Store
 
-### https://raw.github.com/github/gitignore/be3333655bffe9507d66cc864aee95ed6052b4ed/Unity.gitignore
+### https://raw.githubusercontent.com/github/gitignore/master/Unity.gitignore
 
-/[Ll]ibrary/
-/[Tt]emp/
-/[Oo]bj/
-/[Bb]uild/
-/[Bb]uilds/
-/Assets/AssetStoreTools*
+[Ll]ibrary/
+[Tt]emp/
+[Oo]bj/
+[Bb]uild/
+[Bb]uilds/
+[Ll]ogs/
 
-# Autogenerated VS/MD solution and project files
+# Never ignore Asset meta data
+![Aa]ssets/**/*.meta
+
+# Uncomment this line if you wish to ignore the asset store tools plugin
+# [Aa]ssets/AssetStoreTools*
+
+# TextMesh Pro files
+[Aa]ssets/TextMesh*Pro/
+
+# Visual Studio cache directory
+.vs/
+
+# Gradle cache directory
+.gradle/
+
+# Autogenerated VS/MD/Consulo solution and project files
 ExportedObj/
+.consulo/
 *.csproj
 *.unityproj
 *.sln
@@ -31,12 +47,22 @@ ExportedObj/
 *.pidb
 *.booproj
 *.svd
-
+*.pdb
+*.mdb
+*.opendb
+*.VC.db
 
 # Unity3D generated meta files
 *.pidb.meta
+*.pdb.meta
+*.mdb.meta
 
-# Unity3D Generated File On Crash Reports
+# Unity3D generated file on crash reports
 sysinfo.txt
 
+# Builds
+*.apk
+*.unitypackage
 
+# Crashlytics generated file
+crashlytics-build.properties
diff --git a/Assets/Plugins/Android/Unimgpicker/libs/unimgpicker.jar b/Assets/Plugins/Android/Unimgpicker/libs/unimgpicker.jar
diff --git a/Assets/Plugins/Editor.meta b/Assets/Plugins/Editor.meta
diff --git a/Assets/Plugins/Editor/JetBrains.meta b/Assets/Plugins/Editor/JetBrains.meta
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
@@ -35,6 +35,10 @@ GraphicsSettings:
   - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset
@@ -0,0 +1,6 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1386491679 &1
+PresetManager:
+  m_ObjectHideFlags: 0
+  m_DefaultList: []