Merge branch 'UI'
# Conflicts: # Assets/Prefabs/TetrisMap/TetriminoSpawner.prefab # Assets/Scenes/PlayScene.unity # Assets/Sprites.meta
Showing
This diff is collapsed.
This diff is collapsed.
File moved
This diff is collapsed.
Assets/Sprites/LC Mold.png
0 → 100644
208 Bytes
Assets/Sprites/LC.png
0 → 100644
188 Bytes
Assets/Sprites/LC.png.meta
0 → 100644