Merge branch 'item' into enemy2
# Conflicts: # Assets/Scripts/Characters/Enemy/Enemy.cs
Showing
Assets/Animation/Item.meta
0 → 100644
Assets/Fonts.meta
0 → 100644
Assets/Fonts/neodgm.ttf
0 → 100644
File added
Assets/Fonts/neodgm.ttf.meta
0 → 100644
427 Bytes
22.2 KB
591 Bytes
2.41 KB
28.8 KB
254 Bytes
447 Bytes
22.6 KB
426 Bytes
1.28 KB
501 Bytes
6.51 KB
13.4 KB
704 Bytes
237 Bytes
538 Bytes
410 Bytes
File moved
64.8 KB
7.62 KB
1.74 KB
28.9 KB
1.12 KB
1.11 KB
1.19 KB
2.14 KB
2.43 KB
2.49 KB
2.14 KB
2.32 KB
1.26 KB
1.24 KB
1.3 KB
1.33 KB
230 Bytes
444 Bytes
499 Bytes
563 Bytes
2.28 KB
2.2 KB
2.13 KB
2.16 KB
2.15 KB
2.13 KB
2.11 KB
2.2 KB
179 Bytes