Merge branch 'master' of git.unistra.fr:chirz/cityescape
Showing
- Assets/Prefabs/Parcelles/Raffael_boutique.prefab 193 additions, 535 deletionsAssets/Prefabs/Parcelles/Raffael_boutique.prefab
- Assets/Prefabs/Shop.prefab 49 additions, 34 deletionsAssets/Prefabs/Shop.prefab
- Assets/Prefabs/SignItem.prefab 144 additions, 0 deletionsAssets/Prefabs/SignItem.prefab
- Assets/Prefabs/SignItem.prefab.meta 7 additions, 0 deletionsAssets/Prefabs/SignItem.prefab.meta
- Assets/Scenes/Valentin.unity 393 additions, 121 deletionsAssets/Scenes/Valentin.unity
- Assets/Scenes/sceneRaffael.unity 70 additions, 2 deletionsAssets/Scenes/sceneRaffael.unity
- Assets/Scenes/sceneTanguy.unity 549 additions, 0 deletionsAssets/Scenes/sceneTanguy.unity
- Assets/Scripts/Game/GenerateMap.cs 49 additions, 6 deletionsAssets/Scripts/Game/GenerateMap.cs
- Assets/Scripts/Player/PlayerNature.cs 2 additions, 3 deletionsAssets/Scripts/Player/PlayerNature.cs
- Assets/Scripts/Scene/loadScene.cs 17 additions, 8 deletionsAssets/Scripts/Scene/loadScene.cs
- Assets/Shopping.cs 5 additions, 5 deletionsAssets/Shopping.cs
- Documents/CahierDesCharges.md 10 additions, 0 deletionsDocuments/CahierDesCharges.md
- ProjectSettings/TagManager.asset 2 additions, 1 deletionProjectSettings/TagManager.asset
- README.md 21 additions, 0 deletionsREADME.md
Please register or sign in to comment