Alex Noir 9610444e67 Merge branch 'master' into moStuff ...

# Conflicts:
#	Barotrauma/BarotraumaShared/Source/Characters/Character.cs

2017-12-21 23:17:56 +03:00

..

BarotraumaClient

Merge branch 'master' into moStuff

2017-12-21 23:17:56 +03:00

BarotraumaServer

Merge branch 'permission-overhaul'. Closes #49

2017-12-20 19:36:17 +02:00

BarotraumaShared

Merge branch 'master' into moStuff

2017-12-21 23:17:56 +03:00

Launcher

Converted the GetAttribute methods in the ToolBox class to extension methods

2017-10-04 18:38:40 +03:00