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

..

Holdable

Backported animcontroller-overhaul

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

Machines

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

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

Power

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

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

Signal

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

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

DockingPort.cs

Merge branch 'master' into animcontroller-overhaul

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

Door.cs

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

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

ItemComponent.cs

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

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

ItemContainer.cs

Update/rendering logic separation (cherrypicked from commits 9ca3b24, bddcc36 & 9511bae)

2016-10-05 20:35:18 +03:00

ItemLabel.cs

Small optimization: items have a list of components that have to be drawn

2016-05-24 21:17:38 +03:00

Ladder.cs

Some cleanup using ReSharper (mostly removing redundancies)

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

Projectile.cs

Backported animcontroller-overhaul

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

Rope.cs

Cleanup with resharper (mostly removing redundancies & using collection.Length/Count properties instead of the Count method)

2016-10-31 20:50:20 +02:00

StatusHUD.cs

- health scanner item

2016-03-26 18:15:44 +02:00

Turret.cs

Flipping turrets & controllers, moved radar UI update to UpdateHUD

2016-10-05 16:54:05 +03:00

Wearable.cs

Cleanup with resharper (mostly removing redundancies & using collection.Length/Count properties instead of the Count method)

2016-10-31 20:50:20 +02:00