Assets/Prefabs/TetrisMap/Tetrimino · ef70d42e65e31263999a0bbf70d057d5b6e9f1f0 · Oenos / tetra-tower · GitLab

History Find file

Merge remote-tracking branch 'origin/boss' · 7d77c1cd

18손재민 authored Feb 26, 2019

# Conflicts:
#	Assets/Prefabs/Rooms/SpecialRoom/Room Boss 1-3.prefab
#	Assets/Scripts/Characters/Enemy/Enemy.cs

7d77c1cd

Name	Last commit	Last update
..
Room Tutorial.prefab		Loading commit data...
Room Tutorial.prefab.meta		Loading commit data...
TetriminoBoss.prefab		Loading commit data...
TetriminoBoss.prefab.meta		Loading commit data...
TetriminoI.prefab		Loading commit data...
TetriminoI.prefab.meta		Loading commit data...
TetriminoJ.prefab		Loading commit data...
TetriminoJ.prefab.meta		Loading commit data...
TetriminoL.prefab		Loading commit data...
TetriminoL.prefab.meta		Loading commit data...
TetriminoO.prefab		Loading commit data...
TetriminoO.prefab.meta		Loading commit data...
TetriminoS.prefab		Loading commit data...
TetriminoS.prefab.meta		Loading commit data...
TetriminoT.prefab		Loading commit data...
TetriminoT.prefab.meta		Loading commit data...
TetriminoZ.prefab		Loading commit data...
TetriminoZ.prefab.meta		Loading commit data...