• 18손재민's avatar
    Merge branch 'item' · ce71b605
    18손재민 authored
    # Conflicts:
    #	Assets/Animation/Player.meta
    #	Assets/Prefabs/UI/In-Game UI/InventoryUI.meta
    #	Assets/Scripts/Pickups.meta
    ce71b605
Name
Last commit
Last update
..
Characters Loading commit data...
Item Loading commit data...
TetrisMap Loading commit data...
UI Loading commit data...
CameraController.cs Loading commit data...
CameraController.cs.meta Loading commit data...
Characters.meta Loading commit data...
Enumerators.cs Loading commit data...
Enumerators.cs.meta Loading commit data...
GameManager.cs Loading commit data...
GameManager.cs.meta Loading commit data...
Item.meta Loading commit data...
Singleton.cs Loading commit data...
Singleton.cs.meta Loading commit data...
TetrisMap.meta Loading commit data...
UI.meta Loading commit data...