Regalis 1f07b18e5b Merge branch 'master' into new-netcode ...

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Items/Components/DockingPort.cs
	Subsurface/Source/Items/Components/Signal/Wire.cs
	Subsurface/Source/Items/Item.cs

2016-12-29 22:18:27 +02:00

..

AI

Merge branch 'master' into new-netcode

2016-11-24 19:52:40 +02:00

Animation

Merge branch 'master' into new-netcode

2016-12-29 22:18:27 +02: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 'barotrauma/master' into new-netcode

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

AICharacter.cs

Merge branch 'master' into new-netcode

2016-12-29 22:18:27 +02:00

Attack.cs

- special death messages for husk infections

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

Character.cs

Merge branch 'master' into new-netcode

2016-12-29 22:18:27 +02:00

CharacterHUD.cs

Merge branch 'master' into new-netcode

2016-12-29 22:18:27 +02:00

CharacterInfo.cs

Removed case check from CharacterInfo because it corrects itself

2016-11-10 21:58:35 -03:00

CharacterSound.cs

Bunch of new sounds by Omniary, some charactersound & soundplayer refactoring

2016-12-15 21:42:15 +02: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

Fixed exception when trying to remove a limb with no sprite

2016-12-20 16:10:47 +02:00

StatusEffect.cs

Item/statuseffect optimization:

2016-11-08 21:14:29 +02:00