juanjp600 1dc255bc2f Merge branch 'master' into dedicated-server ...

# Conflicts:
#	BarotraumaClient/Source/GameSettings.cs
#	BarotraumaClient/Source/Screens/NetLobbyScreen.cs

2017-06-23 10:21:02 -03:00

..

FileTransfer

BarotraumaServer compiles

2017-06-18 22:41:44 -03:00

NetEntityEvent

Merge branch 'master' into dedicated-server

2017-06-23 10:21:02 -03:00

BanList.cs

Split Machines ItemComponents

2017-06-18 14:36:11 -03:00

ChatMessage.cs

Reorganized project to start work on dedicated server

2017-06-11 03:48:08 -03:00

Client.cs

Reorganized project to start work on dedicated server

2017-06-11 03:48:08 -03:00

EntitySpawner.cs

Ingame syncing kinda works

2017-06-20 22:28:18 -03:00

GameServer.cs

Added some convenient console commands

2017-06-22 19:51:19 -03:00

GameServerLogin.cs

BarotraumaServer compiles

2017-06-18 22:41:44 -03:00

GameServerSettings.cs

Split Machines ItemComponents

2017-06-18 14:36:11 -03:00

INetSerializable.cs

Reducing usage of #if CLIENT / #elif SERVER

2017-06-14 17:30:40 -03:00

NetBufferExtensions.cs

Reorganized project to start work on dedicated server

2017-06-11 03:48:08 -03:00

NetConfig.cs

Reorganized project to start work on dedicated server

2017-06-11 03:48:08 -03:00

NetIdUtils.cs

Reorganized project to start work on dedicated server

2017-06-11 03:48:08 -03:00

NetworkMember.cs

Ingame syncing kinda works

2017-06-20 22:28:18 -03:00

RespawnManager.cs

Ingame syncing kinda works

2017-06-20 22:28:18 -03:00

ServerLog.cs

Dedicated server actually works to some extent

2017-06-19 15:12:19 -03:00

Voting.cs

BarotraumaServer compiles

2017-06-18 22:41:44 -03:00

WhiteList.cs

Split Machines ItemComponents

2017-06-18 14:36:11 -03:00