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

..

Characters

Ingame syncing kinda works

2017-06-20 22:28:18 -03:00

EventInput

Reorganized project to start work on dedicated server

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

Events/Missions

BarotraumaServer compiles

2017-06-18 22:41:44 -03:00

Fonts

Reorganized project to start work on dedicated server

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

GameSession

Console colors, begin RNG rework

2017-06-19 21:30:57 -03:00

GUI

Server sleep time is slightly smarter + loading debug messages

2017-06-22 00:24:30 -03:00

Items

BarotraumaServer compiles

2017-06-18 22:41:44 -03:00

Map

Console colors, begin RNG rework

2017-06-19 21:30:57 -03:00

Networking

Ingame syncing kinda works

2017-06-20 22:28:18 -03:00

Particles

Reorganized project to start work on dedicated server

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

Physics

BarotraumaServer compiles

2017-06-18 22:41:44 -03:00

Screens

Merge branch 'master' into dedicated-server

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

Sounds

Reorganized project to start work on dedicated server

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

Sprite

Fixed client compilation errors

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

Utils

BarotraumaServer compiles

2017-06-18 22:41:44 -03:00

Camera.cs

Reorganized project to start work on dedicated server

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

DebugConsole.cs

Ingame syncing kinda works

2017-06-20 22:28:18 -03:00

GameMain.cs

Merge branch 'master' into dedicated-server

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

GameSettings.cs

Merge branch 'master' into dedicated-server

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

PlayerInput.cs

Reducing usage of #if CLIENT / #elif SERVER

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

Program.cs

Ingame syncing kinda works

2017-06-20 22:28:18 -03:00