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

Merge branch 'dhain' into develop

Browse source 
# Conflicts:
#	Assets/Scenes/MainScene.unity
#	Assets/Scripts/PlayerController.cs
This commit is contained in:
dhain 2022-05-19 16:07:18 +02:00
commit 7a04d79aba
118 changed files with 14104 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Assets/Scripts/Tiles/BaseTile.cs.meta Normal file
View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 2619a266d1f1c0c468e81e5bfda1cd78
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

11
Assets/Scripts/Tiles/FarmlandTile.cs.meta Normal file
View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 5b78d95148d53bd4aa70e3d0d595ab93
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

11
Assets/Scripts/Tiles/GrassTile.cs.meta Normal file
View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: af8926946929c0644a4fbbe9d92b2729
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

11
Assets/Scripts/Tiles/WaterTile.cs.meta Normal file
View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: e1921bfec5aa63e44a32c0492c021809
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: