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
..
Animation Loading commit data...
Data Loading commit data...
Images Loading commit data...
Palettes Loading commit data...
Physics Materials Loading commit data...
Prefabs Loading commit data...
Resources Loading commit data...
Scenes Loading commit data...
Scripts Loading commit data...
Sounds Loading commit data...
Sprites Loading commit data...
Textures Loading commit data...
Animation.meta Loading commit data...
Data.meta Loading commit data...
EffectEnd.cs Loading commit data...
EffectEnd.cs.meta Loading commit data...
EnemyPhysics.cs Loading commit data...
EnemyPhysics.cs.meta Loading commit data...
Images.meta Loading commit data...
Palettes.meta Loading commit data...
Physics Materials.meta Loading commit data...
Prefabs.meta Loading commit data...
Resources.meta Loading commit data...
Scenes.meta Loading commit data...
Scripts.meta Loading commit data...
Sounds.meta Loading commit data...
Sprites.meta Loading commit data...
Textures.meta Loading commit data...