LuaCsForBarotraumaEP

Files

Regalis adde3461ea Merge branch 'master' into new-netcode

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/Items/Components/Door.cs
	Subsurface/Source/Items/Components/Power/PowerContainer.cs
	Subsurface/Source/Items/Components/Signal/Wire.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/ChatMessage.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs
	Subsurface/Source/Networking/GameServerSettings.cs
	Subsurface/Source/Networking/NetworkMember.cs

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

BlurEffect.cs

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

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

EditCharacterScreen.cs

Cleanup with resharper (mostly removing redundancies & using collection.Length/Count properties instead of the Count method)

2016-10-31 20:50:20 +02:00

EditMapScreen.cs

Merge branch 'master' into new-netcode

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

GameScreen.cs

Merge branch 'master' into new-netcode