Skip to content

tetra-tower
tetra-tower
Switch branch/tag
History Find file
  • 18손재민's avatar
    Merge remote-tracking branch 'origin/item' · 5a99a028
    18손재민 authored 
    # Conflicts:
#	Assets/Scenes/PlayScene.unity
#	Assets/Scripts/EffectManager.cs
#	Assets/Scripts/Item/Addons/SmallLens.cs
#	Assets/Scripts/Item/IPlayerInteraction.cs
#	Assets/Scripts/Item/InventoryManager.cs
#	Assets/Scripts/UI/In-game UI/LifeStoneScript/LifeStoneManager.cs
    5a99a028
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...
TestRopeDown.png Loading commit data...
TestRopeDown.png.meta Loading commit data...
TestRopeUP.png Loading commit data...
TestRopeUP.png.meta Loading commit data...
TetrisBackground.png Loading commit data...
TetrisBackground.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...
evil_scorpion1.png Loading commit data...
evil_scorpion1.png.meta Loading commit data...
evil_scorpion2.png Loading commit data...
evil_scorpion2.png.meta Loading commit data...
player.png Loading commit data...
player.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...