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

..

Characters

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

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

EventInput

Merged linux changes, fixed first item in inventory not being loaded, fixed levels breaking if re-entering the same level

2015-11-19 16:29:13 +02:00

Events

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

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

GameSession

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

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

GUI

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

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

Items

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

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

Map

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

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

Networking

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

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

Particles

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

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

Physics

Character freezing + Misc fixes

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

Screens

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

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

Sounds

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

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

Utils

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

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

Camera.cs

Possible to zoom out further when debugdraw is on, vents don't replenish oxygen when underwater, monster missions & events ignore spawnpoints that are too close to the main sub

2016-09-14 20:25:09 +03:00

ContentPackage.cs

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

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

CoroutineManager.cs

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

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

DebugConsole.cs

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

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

FrameCounter.cs

Switch to Barotrauma & too many misc changes to remember

2015-10-16 18:11:58 +03:00

GameMain.cs

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

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

GameSettings.cs

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

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

IPropertyObject.cs

Switch to Barotrauma & too many misc changes to remember

2015-10-16 18:11:58 +03:00

PlayerInput.cs

Character freezing + Misc fixes

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

Program.cs

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

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

Properties.cs

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

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

Sprite.cs

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

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