juanjp600 02d98f5d29 Merge remote-tracking branch 'refs/remotes/barotrauma/master' ...

Conflicts:
	Subsurface/Source/Networking/FileStreamReceiver.cs
	Subsurface/Source/Networking/FileStreamSender.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs
	Subsurface/Source/Networking/NetworkEvent.cs
	Subsurface/Source/Screens/NetLobbyScreen.cs

2016-09-24 21:28:37 -03:00

..

Ruins

Replace '' (two single quotes) with \" (double quote)

2016-09-24 21:26:08 -03:00

CaveGenerator.cs

v0.4.1.3:

2016-05-27 14:41:34 +03:00

Level.cs

v5.1.3: the upper border of the level is one continuous body instead of two separate bodies at the entrance and exit

2016-09-07 15:18:01 +03:00

LevelRenderer.cs

v5.1.3: the upper border of the level is one continuous body instead of two separate bodies at the entrance and exit

2016-09-07 15:18:01 +03:00

Voronoi.cs

- level generation refactoring: moved most of the generation logic to a static GaveGenerator class + some minor cleanup

2016-04-02 16:03:41 +03:00

VoronoiElements.cs

Replace '' (two single quotes) with \" (double quote)

2016-09-24 21:26:08 -03:00

WaterRenderer.cs

Added option to toggle vsync

2016-09-18 18:24:50 -03:00

WrappingWall.cs

- level generation refactoring: moved most of the generation logic to a static GaveGenerator class + some minor cleanup

2016-04-02 16:03:41 +03:00