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

# Conflicts:
#	Subsurface/Properties/AssemblyInfo.cs
#	Subsurface/Source/Characters/AI/EnemyAIController.cs
#	Subsurface/Source/Characters/AICharacter.cs
#	Subsurface/Source/Characters/Character.cs
#	Subsurface/Source/Items/Components/Signal/Connection.cs
#	Subsurface/Source/Items/Item.cs
#	Subsurface/Source/Map/Structure.cs
#	Subsurface/Source/Networking/GameClient.cs
#	Subsurface/Source/Networking/GameServer.cs
#	Subsurface/Source/Screens/NetLobbyScreen.cs

2016-11-05 18:18:20 -03:00

..

Controller.cs

Backported animcontroller-overhaul

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

Deconstructor.cs

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

2016-11-05 18:09:44 -03:00

Engine.cs

Fixes

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

Fabricator.cs

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

2016-11-05 18:18:20 -03:00

MiniMap.cs

asdfasdf

2016-09-08 21:26:15 +03:00

OxygenGenerator.cs

Fixed vents, more powerful oxygen generators in vanilla subs

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

Pump.cs

InGame update messages include a timestamp which is passed to the ClientRead methods

2016-10-18 19:04:32 +03:00

Radar.cs

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

2016-11-05 18:09:44 -03:00

Reactor.cs

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

2016-11-05 18:18:20 -03:00

Steering.cs

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

2016-11-05 18:18:20 -03:00

Vent.cs

Possible to zoom out further when debugdraw is on, vents don't replenish oxygen when underwater, monster missions & events ignore spawnpoints that are too close to the main sub

2016-09-14 20:25:09 +03:00