3 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
Juan Pablo Arce	8f37e14917	Split Machines ItemComponents ... There's still a lot of work to do before we can get the server to compile	2017-06-18 14:36:11 -03:00
juanjp600	5636d1cdf9	Reorganized project to start work on dedicated server	2017-06-11 03:48:08 -03:00