Merge branch 'master' into 'master'
Raffael Di Pietro's avatar Correction de warning et d'erreurs (j'aime pas le rouge dans la console mdr) & modif dialogues marchand See merge request chirz/cityescape!64
Showing
- Assets/Scripts/GUI/Dialog.cs 6 additions, 11 deletionsAssets/Scripts/GUI/Dialog.cs
- Assets/Scripts/Inventory/Border.cs 2 additions, 2 deletionsAssets/Scripts/Inventory/Border.cs
- Assets/Scripts/Inventory/Item.cs 1 addition, 1 deletionAssets/Scripts/Inventory/Item.cs
- Assets/Scripts/Scene/loadScene.cs 2 additions, 2 deletionsAssets/Scripts/Scene/loadScene.cs
- Assets/Shopping.cs 0 additions, 1 deletionAssets/Shopping.cs
Please register or sign in to comment