Merge branch 'develop' into dhain

# Conflicts:
#	Assets/Scenes/MainScene.unity
#	Assets/Scripts/TileBehaviour.cs
This commit is contained in:
dhain 2022-06-09 16:52:46 +02:00
commit 38efeb6af6
191 changed files with 1070 additions and 751 deletions

View file

@ -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);
}
}