sprechtl/Foerming
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into develop

Browse source 
# Conflicts:
#	Assets/BaseTile.prefab.meta
#	Assets/Scenes/MainScene.unity
#	Assets/Scripts/PlayerController.cs
#	Assets/Scripts/TileBehaviour.cs
#	Assets/Scripts/Tiles/GrassTile.cs.meta
This commit is contained in:
s-prechtl 2022-05-20 08:19:17 +02:00
commit 45fd8aed5e
122 changed files with 17495 additions and 788 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assets/Scripts/Tiles/BaseTile.cs
View file

@ -1,5 +1,5 @@
using System.Collections;
using System.Collections.Generic;
using System;
using Items.TerraformingTools;
using UnityEngine;