juanjp600 72033a581e Merge remote-tracking branch 'refs/remotes/barotrauma/master' ...

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/GUI/GUI.cs
	Subsurface/Source/GameMain.cs
	Subsurface/Source/GameSettings.cs
	Subsurface/Source/Items/CharacterInventory.cs
	Subsurface/Source/Items/Components/ItemComponent.cs
	Subsurface/Source/Items/Components/Machines/Pump.cs
	Subsurface/Source/Items/Components/Machines/Radar.cs
	Subsurface/Source/Items/Components/Machines/Steering.cs
	Subsurface/Source/Items/Components/Power/PowerContainer.cs
	Subsurface/Source/Items/Inventory.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Items/ItemSpawner.cs
	Subsurface/Source/Map/Levels/WaterRenderer.cs
	Subsurface/Source/Map/LinkedSubmarine.cs
	Subsurface/Source/Map/Map/Map.cs
	Subsurface/Source/Map/Structure.cs
	Subsurface/Source/Map/Submarine.cs
	Subsurface/Source/Map/WayPoint.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Physics/PhysicsBody.cs
	Subsurface/Source/Screens/GameScreen.cs

2016-10-11 20:19:25 -03:00

..

AI

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

2016-10-11 20:19:25 -03:00

Animation

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

2016-10-11 20:19:25 -03:00

BackgroundSprite

Improved background sprite placement logic: orientation of the cell edges determined by their normals instead of their position relative to the cell

2016-09-27 20:18:55 +03:00

Jobs

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

2016-09-24 21:28:37 -03:00

AICharacter.cs

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

2016-10-11 20:19:25 -03:00

Attack.cs

- special death messages for husk infections

2016-08-28 20:22:45 +03:00

Character.cs

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

2016-10-11 20:19:25 -03:00

CharacterHUD.cs

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

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

CharacterInfo.cs

Characters can be left behind in levels and they will stay there until the player returns, other subs visible in sonar

2016-07-20 17:13:34 +03:00

DelayedEffect.cs

Option to set a duration for a status effect

2016-03-26 23:20:02 +02:00

HUDProgressBar.cs

HUDProgressBars move with the subs

2016-09-26 16:26:52 +03:00

HuskInfection.cs

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

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

Limb.cs

User-controlled monsters can damage structures from outside the sub

2016-10-11 21:11:06 +03:00

StatusEffect.cs

Replace '' (two single quotes) with \" (double quote)

2016-09-24 21:26:08 -03:00