6 Commits

Author	SHA1	Message	Date
Joonas Rikkonen	045a48cc33	Logging item throwing and which items are contained in items characters use on themselves (e.g. which meds are inside a syringe)	2017-07-09 21:52:13 +03:00
Joonas Rikkonen	e0c10860ba	Fixes to holdable items again: items can be attached outside hulls in the sub editor, but not in-game	2017-07-09 20:23:14 +03:00
Joonas Rikkonen	2598bb1bd3	Fixed attachable items becoming detachable without any tools after they've been detached once	2017-07-08 18:32:21 +03:00
Joonas Rikkonen	bf5a0746ad	Merge branch 'master' of https://github.com/Faerdan/Barotrauma into Faerdan-master ... Conflicts: Barotrauma/BarotraumaClient/Source/Map/MapEntity.cs Barotrauma/BarotraumaClient/Source/Screens/GameScreen.cs Barotrauma/BarotraumaShared/Source/Characters/Character.cs Barotrauma/BarotraumaShared/Source/Items/Item.cs	2017-07-05 19:32:34 +03:00
Joonas Rikkonen	64ad5e5003	Removed unnecessary using directives	2017-07-05 18:35:09 +03:00
juanjp600	4d225c65f2	Updated to MonoGame 3.6 + Directory refactor ... - Barotrauma's projects are in the Barotrauma directory - All libraries are in the Libraries directory - MonoGame is now managed by NuGet, rather than referenced from the installed files (TODO: consider using PCL for easier cross-platform development?) - NuGet libraries are not included in the repo, as getting the latest versions automatically should be preferred - Removed Content/effects.mgfx as it didn't seem to be used anywhere - Removed some references to Subsurface directory - Renamed Launcher2 to Launcher	2017-06-27 09:52:57 -03:00