juanjp600 404c506662 Merge remote-tracking branch 'refs/remotes/barotrauma/master' ...

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/Character.cs

2016-09-07 17:35:18 -03:00

..

Controller.cs

- fixed Submarine.MainSub not being set in tutorialmode

2016-07-25 18:38:50 +03:00

Deconstructor.cs

Removed Fill/ReadNetworkData

2016-08-29 20:02:46 -03:00

Engine.cs

Improved autopilot

2016-09-06 19:14:27 +03:00

Fabricator.cs

Removed Fill/ReadNetworkData

2016-08-29 20:02:46 -03:00

MiniMap.cs

"Shifting" entity IDs to prevent them from overlapping between different subs, loading another submarine now works without crashing

2016-06-10 20:53:35 +03:00

OxygenGenerator.cs

Fixed vents, more powerful oxygen generators in vanilla subs

2016-05-30 18:25:50 +03:00

Pump.cs

Server serialization functions require client

2016-09-07 17:32:20 -03:00

Radar.cs

Server serialization functions require client

2016-09-07 17:32:20 -03:00

Reactor.cs

Server serialization functions require client

2016-09-07 17:32:20 -03:00

Steering.cs

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

2016-09-07 17:35:18 -03:00

Vent.cs

Fixed vents, more powerful oxygen generators in vanilla subs

2016-05-30 18:25:50 +03:00