Skip to content

tetra-tower
tetra-tower
Switch branch/tag
History Find file
  • 18손재민's avatar
    Merge remote-tracking branch 'origin/enemy2' · c4c3978e
    18손재민 authored 
    # Conflicts:
#	Assets/Prefabs/Rooms/NormalRoom/Room 1.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 12.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 13.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 14.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 20.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 9.prefab
#	Assets/Prefabs/TetrisMap/Tetrimino/Room Tutorial.prefab
    c4c3978e
Name
Last commit
 Last update
..
InGameDoor Loading commit data...
NormalRoom Loading commit data...
SpecialRoom Loading commit data...
ClearedFog.prefab Loading commit data...
ClearedFog.prefab.meta Loading commit data...
Ghost.prefab Loading commit data...
Ghost.prefab.meta Loading commit data...
InGameDoor.meta Loading commit data...
NormalRoom.meta Loading commit data...
Portal.prefab Loading commit data...
Portal.prefab.meta Loading commit data...
Room.prefab Loading commit data...
Room.prefab.meta Loading commit data...
SpecialRoom.meta Loading commit data...
enemy spot.prefab Loading commit data...
enemy spot.prefab.meta Loading commit data...
fog.prefab Loading commit data...
fog.prefab.meta Loading commit data...