Skip to content

tetra-tower
tetra-tower
Switch branch/tag
History Find file
  • 18손재민's avatar
    Merge branch 'tetris' · 3bf51203
    18손재민 authored 
    # Conflicts:
#	Assets/Data/dropData_exam.csv
#	Assets/Prefabs/Characters/Enemy/Goblin.prefab
#	Assets/Prefabs/Characters/Player.prefab
#	Assets/Scripts/Characters/Enemy/Enemy.cs
#	Assets/Scripts/Characters/Enemy/EnemyAir.cs
#	Assets/Scripts/Characters/Enemy/EnemyGround.cs
#	Assets/Scripts/EnemyManager.cs
    3bf51203
Name
Last commit
 Last update
..
Ghost Loading commit data...
Tetrimino Loading commit data...
Ghost.meta Loading commit data...
PlayerIcon.prefab Loading commit data...
PlayerIcon.prefab.meta Loading commit data...
Portal.prefab Loading commit data...
Portal.prefab.meta Loading commit data...
PortalSurface.prefab Loading commit data...
PortalSurface.prefab.meta Loading commit data...
Press.prefab Loading commit data...
Press.prefab.meta Loading commit data...
TestTools.prefab Loading commit data...
TestTools.prefab.meta Loading commit data...
Tetrimino.meta Loading commit data...
TetriminoSpawner.prefab Loading commit data...
TetriminoSpawner.prefab.meta Loading commit data...
TetrisMap.prefab Loading commit data...
TetrisMap.prefab.meta Loading commit data...