Joonas Rikkonen 70ff950d38 (c5137ce8c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-16 06:28:06 +03:00

..

Components

(c5137ce8c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-16 06:28:06 +03:00

CharacterInventory.cs

(a2943d8b7) Merge branch 'dev' into human-ai

2019-05-16 05:04:10 +03:00

Inventory.cs

(af16ecdfa) Merge branch 'dev' into human-ai

2019-05-16 05:14:00 +03:00

Item.cs

(c5137ce8c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-16 06:28:06 +03:00

ItemInventory.cs

(54ae135f5) Items can be dragged and dropped directly from the inventory into containers without having to select the container first.

2019-03-28 18:11:40 +02:00

ItemPrefab.cs

(78bfadc33) Another fix to legacy item loading (the aliases-attribute was case sensitive, and the case was not consistent in all of the legacy items)

2019-05-16 06:15:32 +03:00

RelatedItem.cs

(2a4bd39c2) Merge branch 'dev' into human-ai

2019-05-16 05:33:13 +03:00