Merge branch 'master' into 'master'
fin des prefabs See merge request chirz/cityescape!45
Showing
- Assets/Import/basic-environment/Materials/Factoruy.prefab 213 additions, 0 deletionsAssets/Import/basic-environment/Materials/Factoruy.prefab
- Assets/Import/basic-environment/Materials/Factoruy.prefab.meta 7 additions, 0 deletions...s/Import/basic-environment/Materials/Factoruy.prefab.meta
- Assets/Import/basic-environment/galletcity.asset 36 additions, 0 deletionsAssets/Import/basic-environment/galletcity.asset
- Assets/Import/basic-environment/galletcity.asset.meta 8 additions, 0 deletionsAssets/Import/basic-environment/galletcity.asset.meta
- Assets/Import/basic-environment/galletcity.png 0 additions, 0 deletionsAssets/Import/basic-environment/galletcity.png
- Assets/Import/basic-environment/galletcity.png.meta 96 additions, 0 deletionsAssets/Import/basic-environment/galletcity.png.meta
- Assets/Prefabs/Parcelles/Melvyn_usine.prefab 3104 additions, 0 deletionsAssets/Prefabs/Parcelles/Melvyn_usine.prefab
- Assets/Prefabs/Parcelles/Melvyn_usine.prefab.meta 0 additions, 0 deletionsAssets/Prefabs/Parcelles/Melvyn_usine.prefab.meta
- Assets/Prefabs/Parcelles/Melvyn_village 2.prefab 49 additions, 29 deletionsAssets/Prefabs/Parcelles/Melvyn_village 2.prefab
- Assets/Prefabs/Parcelles/Melvyn_village 2.prefab.meta 7 additions, 0 deletionsAssets/Prefabs/Parcelles/Melvyn_village 2.prefab.meta
- Assets/Prefabs/Parcelles/Raffael_boutique.prefab 22 additions, 22 deletionsAssets/Prefabs/Parcelles/Raffael_boutique.prefab
- Assets/Scenes/MelvynTest.unity 41729 additions, 0 deletionsAssets/Scenes/MelvynTest.unity
- Assets/Scenes/MelvynTest.unity.meta 7 additions, 0 deletionsAssets/Scenes/MelvynTest.unity.meta
- Assets/Scripts/Game/GenerateMap.cs 11 additions, 7 deletionsAssets/Scripts/Game/GenerateMap.cs
Please register or sign in to comment