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

..

NetEntityEvent.cs

"seed" command

2017-06-23 10:15:29 -03:00

NetEntityEventManager.cs

Merge branch 'master' into dedicated-server

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

ServerEntityEventManager.cs

Ingame syncing kinda works

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