juanjp600 6f25bee9e1 Merge remote-tracking branch 'refs/remotes/barotrauma/master' ...

Conflicts:
	.vs/Subsurface_Solution/v14/.suo
	Subsurface/Barotrauma.csproj
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Items/ItemSpawner.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs

2016-09-03 17:54:33 -03:00

..

BlurEffect.cs

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

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

EditCharacterScreen.cs

Supercapacitors have much higher max output but smaller capacity, fixed not being able to drag wire nodes in editor, batteries working properly now

2016-02-07 12:32:19 +02:00

EditMapScreen.cs

Made game compilable

2016-08-30 21:13:36 -03:00

GameScreen.cs

BackgroundCreatureManager and BackgroundSpriteManager can be overridden via Content packages

2016-09-03 18:05:26 +02:00

LobbyScreen.cs

Some cleanup using ReSharper (mostly removing redundancies)

2016-03-12 15:32:34 +02:00

MainMenuScreen.cs

Dockingport power wire is connected to a free wire slot instead of the last slot, submarines above the top of the level (i.e. respawn shuttle) aren't shown on sonar, underwater scooter for each respawned player

2016-08-13 21:35:52 +03:00

NetLobbyScreen.cs

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

2016-09-03 17:54:33 -03:00

NetLobbyVoting.cs

More netcode cleanup

2016-08-30 21:35:05 -03:00

Screen.cs

Option to set a duration for a status effect

2016-03-26 23:20:02 +02:00

ServerListScreen.cs

Added login process to client

2016-09-01 11:42:21 -03: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