Merge branch 'master' of http://localhost/Bonobo.Git.server/Test.git

Assets/Inventory System/Scripts/UI/ItemUI.cs

@@ -239,6 +239,8 @@ namespace SimpleInventorySystem
                     }
                     else
                     {
+                        // TODO: see if this is needed
+                        if(container != null)
                             container.SetActive(false);
                         return true;
                     }

Assets/Inventory System/Scripts/UI/SlotUI.cs

@@ -551,7 +551,7 @@ namespace SimpleInventorySystem
         {
             if (InventorySystem.instance.PressedDropItemKey(false) || InventorySystem.instance.PressedEquipItemKey(false))
             {
-                Debug.Log("pressed");
+                //Debug.Log("pressed");
                 return;
             }
 

Assets/Scenes/NeoFPS Test-TonysEdit.unity

@@ -42928,6 +42928,31 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2770326605768550993, guid: 9f005685dc17f4643b4a1156970fe2f6,
         type: 3}
       propertyPath: m_AnchorMin.y
@@ -43068,6 +43093,31 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2770326606002374600, guid: 9f005685dc17f4643b4a1156970fe2f6,
         type: 3}
       propertyPath: m_AnchorMin.y
@@ -43133,6 +43183,26 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2770326606127597624, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326606127597624, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326606127597624, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326606127597624, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2770326606150301029, guid: 9f005685dc17f4643b4a1156970fe2f6,
         type: 3}
       propertyPath: m_AnchorMin.y
@@ -43363,6 +43433,26 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2770326606355317296, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326606355317296, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326606355317296, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326606355317296, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2770326606530529104, guid: 9f005685dc17f4643b4a1156970fe2f6,
         type: 3}
       propertyPath: m_AnchorMin.y
@@ -43388,6 +43478,56 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2770326606660306585, guid: 9f005685dc17f4643b4a1156970fe2f6,
         type: 3}
       propertyPath: m_AnchorMin.y
@@ -43413,6 +43553,31 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -445
       objectReference: {fileID: 0}
+    - target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2770326606719424890, guid: 9f005685dc17f4643b4a1156970fe2f6,
         type: 3}
       propertyPath: m_AnchorMin.y