Commit Graph

7 Commits

Author SHA1 Message Date
juanjp600 d6d8a5b868 Removed BarotraumaServer's MonoGame dependency 2017-06-23 14:43:43 -03:00
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 6b65e94d41 Fixed map collider generation
I didn't realize the bodies were generated in the same method that generates the mesh triangles, TODO consider splitting that
2017-06-21 18:45:06 -03:00
juanjp600 7003214847 Console colors, begin RNG rework
This is gonna be a PAIN
2017-06-19 21:30:57 -03:00
juanjp600 16bc68d768 BarotraumaServer compiles
Cleanup + fixes coming up next
2017-06-18 22:41:44 -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