Regalis 5bdb57b98a Merge branch 'master' into new-netcode ...

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/AICharacter.cs
	Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/GameMain.cs
	Subsurface/Source/Items/Components/Signal/Connection.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs
	Subsurface/Source/Physics/PhysicsBody.cs

2017-03-11 13:24:09 +02:00

..

AI

Merge branch 'master' into new-netcode

2017-03-11 13:24:09 +02:00

Animation

Merge branch 'master' into new-netcode

2017-03-11 13:24:09 +02:00

BackgroundSprite

Added z position to background sprites

2017-03-06 18:38:38 +02:00

Jobs

Merge remote-tracking branch 'barotrauma/master' into new-netcode

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

AICharacter.cs

Monster syncing fixes:

2017-03-01 23:14:15 +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

2017-03-11 13:24:09 +02:00

CharacterHUD.cs

Merge branch 'master' into new-netcode

2017-02-13 22:04:28 +02:00

CharacterInfo.cs

SharpFont + ScalableFont implementation

2017-03-07 13:44:42 -03:00

CharacterNetworking.cs

Vastly improved item syncing + Crouch syncing

2017-03-09 20:18:19 -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

Merge branch 'master' into new-netcode

2017-01-25 20:30:26 +02: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