Joonas Rikkonen 14d0daf16d (ccef21f63) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-06 17:49:31 +03:00

..

Components

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

2019-04-06 17:49:31 +03:00

CharacterInventory.cs

(1a47431ff) Instead of displaying the red flash, automatically put the currently equipped item in the inventory (no matter if it's one or two handed) when picking up items that require two hands. If the item cannot be put into the inventory, the flash should be displayed (no auto dropping).

2019-04-04 11:12:32 +03:00

Inventory.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

Item.cs

(b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test

2019-04-04 11:10:29 +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

(b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test

2019-04-04 11:10:29 +03:00

RelatedItem.cs

2f107db...5202af9

2019-03-18 21:42:26 +02:00