Regalis 1f07b18e5b Merge branch 'master' into new-netcode ...

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Items/Components/DockingPort.cs
	Subsurface/Source/Items/Components/Signal/Wire.cs
	Subsurface/Source/Items/Item.cs

2016-12-29 22:18:27 +02:00

..

Holdable.cs

Fixes

2016-10-11 21:37:23 -03:00

MeleeWeapon.cs

Renamed the CollisionMisc collision category to CollisionItem, teleporting items inside/outside the sub if their physicsbody leaves/enters a hull, powercontainer charge can be changed in editor (i.e. batteries can be set to fully loaded)

2016-05-19 19:47:26 +03:00

Pickable.cs

Merge branch 'master' into new-netcode

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

Propulsion.cs

Backported animcontroller-overhaul

2016-10-22 15:18:16 +03:00

RangedWeapon.cs

Some cleanup using ReSharper (mostly removing redundancies)

2016-03-12 15:32:34 +02:00

RepairTool.cs

Fixed Ragdoll.HeadInWater not being set to true if the character is inside a water-filled hull but the head is outside the sub, HUDProgressBars aren't created when a non-controlled character repairs something

2016-12-28 20:00:40 +02:00

Throwable.cs

Particle emitters can be assigned to statuseffects, fixed item.Submarine not being set correctly for throwable items, flare particles + sounds, nerfed some of the medical items

2016-05-11 20:16:50 +03:00