Assets/Scripts/Item/Addons · boss · Oenos / tetra-tower · GitLab

History Find file

Merge remote-tracking branch 'origin/item' · a26c7c66

18손재민 authored Feb 27, 2019

# Conflicts:
#	Assets/Scripts/Characters/Enemy/Enemy.cs
#	Assets/Scripts/Item/InventoryManager.cs

a26c7c66

Name	Last commit	Last update
..
ApprenticesMark.cs		Loading commit data...
ApprenticesMark.cs.meta		Loading commit data...
BitMemory.cs		Loading commit data...
BitMemory.cs.meta		Loading commit data...
BlacksmithsBrooch.cs		Loading commit data...
BlacksmithsBrooch.cs.meta		Loading commit data...
CoollyPride.cs		Loading commit data...
CoollyPride.cs.meta		Loading commit data...
DesignofRagur.cs		Loading commit data...
DesignofRagur.cs.meta		Loading commit data...
FeatherofRheA.cs		Loading commit data...
FeatherofRheA.cs.meta		Loading commit data...
GlowingHerb.cs		Loading commit data...
GlowingHerb.cs.meta		Loading commit data...
Gluttony.cs		Loading commit data...
Gluttony.cs.meta		Loading commit data...
JanusCoin.cs		Loading commit data...
JanusCoin.cs.meta		Loading commit data...
ParchmentPiece.cs		Loading commit data...
ParchmentPiece.cs.meta		Loading commit data...
Sandbag.cs		Loading commit data...
Sandbag.cs.meta		Loading commit data...
SmallLens.cs		Loading commit data...
SmallLens.cs.meta		Loading commit data...
ToothedWheelofTime.cs		Loading commit data...
ToothedWheelofTime.cs.meta		Loading commit data...