Merged linux changes, water effect using a BasicEffect and a simpler pixel shader, multi-colored wires

2015-09-08 21:55:27 +03:00
parent 7eae6fb026
commit ea15397725
18 changed files with 221 additions and 197 deletions
--- a/Subsurface/Source/Networking/GameServer.cs
+++ b/Subsurface/Source/Networking/GameServer.cs
@@ -571,7 +571,6 @@ namespace Subsurface.Networking
                client.characterInfo.Job = new Job(client.assignedJob);
            }

-            //todo: fix
            if (characterInfo != null)
            {
                characterInfo.Job = new Job(Game1.NetLobbyScreen.JobPreferences[0]);