Assets/Scripts/Item · a4590655a55988c59a9bb38d3703fd732352ab87 · Oenos / tetra-tower · GitLab

History Find file

Merge remote-tracking branch 'origin/droppedItem' into item · a4590655
18류지석 authored Jan 30, 2019
```
# Conflicts:
#	Assets/Prefabs/Characters/Player.prefab
#	Assets/Scripts/Item/InventoryManager.cs
```
a4590655

Name	Last commit	Last update
..
Addons		Loading commit data...
Items		Loading commit data...
Addon.cs		Loading commit data...
Addon.cs.meta		Loading commit data...
AddonDrag.cs		Loading commit data...
AddonDrag.cs.meta		Loading commit data...
Addons.meta		Loading commit data...
DroppedItem.cs		Loading commit data...
DroppedItem.cs.meta		Loading commit data...
InventoryManager.cs		Loading commit data...
InventoryManager.cs.meta		Loading commit data...
InventoryUI.cs		Loading commit data...
InventoryUI.cs.meta		Loading commit data...
Item.cs		Loading commit data...
Item.cs.meta		Loading commit data...
ItemDrag.cs		Loading commit data...
ItemDrag.cs.meta		Loading commit data...
Items.meta		Loading commit data...