Merge branch 'master' of git.unistra.fr:chirz/cityescape

Assets/Import/basic-environment/usine tile.png.meta

@@ -46,7 +46,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 40
+  spritePixelsToUnits: 55
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1

Assets/Prefabs/Parcelles.meta

+fileFormatVersion: 2
+guid: 673b9cf63e6a5d246956245f8e05ce27
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/NiveauParcelle.unity.meta

+fileFormatVersion: 2
+guid: b2d7d165c816e9a4db44257e3e6025e3
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: