juanjp600 6e83ef7626 Merge remote-tracking branch 'refs/remotes/origin/master' ...

Conflicts:
	Subsurface/Barotrauma.csproj
	Subsurface/Source/Characters/AI/EnemyAIController.cs
	Subsurface/Source/Characters/AICharacter.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/Items/Components/DockingPort.cs
	Subsurface/Source/Items/Components/Door.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Physics/PhysicsBody.cs

2016-08-30 18:04:49 -03:00

..

AI

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

2016-08-30 18:04:49 -03:00

Animation

- special death messages for husk infections

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

BackgroundSprite

Tons of AI + pathfinding bugfixes:

2016-07-08 20:53:11 +03:00

Jobs

Fixed letting go of dragged character when entering/exiting the sub, fixed spawnitems not being visible in the job info window

2016-08-22 16:49:43 +03:00

AICharacter.cs

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

2016-08-30 18:04:49 -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/origin/master'

2016-08-30 18:04:49 -03:00

CharacterHUD.cs

- special death messages for husk infections

2016-08-28 20:22:45 +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

HuskInfection.cs

- special death messages for husk infections

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

Limb.cs

Husk infections, manually attacking when controlling a creature

2016-08-28 16:16:02 +03:00

StatusEffect.cs

Limb attack refactoring (moved attack update logic from EnemyAIController to Limb, removed the Hit/PinchCW/PinchCCW attacktypes)

2016-08-26 20:38:28 +03:00