Merge branch 'master' of git.unistra.fr:chirz/cityescape into master
Showing
- .gitignore 1 addition, 1 deletion.gitignore
- Assets/Import/Objects.meta 8 additions, 0 deletionsAssets/Import/Objects.meta
- Assets/Import/Objects/Verdure.meta 8 additions, 0 deletionsAssets/Import/Objects/Verdure.meta
- Assets/Import/Objects/Verdure/buisson.png 0 additions, 0 deletionsAssets/Import/Objects/Verdure/buisson.png
- Assets/Import/Objects/Verdure/buisson.png.meta 120 additions, 0 deletionsAssets/Import/Objects/Verdure/buisson.png.meta
- Assets/Prefabs/buisson.prefab 182 additions, 0 deletionsAssets/Prefabs/buisson.prefab
- Assets/Prefabs/buisson.prefab.meta 7 additions, 0 deletionsAssets/Prefabs/buisson.prefab.meta
- Assets/Scenes/Valentin.unity 17280 additions, 0 deletionsAssets/Scenes/Valentin.unity
- Assets/Scenes/Valentin.unity.meta 0 additions, 0 deletionsAssets/Scenes/Valentin.unity.meta
- Assets/Scenes/sceneTanguy.unity 8505 additions, 0 deletionsAssets/Scenes/sceneTanguy.unity
- Assets/Scenes/sceneTanguy.unity.meta 7 additions, 0 deletionsAssets/Scenes/sceneTanguy.unity.meta
- Assets/Scenes/testScene1 1.unity 0 additions, 0 deletionsAssets/Scenes/testScene1 1.unity
- Assets/Scenes/testScene1 1.unity.meta 7 additions, 0 deletionsAssets/Scenes/testScene1 1.unity.meta
- Assets/Scripts/Camera/CameraMouvement.cs 6 additions, 0 deletionsAssets/Scripts/Camera/CameraMouvement.cs
- Assets/Scripts/Objects.meta 8 additions, 0 deletionsAssets/Scripts/Objects.meta
- Assets/Scripts/Objects/Verdure.meta 8 additions, 0 deletionsAssets/Scripts/Objects/Verdure.meta
- Assets/Scripts/Objects/Verdure/VerdureGestionNature.cs 38 additions, 0 deletionsAssets/Scripts/Objects/Verdure/VerdureGestionNature.cs
- Assets/Scripts/Objects/Verdure/VerdureGestionNature.cs.meta 11 additions, 0 deletionsAssets/Scripts/Objects/Verdure/VerdureGestionNature.cs.meta
- Assets/Scripts/Player/PlayerMovement.cs 18 additions, 8 deletionsAssets/Scripts/Player/PlayerMovement.cs
- Assets/Scripts/Player/PlayerNature.cs 34 additions, 2 deletionsAssets/Scripts/Player/PlayerNature.cs
Please register or sign in to comment