juanjp600 0ef813f189 Merge remote-tracking branch 'refs/remotes/barotrauma/master' ...

Conflicts:
	Subsurface/Barotrauma.csproj
	Subsurface/Source/Screens/GameScreen.cs

2016-09-26 17:03:14 -03:00

..

Holdable.cs

Removed Fill/ReadNetworkData

2016-08-29 20:02:46 -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 remote-tracking branch 'refs/remotes/barotrauma/master'

2016-09-26 17:03:14 -03:00

Propulsion.cs

- Fixed shadows not being cast if the lightsource is outside the sub and the convexhull is not

2016-05-03 00:27:48 +03:00

RangedWeapon.cs

Some cleanup using ReSharper (mostly removing redundancies)

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

RepairTool.cs

Topwindow sprite fix, fixed null reference exception when welding/cutting walls that aren't part of a sub

2016-09-21 19:39:00 +03: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