Merge branch 'master' into 'master'
Barre de vie See merge request chirz/cityescape!3
Showing
- .gitignore 3 additions, 1 deletion.gitignore
- Assets/Import/GUI.meta 8 additions, 0 deletionsAssets/Import/GUI.meta
- Assets/Import/GUI/border.png 0 additions, 0 deletionsAssets/Import/GUI/border.png
- Assets/Import/GUI/border.png.meta 120 additions, 0 deletionsAssets/Import/GUI/border.png.meta
- Assets/Import/GUI/tree.png 0 additions, 0 deletionsAssets/Import/GUI/tree.png
- Assets/Import/GUI/tree.png.meta 96 additions, 0 deletionsAssets/Import/GUI/tree.png.meta
- Assets/Scenes/SampleScene.unity 543 additions, 0 deletionsAssets/Scenes/SampleScene.unity
- Assets/Scripts/GUI.meta 8 additions, 0 deletionsAssets/Scripts/GUI.meta
- Assets/Scripts/GUI/Bar.cs 26 additions, 0 deletionsAssets/Scripts/GUI/Bar.cs
- Assets/Scripts/GUI/Bar.cs.meta 11 additions, 0 deletionsAssets/Scripts/GUI/Bar.cs.meta
- Assets/Scripts/Player.meta 8 additions, 0 deletionsAssets/Scripts/Player.meta
- Assets/Scripts/Player/PlayerNature.cs 34 additions, 0 deletionsAssets/Scripts/Player/PlayerNature.cs
- Assets/Scripts/Player/PlayerNature.cs.meta 11 additions, 0 deletionsAssets/Scripts/Player/PlayerNature.cs.meta
- Logs/AssetImportWorker0-prev.log 0 additions, 254 deletionsLogs/AssetImportWorker0-prev.log
- Logs/AssetImportWorker0.log 0 additions, 0 deletionsLogs/AssetImportWorker0.log
- Logs/shadercompiler-AssetImportWorker0.log 0 additions, 0 deletionsLogs/shadercompiler-AssetImportWorker0.log
- Logs/shadercompiler-UnityShaderCompiler.exe0.log 0 additions, 0 deletionsLogs/shadercompiler-UnityShaderCompiler.exe0.log
- Logs/shadercompiler-UnityShaderCompiler.exe1.log 0 additions, 0 deletionsLogs/shadercompiler-UnityShaderCompiler.exe1.log
- Logs/shadercompiler-UnityShaderCompiler.exe10.log 0 additions, 0 deletionsLogs/shadercompiler-UnityShaderCompiler.exe10.log
- Logs/shadercompiler-UnityShaderCompiler.exe11.log 0 additions, 0 deletionsLogs/shadercompiler-UnityShaderCompiler.exe11.log
Please register or sign in to comment