Merge branch 'develop' into dhain
# Conflicts: # Assets/Scenes/MainScene.unity # Assets/Scripts/TileBehaviour.cs
This commit is contained in:
commit
38efeb6af6
191 changed files with 1070 additions and 751 deletions
|
|
@ -48,7 +48,7 @@ public class PlayerController : MonoBehaviour {
|
|||
_selectedItem = item;
|
||||
Cursor.SetCursor(item.defaultSprite.texture, Vector2.zero, CursorMode.Auto);
|
||||
} else {
|
||||
Debug.Log("An item requested to select isn't in the inventory" + item);
|
||||
//Debug.Log("An item requested to select isn't in the inventory" + item);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue