Joonas Rikkonen 3b35ba056d (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

..

BarotraumaClient

(153cbd717) Fix reset button not refreshing the settings frame. Fix a text tag.

2019-04-04 11:11:24 +03:00

BarotraumaServer

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

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

BarotraumaShared

(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

Launcher

2f107db...5202af9

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