Merge branch 'Quests' of https://github.com/UnityTechnologies/open-project-1 into Quests

UOP1_Project/Assets/Scripts/Inventory/InventoryItemFiller.cs

 		_imgHover.gameObject.SetActive(true);
 		_imgSelected.gameObject.SetActive(true);
 		_itemButton.gameObject.SetActive(true);
-		_bgInactiveImage.gameObject.SetActive(false); 
+		_bgInactiveImage.gameObject.SetActive(false);
 
 		UnhoverItem();
 
 
 		});
 	}
-	public void SetInactiveItem() {
+	public void SetInactiveItem()
+	{
-		_itemPreviewImage.gameObject.SetActive(false); 
+		_itemPreviewImage.gameObject.SetActive(false);
 		_itemCount.gameObject.SetActive(false);
 		_bgImage.gameObject.SetActive(false);
 		_imgHover.gameObject.SetActive(false);

UOP1_Project/Assets/Scripts/Inventory/UIInventoryManager.cs

 			else if (i < _instanciatedItems.Count)
 			{
 				//Desactive
-				_instanciatedItems[i].SetInactiveItem(); 
+				_instanciatedItems[i].SetInactiveItem();
 			}
 
 		}

UOP1_Project/Assets/Scripts/UI/IngredientFiller.cs

 
 		_ingredientAmount.text = ingredient.Amount.ToString();
 		_ingredientAmount.gameObject.SetActive(isAvailable);
-		_ingredientIcon.sprite = ingredient.Item.PreviewImage; 
+		_ingredientIcon.sprite = ingredient.Item.PreviewImage;
 		_checkMark.SetActive(!isAvailable);
 
 	}

UOP1_Project/Assets/Scripts/UI/InspectorFiller.cs

 		bool isForCooking = (itemToInspect.ItemType.ActionType == ItemInventoryActionType.cook);
 
 		_inventoryInspector.gameObject.SetActive(true);
-	    _inventoryInspector.FillItemInspector(itemToInspect,isForCooking, availabilityArray);
-		
+		_inventoryInspector.FillItemInspector(itemToInspect, isForCooking, availabilityArray);
+
 
 	}
 

UOP1_Project/Assets/Scripts/UI/InventoryInspectorFiller.cs

 
 
 
-	public void FillItemInspector(Item itemToInspect, bool isCookingInventory, bool[] availabilityArray=null)
+	public void FillItemInspector(Item itemToInspect, bool isCookingInventory, bool[] availabilityArray = null)
 	{
 		_inspectorDescriptionFiller.FillDescription(itemToInspect);
 		if (isCookingInventory)
 		}
 		else
-			_recipeIngredientsFiller.gameObject.SetActive(false); 
+			_recipeIngredientsFiller.gameObject.SetActive(false);
 
 	}
 }

UOP1_Project/Assets/Scripts/UI/InventoryTypeTabFiller.cs

 	[SerializeField] private Image _tabImage = default;
 
 	[SerializeField] private Button _actionButton = default;
-	
+
 	[SerializeField] private Color _selectedIconColor = default;
 	[SerializeField] private Color _deselectedIconColor = default;
 
-		
-		_tabImage.sprite = tabType.TabIcon; 
+
+		_tabImage.sprite = tabType.TabIcon;
-		if(isSelected)
+		if (isSelected)
 		{
 			_tabImage.color = _selectedIconColor;
 		}