Assets/Scripts/TetrisMap/Rooms · master · Oenos / tetra-tower · GitLab

History Find file

Merge remote-tracking branch 'origin/boss' · e6b851ab

18손재민 authored Feb 27, 2019

# Conflicts:
#	Assets/Scenes/PlayScene.unity
#	Assets/Scripts/Characters/Enemy/Scarecrow.cs
#	Assets/Scripts/TetrisMap/Rooms/BossRoom/JiJooRoom.cs

e6b851ab

Name	Last commit	Last update
..
BossRoom		Loading commit data...
AmethystRoomInGame.cs		Loading commit data...
AmethystRoomInGame.cs.meta		Loading commit data...
BossRoom.meta		Loading commit data...
BossRoomInGame.cs		Loading commit data...
BossRoomInGame.cs.meta		Loading commit data...
BothSideRoomInGame.cs		Loading commit data...
BothSideRoomInGame.cs.meta		Loading commit data...
GoldRoomInGame.cs		Loading commit data...
GoldRoomInGame.cs.meta		Loading commit data...
ItemRoomInGame.cs		Loading commit data...
ItemRoomInGame.cs.meta		Loading commit data...
NormalRoomInGame.cs		Loading commit data...
NormalRoomInGame.cs.meta		Loading commit data...
StartRoomInGame.cs		Loading commit data...
StartRoomInGame.cs.meta		Loading commit data...
TutorialRoomInGame.cs		Loading commit data...
TutorialRoomInGame.cs.meta		Loading commit data...