Merge branch 'master' into 'master'

Nouveaux TileSet village See merge request chirz/cityescape!43

Merge branch 'master' into 'master'
Nouveaux TileSet village See merge request chirz/cityescape!43
50040de1 · BLOCH VALENTIN · 29a16219 · 6b5eb6e5 · 50040de1 · 50040de1
Commit 50040de1 authored 3 years ago by BLOCH VALENTIN
--- a/Assets/Prefabs/Parcelles/Melvyn_village 1.prefab
+++ b/Assets/Prefabs/Parcelles/Melvyn_village 1.prefab
--- a/Assets/Prefabs/Parcelles/Melvyn_village 1.prefab.meta
+++ b/Assets/Prefabs/Parcelles/Melvyn_village 1.prefab.meta
+fileFormatVersion: 2
+guid: b9f8617378865674c91edd2902e37e9a
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Parcelles/Melvyn_village.prefab
+++ b/Assets/Prefabs/Parcelles/Melvyn_village.prefab
--- a/Assets/Prefabs/Parcelles/Melvyn_village.prefab.meta
+++ b/Assets/Prefabs/Parcelles/Melvyn_village.prefab.meta
+fileFormatVersion: 2
+guid: 162cd58adf4f4d047a4702715064d160
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: