Merge remote-tracking branch 'refs/remotes/origin/master'

Browse Source

Conflicts:
	Subsurface/Barotrauma.csproj
	Subsurface/Source/Characters/AI/EnemyAIController.cs
	Subsurface/Source/Characters/AICharacter.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/Items/Components/DockingPort.cs
	Subsurface/Source/Items/Components/Door.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Physics/PhysicsBody.cs

...

This commit is contained in:

juanjp600

2016-08-30 18:04:49 -03:00

parent af220dbc2a 8142cc734e

commit 6e83ef7626

63 changed files with 2787 additions and 1927 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

Subsurface/Barotrauma.csproj

+1395 -1384

File diff suppressed because it is too large Load Diff