juanjp600 6e83ef7626 Merge remote-tracking branch 'refs/remotes/origin/master' ...

Conflicts:
	Subsurface/Barotrauma.csproj
	Subsurface/Source/Characters/AI/EnemyAIController.cs
	Subsurface/Source/Characters/AICharacter.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/Items/Components/DockingPort.cs
	Subsurface/Source/Items/Components/Door.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Physics/PhysicsBody.cs

2016-08-30 18:04:49 -03:00

..

disabled

Disable reliable sender

2016-08-25 18:40:59 -03:00

BanList.cs

WIP client special permissions (kick, ban, end round)

2016-08-24 11:47:46 +03:00

ChatMessage.cs

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

2016-08-30 18:04:49 -03:00

Client.cs

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

2016-08-30 18:04:49 -03:00

FileStreamReceiver.cs

- clients see the submarines that the host has instead of their own subs in server lobby

2016-05-22 01:39:10 +03:00

FileStreamSender.cs

- File transfer improvements (switching the sub selection during transfer works, max transfer duration, waiting for transfers to finish before starting the round)

2016-02-27 21:01:10 +02:00

GameClient.cs

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

2016-08-30 18:04:49 -03:00

GameServer.cs

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

2016-08-30 18:04:49 -03:00

GameServerLogin.cs

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

2016-08-30 18:04:49 -03:00

GameServerSettings.cs

Changes to the layout of the "manage players" menu

2016-08-29 18:28:31 +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

NetworkEvent.cs

Removed Fill/ReadNetworkData

2016-08-29 20:02:46 -03:00

NetworkMember.cs

Merged branch master into master

2016-08-30 17:36:11 -03:00

RespawnManager.cs

WriteCharacterData/ReadCharacterData methods can be used for any type of character (less duplicate code)

2016-08-26 20:48:57 +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