Merge branch 'item'
# Conflicts: # Assets/Animation/Player.meta # Assets/Prefabs/UI/In-Game UI/InventoryUI.meta # Assets/Scripts/Pickups.meta
Showing
This diff is collapsed.
This diff is collapsed.
64.8 KB
This diff is collapsed.
7.62 KB
1.74 KB
28.9 KB