LuaCsForBarotraumaEP

Files

Regalis adde3461ea Merge branch 'master' into new-netcode

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/Items/Components/Door.cs
	Subsurface/Source/Items/Components/Power/PowerContainer.cs
	Subsurface/Source/Items/Components/Signal/Wire.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/ChatMessage.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs
	Subsurface/Source/Networking/GameServerSettings.cs
	Subsurface/Source/Networking/NetworkMember.cs

2016-11-24 19:52:40 +02:00

Components

Merge branch 'master' into new-netcode

2016-11-24 19:52:40 +02:00

CharacterInventory.cs

- fixed dummy location generation crashing the tutorial

2016-11-03 18:22:45 +02:00

FixRequirement.cs

Merge branch 'master' into new-netcode

2016-11-24 19:52:40 +02:00

Inventory.cs

Merge remote-tracking branch 'barotrauma/master' into new-netcode