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

..

AnimController.cs

Performing CPR on unconscious players, a "use on self" button for some items

2016-03-25 15:34:40 +02:00

FishAnimController.cs

Characters that aren't inside a hull or can't enter subs won't attempt to play a walking animation

2016-09-07 20:18:52 +03:00

HumanoidAnimController.cs

Character freezing + Misc fixes

2016-09-21 16:46:12 -03:00

Ragdoll.cs

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

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