Joonas Rikkonen bea7b58ff3 (a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:37:31 +03:00

..

Components

(a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:37:31 +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

(a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:37:31 +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

(0c86b4b28) Revert "Don't reset the los if there is no client (single player). Fixes los resetting between game sessions (less tedious debugging)."

2019-06-04 16:02:25 +03:00

RelatedItem.cs

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

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