There was an error fetching the commit references. Please try again later.
Merge branch 'master' into 'master'
Modifs hitbox prefab et ajout scène Niveau 2 & finitions niveau 1 See merge request chirz/cityescape!25
Showing
- Assets/Import/basic-environment/house1.png.meta 13 additions, 1 deletionAssets/Import/basic-environment/house1.png.meta
- Assets/Import/basic-environment/usine tile.png.meta 1 addition, 1 deletionAssets/Import/basic-environment/usine tile.png.meta
- Assets/Palets/basic-environment/IceTileSet.prefab 2243 additions, 0 deletionsAssets/Palets/basic-environment/IceTileSet.prefab
- Assets/Palets/basic-environment/IceTileSet.prefab.meta 7 additions, 0 deletionsAssets/Palets/basic-environment/IceTileSet.prefab.meta
- Assets/Palets/basic-environment/fumée.prefab 241 additions, 0 deletionsAssets/Palets/basic-environment/fumée.prefab
- Assets/Palets/basic-environment/fumée.prefab.meta 7 additions, 0 deletionsAssets/Palets/basic-environment/fumée.prefab.meta
- Assets/Palets/basic-environment/overworld.prefab 59 additions, 21 deletionsAssets/Palets/basic-environment/overworld.prefab
- Assets/Palets/basic-environment/usine.prefab 225 additions, 0 deletionsAssets/Palets/basic-environment/usine.prefab
- Assets/Palets/basic-environment/usine.prefab.meta 7 additions, 0 deletionsAssets/Palets/basic-environment/usine.prefab.meta
- Assets/Prefabs/Verdure/Arbre.prefab 20 additions, 20 deletionsAssets/Prefabs/Verdure/Arbre.prefab
- Assets/Prefabs/Verdure/Hautes_herbes.prefab 8 additions, 15 deletionsAssets/Prefabs/Verdure/Hautes_herbes.prefab
- Assets/Prefabs/Verdure/buisson.prefab 23 additions, 73 deletionsAssets/Prefabs/Verdure/buisson.prefab
- Assets/Scenes/Niveau1.unity 1598 additions, 706 deletionsAssets/Scenes/Niveau1.unity
- Assets/Scenes/Niveau1.unity.meta 0 additions, 0 deletionsAssets/Scenes/Niveau1.unity.meta
- Assets/Scenes/Niveau2.unity 25023 additions, 0 deletionsAssets/Scenes/Niveau2.unity
- Assets/Scenes/Niveau2.unity.meta 7 additions, 0 deletionsAssets/Scenes/Niveau2.unity.meta
- Assets/Tiles/basic-environment/fumee.meta 8 additions, 0 deletionsAssets/Tiles/basic-environment/fumee.meta
- Assets/Tiles/basic-environment/fumee/fumee_0.asset 36 additions, 0 deletionsAssets/Tiles/basic-environment/fumee/fumee_0.asset
- Assets/Tiles/basic-environment/fumee/fumee_0.asset.meta 8 additions, 0 deletionsAssets/Tiles/basic-environment/fumee/fumee_0.asset.meta
- Assets/Tiles/basic-environment/fumee/fumee_1.asset 36 additions, 0 deletionsAssets/Tiles/basic-environment/fumee/fumee_1.asset
Please register or sign in to comment