juanjp600 02d98f5d29 Merge remote-tracking branch 'refs/remotes/barotrauma/master' ...

Conflicts:
	Subsurface/Source/Networking/FileStreamReceiver.cs
	Subsurface/Source/Networking/FileStreamSender.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs
	Subsurface/Source/Networking/NetworkEvent.cs
	Subsurface/Source/Screens/NetLobbyScreen.cs

2016-09-24 21:28:37 -03:00

..

Holdable

Completely destroyed game

2016-08-30 19:59:14 -03:00

Machines

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

2016-09-24 21:28:37 -03:00

Power

Added some missing UpdateGUI implementations

2016-09-18 11:41:17 -03:00

Signal

Server serialization functions require client

2016-09-07 17:32:20 -03:00

DockingPort.cs

Server serialization functions require client

2016-09-07 17:32:20 -03:00

Door.cs

Server serialization functions require client

2016-09-07 17:32:20 -03:00

ItemComponent.cs

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

2016-09-24 21:28:37 -03:00

ItemContainer.cs

Completely destroyed game

2016-08-30 19:59:14 -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

Fixed projectile velocity being reset in Item.Drop() after launch

2016-06-03 14:58:01 +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

- stunned characters don't move their hands behind their back when cuffed (caused the characters to flail around when someone grabs them)

2016-06-09 16:54:30 +03:00

Wearable.cs

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

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