juanjp600 02d98f5d29 Merge remote-tracking branch 'refs/remotes/barotrauma/master' ...

Conflicts:
	Subsurface/Source/Networking/FileStreamReceiver.cs
	Subsurface/Source/Networking/FileStreamSender.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs
	Subsurface/Source/Networking/NetworkEvent.cs
	Subsurface/Source/Screens/NetLobbyScreen.cs

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

..

AI

Made game compilable

2016-08-30 21:13:36 -03:00

Animation

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

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

BackgroundSprite

BackgroundCreatureManager and BackgroundSpriteManager can be overridden via Content packages

2016-09-03 18:05:26 +02: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/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/barotrauma/master'

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

CharacterHUD.cs

Completely destroyed game

2016-08-30 19:59:14 -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

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

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

Limb.cs

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

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

StatusEffect.cs

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

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