2 Commits

Author	SHA1	Message	Date
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	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