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

..

BlurEffect.cs

- resetting the "blood overlay" when switching the controlled character

2016-05-26 18:03:08 +03:00

EditCharacterScreen.cs

Limbs with no sprite don't cause the game to crash anymore, lightsources attached to a limb are drawn at the interpolated position (= DrawPosition) of the limb, lightTexture origin is flipped on the X-axis when parent limb flips

2016-12-17 14:24:54 +02:00

EditMapScreen.cs

Merge branch 'master' into new-netcode

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

GameScreen.cs

Merge branch 'master' into new-netcode

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

LobbyScreen.cs

GUI elements now respect render order + some minor distance comparison optimization

2016-11-15 22:26:36 -03:00

MainMenuScreen.cs

Merge branch 'master' into new-netcode

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

NetLobbyScreen.cs

Merge branch 'master' into new-netcode

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

NetLobbyVoting.cs

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

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

Screen.cs

GUI elements now respect render order + some minor distance comparison optimization

2016-11-15 22:26:36 -03:00

ServerListScreen.cs

Merge branch 'master' into new-netcode

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

sygwkgy0.iv5

Infinite wall fixes, pressure damage to sub, sub/mode voting & randomization working now, better ui scaling

2015-10-31 00:29:51 +02:00