 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
|
ad1935fdcf
|
Added commands to change sub, shuttle, gamemode & mission
Also fixed the exe icons
|
2017-06-22 21:42:09 -03:00 |
|
|
juanjp600
|
7003214847
|
Console colors, begin RNG rework
This is gonna be a PAIN
|
2017-06-19 21:30:57 -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 |
|
|
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 |
|
|
juanjp600
|
5636d1cdf9
|
Reorganized project to start work on dedicated server
|
2017-06-11 03:48:08 -03:00 |
|