Assets/Sprites · 90a3046cda70fe17aeca055d08e687f0487e0f1c · Oenos / tetra-tower · GitLab

History Find file

Merge branch 'LifeStone' into tetris 해냈다해냈어 · 90a3046c

18류지석 authored Feb 01, 2019

# Conflicts:
#	Assets/Prefabs/Characters/Player.prefab
#	Assets/Scenes/PlayScene.unity
#	Assets/Scripts/Characters/PlayerController.cs

90a3046c

Name	Last commit	Last update
..
Doors		Loading commit data...
Inventory		Loading commit data...
Items		Loading commit data...
LifeStone		Loading commit data...
Player		Loading commit data...
Rooms		Loading commit data...
Doors.meta		Loading commit data...
Inventory.meta		Loading commit data...
Items.meta		Loading commit data...
LifeStone.meta		Loading commit data...
Player.meta		Loading commit data...
Press.png		Loading commit data...
Press.png.meta		Loading commit data...
Rooms.meta		Loading commit data...
TetrisBackground.png		Loading commit data...
TetrisBackground.png.meta		Loading commit data...
evil_scorpion1.png		Loading commit data...
evil_scorpion1.png.meta		Loading commit data...
evil_scorpion2.png		Loading commit data...
evil_scorpion2.png.meta		Loading commit data...