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

..

BlurEffect.cs

Reorganized project to start work on dedicated server

2017-06-11 03:48:08 -03:00

EditCharacterScreen.cs

Reorganized project to start work on dedicated server

2017-06-11 03:48:08 -03:00

EditMapScreen.cs

Reorganized project to start work on dedicated server

2017-06-11 03:48:08 -03:00

GameScreen.cs

Fixed client compilation errors

2017-06-14 18:24:11 -03:00

LobbyScreen.cs

Reorganized project to start work on dedicated server

2017-06-11 03:48:08 -03:00

MainMenuScreen.cs

Reorganized project to start work on dedicated server

2017-06-11 03:48:08 -03:00

NetLobbyScreen.cs

Merge branch 'master' into dedicated-server

2017-06-23 10:21:02 -03:00

Screen.cs

Reducing usage of #if CLIENT / #elif SERVER

2017-06-14 17:30:40 -03:00

ServerListScreen.cs

Reorganized project to start work on dedicated server

2017-06-11 03:48:08 -03:00