Regalis 095054182e Merge branch 'master' into new-netcode ...

Conflicts:
	Subsurface/Source/GUI/GUITextBlock.cs
	Subsurface/Source/GameMain.cs
	Subsurface/Source/Items/Components/Machines/Radar.cs
	Subsurface/Source/Networking/GameClient.cs

2017-05-17 18:51:22 +03:00

..

BlurEffect.cs

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

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

EditCharacterScreen.cs

Smoothly scrolling listboxes, items in the boxes can be partially visible

2017-04-30 17:57:01 +03:00

EditMapScreen.cs

Merge branch 'master' into new-netcode

2017-05-17 18:51:22 +03:00

GameScreen.cs

Merge branch 'master' into new-netcode

2017-05-01 19:25:07 +03:00

LobbyScreen.cs

Some cleanup (mostly removing redundancies from the GameMain class)

2017-05-03 00:27:13 +03:00

MainMenuScreen.cs

Merge branch 'master' into new-netcode

2017-05-17 18:51:22 +03:00

NetLobbyScreen.cs

- the server log view is not cleared when saving the log (but old messages are removed when going over the max number of lines)

2017-05-08 21:30:54 +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-05-01 19:25:07 +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