juanjp600 6f25bee9e1 Merge remote-tracking branch 'refs/remotes/barotrauma/master' ...

Conflicts:
	.vs/Subsurface_Solution/v14/.suo
	Subsurface/Barotrauma.csproj
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Items/ItemSpawner.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs

2016-09-03 17:54:33 -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

Added lobby chat syncing

2016-09-01 20:45:43 -03:00

Client.cs

Server name, message and submarine list syncing

2016-09-02 22:24:14 -03:00

GameClient.cs

Whitelist + conflict resolve

2016-09-03 14:57:36 -03:00

GameServer.cs

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

2016-09-03 17:54:33 -03:00

GameServerLogin.cs

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

2016-09-03 17:54:33 -03:00

GameServerSettings.cs

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

2016-09-03 17:54:33 -03:00

INetSerializable.cs

Separate interfaces for entities that the clients/server can send updates for (+ placeholder implementations)

2016-09-01 20:39:52 +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-09-03 17:54:33 -03:00

RespawnManager.cs

Removed more networking code

2016-08-30 21:33:10 -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

Whitelist saving

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