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 |
|
juanjp600
|
c1780fa7b7
|
Server sleep time is slightly smarter + loading debug messages
|
2017-06-22 00:24:30 -03:00 |
|
juanjp600
|
fbe7dfc6fb
|
Dedicated server actually works to some extent
Clients can connect and use chat, the sub list isn't synced properly and there's no way to start a game yet
|
2017-06-19 15:12:19 -03:00 |
|
juanjp600
|
7bc535780c
|
Reducing usage of #if CLIENT / #elif SERVER
The server will implement some classes it probably shouldn't need because certain items or game states depend on them.
|
2017-06-14 17:30:40 -03:00 |
|