Assets/Scenes · a26c7c6691254182086fa4f8b0f2cd4dc07d65a8 · Oenos / tetra-tower · GitLab

You need to sign in or sign up before continuing.

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
..
ItemScene.unity		Loading commit data...
ItemScene.unity.meta		Loading commit data...
LifeStoneScene.unity		Loading commit data...
LifeStoneScene.unity.meta		Loading commit data...
PlayScene.unity		Loading commit data...
PlayScene.unity.meta		Loading commit data...
TestUI.unity		Loading commit data...
TestUI.unity.meta		Loading commit data...
TitleScene.unity		Loading commit data...
TitleScene.unity.meta		Loading commit data...
testEnemy.unity		Loading commit data...
testEnemy.unity.meta		Loading commit data...