Joonas Rikkonen f1d794cb39 (86c9256b3) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-18 17:35:10 +03:00

..

Components

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

2019-05-18 17:35:10 +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

(683b11c00) High-res shuttle preview images + merge fix

2019-05-16 08:49:01 +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

(683b11c00) High-res shuttle preview images + merge fix

2019-05-16 08:49:01 +03:00

RelatedItem.cs

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

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