juanjp600 72033a581e Merge remote-tracking branch 'refs/remotes/barotrauma/master' ...

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/GUI/GUI.cs
	Subsurface/Source/GameMain.cs
	Subsurface/Source/GameSettings.cs
	Subsurface/Source/Items/CharacterInventory.cs
	Subsurface/Source/Items/Components/ItemComponent.cs
	Subsurface/Source/Items/Components/Machines/Pump.cs
	Subsurface/Source/Items/Components/Machines/Radar.cs
	Subsurface/Source/Items/Components/Machines/Steering.cs
	Subsurface/Source/Items/Components/Power/PowerContainer.cs
	Subsurface/Source/Items/Inventory.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Items/ItemSpawner.cs
	Subsurface/Source/Map/Levels/WaterRenderer.cs
	Subsurface/Source/Map/LinkedSubmarine.cs
	Subsurface/Source/Map/Map/Map.cs
	Subsurface/Source/Map/Structure.cs
	Subsurface/Source/Map/Submarine.cs
	Subsurface/Source/Map/WayPoint.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Physics/PhysicsBody.cs
	Subsurface/Source/Screens/GameScreen.cs

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

..

disabled

Completely destroyed game

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

BanList.cs

Whitelist saving

2016-09-03 17:51:10 -03:00

ChatMessage.cs

Fixed lobby chat

2016-09-08 09:43:44 -03:00

Client.cs

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

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

GameClient.cs

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

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

GameServer.cs

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

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

GameServerLogin.cs

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

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

GameServerSettings.cs

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

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

INetSerializable.cs

Server serialization functions require client

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

NetBufferExtensions.cs

Some cleanup using ReSharper (mostly removing redundancies)

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

NetConfig.cs

Ragdoll.SetPosition takes platforms into account if the character isn't ignoring platforms (i.e. forcing a character on top of a platform won't make it fall through it), reaching the top/bottom of a ladder won't make networkplayers fall off, server ignores position updates from dead/unconscious characters, smaller ResetRagdollDistance

2016-08-10 19:16:18 +03:00

NetStats.cs

A bunch of fixes to syncing clients who join mid-round:

2016-07-25 18:48:48 +03:00

NetworkMember.cs

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

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

RespawnManager.cs

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

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

ServerLog.cs

Chat messages are added to the server log even if the host's character is out of range, message senders are shown in the server log, fixed multi-line log entries overlapping

2016-08-30 19:06:15 +03:00

WhiteList.cs

Moved the whitelist UI to server settings, GUITextBoxes can't be selected through other UI elements anymore

2016-09-05 18:12:56 +03:00