Merge branch 'master' of git.unistra.fr:chirz/cityescape
Showing
- Assets/Import/ShopItems.meta 8 additions, 0 deletionsAssets/Import/ShopItems.meta
- Assets/Import/ShopItems/Materials.meta 8 additions, 0 deletionsAssets/Import/ShopItems/Materials.meta
- Assets/Import/ShopItems/Materials/tent.mat 37 additions, 0 deletionsAssets/Import/ShopItems/Materials/tent.mat
- Assets/Import/ShopItems/Materials/tent.mat.meta 8 additions, 0 deletionsAssets/Import/ShopItems/Materials/tent.mat.meta
- Assets/Import/ShopItems/boot.png 0 additions, 0 deletionsAssets/Import/ShopItems/boot.png
- Assets/Import/ShopItems/boot.png.meta 120 additions, 0 deletionsAssets/Import/ShopItems/boot.png.meta
- Assets/Import/ShopItems/tent.png 0 additions, 0 deletionsAssets/Import/ShopItems/tent.png
- Assets/Import/ShopItems/tent.png.meta 120 additions, 0 deletionsAssets/Import/ShopItems/tent.png.meta
- Assets/Prefabs/Parcelles/Raffael_boutique.prefab 105 additions, 22 deletionsAssets/Prefabs/Parcelles/Raffael_boutique.prefab
- Assets/Prefabs/Shop.prefab 9 additions, 8 deletionsAssets/Prefabs/Shop.prefab
- Assets/Prefabs/boot.prefab 116 additions, 0 deletionsAssets/Prefabs/boot.prefab
- Assets/Prefabs/boot.prefab.meta 7 additions, 0 deletionsAssets/Prefabs/boot.prefab.meta
- Assets/Prefabs/tent.prefab 125 additions, 0 deletionsAssets/Prefabs/tent.prefab
- Assets/Prefabs/tent.prefab.meta 7 additions, 0 deletionsAssets/Prefabs/tent.prefab.meta
- Assets/Scenes/Valentin.unity 280 additions, 9 deletionsAssets/Scenes/Valentin.unity
- Assets/Scenes/sceneRaffael.unity 40694 additions, 23886 deletionsAssets/Scenes/sceneRaffael.unity
- Assets/Scripts/Game/GenerateMap.cs 43 additions, 9 deletionsAssets/Scripts/Game/GenerateMap.cs
- Assets/Shopping.cs 2 additions, 0 deletionsAssets/Shopping.cs
- ProjectSettings/TagManager.asset 3 additions, 0 deletionsProjectSettings/TagManager.asset
Please register or sign in to comment