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

..

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

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

GameScreen.cs

Merge branch 'master' into new-netcode

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

LobbyScreen.cs

SharpFont + ScalableFont implementation

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

MainMenuScreen.cs

Merge branch 'master' into new-netcode

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

NetLobbyScreen.cs

Merge branch 'master' into new-netcode

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

Screen.cs

- sub editor shows a warning upon saving if there are entities way outside the sub

2017-02-24 00:01:46 +02:00

ServerListScreen.cs

Merge branch 'master' into new-netcode

2017-03-11 13:24:09 +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