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
..
ApprenticesMark.cs Loading commit data...
ApprenticesMark.cs.meta Loading commit data...
BlacksmithsBrooch.cs Loading commit data...
BlacksmithsBrooch.cs.meta Loading commit data...
CoollyPride.cs Loading commit data...
CoollyPride.cs.meta Loading commit data...
DesignofRagur.cs Loading commit data...
DesignofRagur.cs.meta Loading commit data...
FeatherofRheA.cs Loading commit data...
FeatherofRheA.cs.meta Loading commit data...
GlowingHerb.cs Loading commit data...
GlowingHerb.cs.meta Loading commit data...
Gluttony.cs Loading commit data...
Gluttony.cs.meta Loading commit data...
JanusCoin.cs Loading commit data...
JanusCoin.cs.meta Loading commit data...
ParchmentPiece.cs Loading commit data...
ParchmentPiece.cs.meta Loading commit data...
Sandbag.cs Loading commit data...
Sandbag.cs.meta Loading commit data...
SmallLens.cs Loading commit data...
SmallLens.cs.meta Loading commit data...
ToothedWheelofTime.cs Loading commit data...
ToothedWheelofTime.cs.meta Loading commit data...