Merge branch 'permission-overhaul'. Closes #49

Browse Source

Conflicts:
	Barotrauma/BarotraumaShared/Source/DebugConsole.cs
	Barotrauma/BarotraumaShared/Source/Networking/ChatMessage.cs

...

This commit is contained in:

Joonas Rikkonen

2017-12-20 19:35:58 +02:00

parent d03dd40336 b3c3970209

commit ce37411a29

19 changed files with 1126 additions and 268 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Barotrauma/BarotraumaShared/Source/DebugConsole.cs

+658 -171

File diff suppressed because it is too large Load Diff