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
..
Doors Loading commit data...
Effect Loading commit data...
Enemy Loading commit data...
Inventory Loading commit data...
LifeStone Loading commit data...
Player Loading commit data...
Projectiles Loading commit data...
Rooms Loading commit data...
Doors.meta Loading commit data...
Effect.meta Loading commit data...
Enemy.meta Loading commit data...
Inventory.meta Loading commit data...
LifeStone.meta Loading commit data...
Player.meta Loading commit data...
Press.png Loading commit data...
Press.png.meta Loading commit data...
Projectiles.meta Loading commit data...
Rooms.meta Loading commit data...
TETRIS.png Loading commit data...
TETRIS.png.meta Loading commit data...
clock_frame.png Loading commit data...
clock_frame.png.meta Loading commit data...
clock_hand.png Loading commit data...
clock_hand.png.meta Loading commit data...
enemyarrow.png Loading commit data...
enemyarrow.png.meta Loading commit data...
playerIcon.png Loading commit data...
playerIcon.png.meta Loading commit data...
portaldeselected.png Loading commit data...
portaldeselected.png.meta Loading commit data...
portalselected.png Loading commit data...
portalselected.png.meta Loading commit data...
woodsign.png Loading commit data...
woodsign.png.meta Loading commit data...