Merge branch 'master' of git.unistra.fr:chirz/cityescape
Showing
- Assets/Import/basic-environment/Overworld 1.png.meta 1076 additions, 1076 deletionsAssets/Import/basic-environment/Overworld 1.png.meta
- Assets/Prefabs/Parcelles/Melvyn_village 1.prefab 4170 additions, 0 deletionsAssets/Prefabs/Parcelles/Melvyn_village 1.prefab
- Assets/Prefabs/Parcelles/Melvyn_village 1.prefab.meta 7 additions, 0 deletionsAssets/Prefabs/Parcelles/Melvyn_village 1.prefab.meta
- Assets/Prefabs/Parcelles/Melvyn_village.prefab 3942 additions, 0 deletionsAssets/Prefabs/Parcelles/Melvyn_village.prefab
- Assets/Prefabs/Parcelles/Melvyn_village.prefab.meta 7 additions, 0 deletionsAssets/Prefabs/Parcelles/Melvyn_village.prefab.meta
- Assets/Prefabs/Parcelles/Raffael_boutique.prefab 3970 additions, 0 deletionsAssets/Prefabs/Parcelles/Raffael_boutique.prefab
- Assets/Prefabs/Parcelles/Raffael_boutique.prefab.meta 7 additions, 0 deletionsAssets/Prefabs/Parcelles/Raffael_boutique.prefab.meta
- Assets/Prefabs/Parcelles/Raffael_village.prefab 4062 additions, 0 deletionsAssets/Prefabs/Parcelles/Raffael_village.prefab
- Assets/Prefabs/Parcelles/Raffael_village.prefab.meta 7 additions, 0 deletionsAssets/Prefabs/Parcelles/Raffael_village.prefab.meta
- Assets/Prefabs/Player.prefab 3 additions, 0 deletionsAssets/Prefabs/Player.prefab
- Assets/Prefabs/Shop.prefab 164 additions, 0 deletionsAssets/Prefabs/Shop.prefab
- Assets/Prefabs/Shop.prefab.meta 7 additions, 0 deletionsAssets/Prefabs/Shop.prefab.meta
- Assets/Scenes/NiveauParcelle.unity 1016 additions, 614 deletionsAssets/Scenes/NiveauParcelle.unity
- Assets/Scenes/Valentin.unity 228 additions, 0 deletionsAssets/Scenes/Valentin.unity
- Assets/Scripts/GUI/Dialog.cs 0 additions, 1 deletionAssets/Scripts/GUI/Dialog.cs
- Assets/Shopping.cs 40 additions, 0 deletionsAssets/Shopping.cs
- Assets/Shopping.cs.meta 11 additions, 0 deletionsAssets/Shopping.cs.meta
- ProjectSettings/TagManager.asset 6 additions, 0 deletionsProjectSettings/TagManager.asset
Please register or sign in to comment