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	7168a534ed	Further separation of client-specific code ... Still not done here, just gonna push a commit now so I can pull this from elsewhere.	2017-06-16 16:02:07 -03:00