Regalis 31f7eca717 Merge branch 'master' into new-netcode ...

Conflicts:
	Subsurface/Source/GUI/GUIButton.cs
	Subsurface/Source/GameSession/CrewManager.cs
	Subsurface/Source/GameSession/GameSession.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Screens/MainMenuScreen.cs
	Subsurface/Source/Screens/ServerListScreen.cs

2017-04-23 21:40:11 +03:00

..

BlurEffect.cs

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

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

EditCharacterScreen.cs

GUIStyle logic changes: instead of having a predetermined GUIComponentStyle for each type of GUIComponent, any GUIComponent can use any style. The GUIComponent constructors take the name of the style as a parameter, and if no style is specified, the default style for the GUIComponent in question will be used.

2017-04-08 16:46:53 +03:00

EditMapScreen.cs

Merge branch 'master' into new-netcode

2017-04-23 21:40:11 +03:00

GameScreen.cs

Merge branch 'master' into new-netcode

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

LobbyScreen.cs

UI layout tweaks

2017-04-20 17:39:32 +03:00

MainMenuScreen.cs

Merge branch 'master' into new-netcode

2017-04-23 21:40:11 +03:00

NetLobbyScreen.cs

Merge branch 'master' into new-netcode

2017-04-23 21:40:11 +03: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-04-23 21:40:11 +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