Regalis 62dd055e8d Merge branch 'master' into animcontroller-overhaul ...

Conflicts:
	Subsurface/Content/Characters/Crawler/crawler.xml
	Subsurface/Source/Characters/AICharacter.cs
	Subsurface/Source/Characters/Animation/FishAnimController.cs
	Subsurface/Source/Characters/Animation/Ragdoll.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/Map/Submarine.cs
	Subsurface/Source/Map/SubmarineBody.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Physics/PhysicsBody.cs

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

..

AI

Backported animcontroller-overhaul

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

Animation

Merge branch 'master' into animcontroller-overhaul

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

BackgroundSprite

Fixed monster/artifact events being out of sync between the server and the clients

2016-10-25 18:58:56 +03:00

Jobs

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

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

AICharacter.cs

Submarine position is synced using the same logic as the characters, AICharacter position syncing

2016-10-25 19:01:19 +03:00

Attack.cs

- special death messages for husk infections

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

Character.cs

Merge branch 'master' into animcontroller-overhaul

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

CharacterHUD.cs

Merge branch 'master' into animcontroller-overhaul

2016-10-19 21:15:44 +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

Changed ItemSpawner to EntitySpawner, used for syncing both item and character spawning

2016-10-12 19:25:01 +03:00

Limb.cs

Backported animcontroller-overhaul

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

StatusEffect.cs

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

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