LuaCsForBarotraumaEP

Files

Regalis 5bdb57b98a Merge branch 'master' into new-netcode

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/AICharacter.cs
	Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/GameMain.cs
	Subsurface/Source/Items/Components/Signal/Connection.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs
	Subsurface/Source/Physics/PhysicsBody.cs

2017-03-11 13:24:09 +02:00

Components

Merge branch 'master' into new-netcode

2017-03-11 13:24:09 +02:00

CharacterInventory.cs

Fixed ItemContainer not setting the position of a contained item when it's placed in the ItemInventory, minor refactoring

2017-02-07 21:06:42 +02:00

FixRequirement.cs

Broken items can be repaired, fixed clients never removing firesources (causing the lights to stay after the flames have been extinguished)

2017-01-14 20:30:46 +02:00

Inventory.cs

Merge branch 'master' into new-netcode