Regalis e12fe29f80 Merge branch 'master' into new-netcode ...

Conflicts:
	Subsurface/Source/Items/CharacterInventory.cs
	Subsurface/Source/Items/Inventory.cs
	Subsurface/Source/Items/Item.cs

2016-10-12 21:12:21 +03:00

..

Holdable

Fixes

2016-10-11 21:37:23 -03:00

Machines

Fixes

2016-10-11 21:37:23 -03:00

Power

Fixes

2016-10-11 21:37:23 -03:00

Signal

Fixes

2016-10-11 21:37:23 -03:00

DockingPort.cs

Fixes

2016-10-11 21:37:23 -03:00

Door.cs

Merge branch 'master' into new-netcode

2016-10-12 21:12:21 +03:00

ItemComponent.cs

Merge remote-tracking branch 'refs/remotes/barotrauma/master'

2016-10-11 20:19:25 -03:00

ItemContainer.cs

Update/rendering logic separation (cherrypicked from commits 9ca3b24, bddcc36 & 9511bae)

2016-10-05 20:35:18 +03:00

ItemLabel.cs

Small optimization: items have a list of components that have to be drawn

2016-05-24 21:17:38 +03:00

Ladder.cs

Some cleanup using ReSharper (mostly removing redundancies)

2016-03-12 15:32:34 +02:00

Projectile.cs

Added a particle trail to railgun shells

2016-10-09 15:13:41 +03:00

Rope.cs

Fixed the door collision bug at docking ports

2016-08-16 20:21:33 +03:00

StatusHUD.cs

- health scanner item

2016-03-26 18:15:44 +02:00

Turret.cs

Flipping turrets & controllers, moved radar UI update to UpdateHUD

2016-10-05 16:54:05 +03:00

Wearable.cs

Replace '' (two single quotes) with \" (double quote)

2016-09-24 21:26:08 -03:00