Skip to content

Commit f0e7f7d

Browse files
OmfffOmfff
committed
Merge branch 'omf'
2 parents 3b2c262 + 6fba103 commit f0e7f7d

File tree

6,472 files changed

+651287
-1381
lines changed

Some content is hidden

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

6,472 files changed

+651287
-1381
lines changed

‎.DS_Store

14 KB
Binary file not shown.

‎.gitignore

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<<<<<<< HEAD
12
# =============== #
23
# Unity generated #
34
# =============== #
@@ -41,3 +42,43 @@ ehthumbs.db
4142
[Dd]esktop.ini
4243
Corridor/Library/ShaderCache/
4344
Corridor/Library/metadata/
45+
=======
46+
[Ll]ibrary/
47+
[Tt]emp/
48+
[Oo]bj/
49+
[Bb]uild/
50+
[Bb]uilds/
51+
Assets/AssetStoreTools*
52+
53+
# Visual Studio cache directory
54+
.vs/
55+
56+
# Autogenerated VS/MD/Consulo solution and project files
57+
ExportedObj/
58+
.consulo/
59+
*.csproj
60+
*.unityproj
61+
*.sln
62+
*.suo
63+
*.tmp
64+
*.user
65+
*.userprefs
66+
*.pidb
67+
*.booproj
68+
*.svd
69+
*.pdb
70+
*.opendb
71+
72+
# Unity3D generated meta files
73+
*.pidb.meta
74+
*.pdb.meta
75+
76+
# Unity3D Generated File On Crash Reports
77+
sysinfo.txt
78+
79+
# Builds
80+
*.apk
81+
*.unitypackage
82+
.DS_Store
83+
Assets/.DS_Store
84+
>>>>>>> omf

‎Assets/.DS_Store

14 KB
Binary file not shown.

‎Assets/16-Bit Fantasy Sprite Set.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/16-Bit Fantasy Sprite Set/Sheets.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/16-Bit Fantasy Sprite Set/Sheets/oryx_16bit_fantasy_items_trans.png

37.8 KB
Loading

0 commit comments

Comments
 (0)