Assets/Prefabs · 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
..
Characters		Loading commit data...
Rooms		Loading commit data...
TetrisMap		Loading commit data...
UI		Loading commit data...
Camera.prefab		Loading commit data...
Camera.prefab.meta		Loading commit data...
Characters.meta		Loading commit data...
EnemyManager.prefab		Loading commit data...
EnemyManager.prefab.meta		Loading commit data...
GameManager.prefab		Loading commit data...
GameManager.prefab.meta		Loading commit data...
MapManager.prefab		Loading commit data...
MapManager.prefab.meta		Loading commit data...
Rooms.meta		Loading commit data...
TetrisMap.meta		Loading commit data...
UI.meta		Loading commit data...