Merge branch 'release/RELEASE2'

EnginyeriaSofwareUB · Nov 17, 2017 · 8caa447 · 8caa447
2 parents 70ac572 + f740e40
commit 8caa447
Show file tree

Hide file tree

Showing 726 changed files with 17,356 additions and 138,204 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore/.gitignore → .gitignore b/.gitignore/.gitignore → .gitignore
@@ -1,34 +1,34 @@
 # =============== #
 # Unity generated #
 # =============== #
-[Tt]emp/
-[Oo]bj/
-[Bb]uild
+/[Tt]emp/
+/[Oo]bj/
+/[Bb]uild
 /[Bb]uilds/
 /[Ll]ibrary/
-sysinfo.txt
 *.stackdump
 /Assets/AssetStoreTools*
 *.apk
 *.unitypackage
+sysinfo.txt
 
 # ===================================== #
 # Visual Studio / MonoDevelop generated #
 # ===================================== #
-[Ee]xported[Oo]bj/
-.vs/
-/*.userprefs
-/*.csproj
-/*.pidb
+/[Ee]xported[Oo]bj/
+/.vs/
+*.userprefs
+*.csproj
+*.pidb
 *.pidb.meta
-/*.suo
-/*.sln*
-/*.user
-/*.unityproj
-/*.booproj
+*.suo
+*.sln*
+*.user
+*.unityproj
+*.booproj
 .consulo/
-/*.tmp
-/*.svd
+*.tmp
+*.svd
 
 # ============ #
 # OS generated #

diff --git a/.vs/ES2017B3/v15/.suo b/.vs/ES2017B3/v15/.suo
diff --git a/.vs/ES2017B3/v15/sqlite3/storage.ide b/.vs/ES2017B3/v15/sqlite3/storage.ide
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
diff --git a/Assets/._MenuObject.cs b/Assets/._MenuObject.cs
diff --git a/Assets/._MenuObject.cs.meta b/Assets/._MenuObject.cs.meta
diff --git a/Assets/._Scenes b/Assets/._Scenes
diff --git a/Assets/._Scenes.meta b/Assets/._Scenes.meta