Merge branch 'master' into 'master'
Ajout système de border qu'on peut dépasser seulement avec le bon objet See merge request chirz/cityescape!30
Showing
- Assets/Items.meta 8 additions, 0 deletionsAssets/Items.meta
- Assets/Items/1.Chaussures.asset 18 additions, 0 deletionsAssets/Items/1.Chaussures.asset
- Assets/Items/1.Chaussures.asset.meta 8 additions, 0 deletionsAssets/Items/1.Chaussures.asset.meta
- Assets/Items/2.Baton.asset 18 additions, 0 deletionsAssets/Items/2.Baton.asset
- Assets/Items/2.Baton.asset.meta 8 additions, 0 deletionsAssets/Items/2.Baton.asset.meta
- Assets/Items/3.Réchaud.asset 19 additions, 0 deletionsAssets/Items/3.Réchaud.asset
- Assets/Items/3.Réchaud.asset.meta 8 additions, 0 deletionsAssets/Items/3.Réchaud.asset.meta
- Assets/Items/4.Tente.asset 18 additions, 0 deletionsAssets/Items/4.Tente.asset
- Assets/Items/4.Tente.asset.meta 8 additions, 0 deletionsAssets/Items/4.Tente.asset.meta
- Assets/Scenes/sceneRaffael.unity 12718 additions, 4824 deletionsAssets/Scenes/sceneRaffael.unity
- Assets/Scenes/sceneRaffael.unity.meta 0 additions, 0 deletionsAssets/Scenes/sceneRaffael.unity.meta
- Assets/Scripts/GUI/Dialog.cs 1 addition, 1 deletionAssets/Scripts/GUI/Dialog.cs
- Assets/Scripts/Inventory.meta 8 additions, 0 deletionsAssets/Scripts/Inventory.meta
- Assets/Scripts/Inventory/Border.cs 30 additions, 0 deletionsAssets/Scripts/Inventory/Border.cs
- Assets/Scripts/Inventory/Border.cs.meta 11 additions, 0 deletionsAssets/Scripts/Inventory/Border.cs.meta
- Assets/Scripts/Inventory/Inventory.cs 43 additions, 0 deletionsAssets/Scripts/Inventory/Inventory.cs
- Assets/Scripts/Inventory/Inventory.cs.meta 11 additions, 0 deletionsAssets/Scripts/Inventory/Inventory.cs.meta
- Assets/Scripts/Inventory/Item.cs 13 additions, 0 deletionsAssets/Scripts/Inventory/Item.cs
- Assets/Scripts/Inventory/Item.cs.meta 11 additions, 0 deletionsAssets/Scripts/Inventory/Item.cs.meta
- ProjectSettings/EditorBuildSettings.asset 1 addition, 1 deletionProjectSettings/EditorBuildSettings.asset
Please register or sign in to comment