Merge branch 'omf'

Omfff · Jun 24, 2020 · f0e7f7d · f0e7f7d
2 parents 3b2c262 + 6fba103
commit f0e7f7d
Show file tree

Hide file tree

Showing 6,472 changed files with 651,287 additions and 1,381 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # =============== #
 # Unity generated #
 # =============== #
@@ -41,3 +42,43 @@ ehthumbs.db
 [Dd]esktop.ini
 Corridor/Library/ShaderCache/
 Corridor/Library/metadata/
+=======
+[Ll]ibrary/
+[Tt]emp/
+[Oo]bj/
+[Bb]uild/
+[Bb]uilds/
+Assets/AssetStoreTools*
+
+# Visual Studio cache directory
+.vs/
+
+# Autogenerated VS/MD/Consulo solution and project files
+ExportedObj/
+.consulo/
+*.csproj
+*.unityproj
+*.sln
+*.suo
+*.tmp
+*.user
+*.userprefs
+*.pidb
+*.booproj
+*.svd
+*.pdb
+*.opendb
+
+# Unity3D generated meta files
+*.pidb.meta
+*.pdb.meta
+
+# Unity3D Generated File On Crash Reports
+sysinfo.txt
+
+# Builds
+*.apk
+*.unitypackage
+.DS_Store
+Assets/.DS_Store
+>>>>>>> omf
diff --git a/Assets/.DS_Store b/Assets/.DS_Store
diff --git a/Assets/16-Bit Fantasy Sprite Set.meta b/Assets/16-Bit Fantasy Sprite Set.meta
diff --git a/Assets/16-Bit Fantasy Sprite Set/Sheets.meta b/Assets/16-Bit Fantasy Sprite Set/Sheets.meta
diff --git a/Assets/16-Bit Fantasy Sprite Set/Sheets/oryx_16bit_fantasy_items_trans.png b/Assets/16-Bit Fantasy Sprite Set/Sheets/oryx_16bit_fantasy_items_trans.png