Merge remote-tracking branch 'upstream/master' into develop

Barotrauma/BarotraumaShared/SharedSource/Networking/NetworkMember.cs

@@ -12,15 +12,18 @@ namespace Barotrauma.Networking
         UPDATE_INGAME,  //update state ingame
 
         SERVER_SETTINGS, //change server settings
-        
+        SERVER_SETTINGS_PERKS, //change disembark perks (has different permissions from the rest of server settings)
+
         CAMPAIGN_SETUP_INFO,
 
         FILE_REQUEST,   //request a (submarine) file from the server
 
         VOICE,
-        
+
         PING_RESPONSE,
 
+        RESPONSE_CANCEL_STARTGAME, //tell the server you do not wish to start with the given warnings active
+
         RESPONSE_STARTGAME, //tell the server whether you're ready to start
         SERVER_COMMAND,     //tell the server to end a round or kick/ban someone (special permissions required)
 
@@ -38,8 +41,10 @@ namespace Barotrauma.Networking
         RESET_REWARD_DISTRIBUTION,
         CIRCUITBOX,
         READY_CHECK,
-        READY_TO_SPAWN,        
+        READY_TO_SPAWN,
         TAKEOVERBOT,
+
+        REQUEST_BACKUP_INDICES, // client wants a list of available backups for a save file
         LUA_NET_MESSAGE
     }
 
@@ -82,6 +87,8 @@ namespace Barotrauma.Networking
         CLIENT_PINGS,       //tell the client the pings of all other clients
 
         QUERY_STARTGAME,    //ask the clients whether they're ready to start
+        WARN_STARTGAME,     //round is about to start with invalid (perk) settings, warn the clients before starting
+        CANCEL_STARTGAME,   //someone requested the round start to be cancelled due to invalid settings, tell the other clients
         STARTGAME,          //start a new round
         STARTGAMEFINALIZE,  //finalize round initialization
         ENDGAME,
@@ -94,7 +101,7 @@ namespace Barotrauma.Networking
         CIRCUITBOX,
         MONEY,
         READY_CHECK,        //start, end and update a ready check
-        
+        SEND_BACKUP_INDICES, // the server sends a list of available backups for a save file
         LUA_NET_MESSAGE
     }
     enum ServerNetSegment