Commit Graph

5 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
3b343899c0 "seed" command 2017-06-23 10:15:29 -03:00
juanjp600
0740579f62 Ingame syncing kinda works
Reminder to self: Submarines must spawn attached shuttles in Dedicated Server, must've been something I missed when moving over client-specific code
2017-06-20 22:28:18 -03:00
juanjp600
16bc68d768 BarotraumaServer compiles
Cleanup + fixes coming up next
2017-06-18 22:41:44 -03:00
juanjp600
5636d1cdf9 Reorganized project to start work on dedicated server 2017-06-11 03:48:08 -03:00