Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2025-04-10 10:37:09 -03:00
parent fdfc3a77f3 38cce0c933
commit 103871a4e9
296 changed files with 8420 additions and 2945 deletions
@@ -27,6 +27,8 @@ namespace Barotrauma.Networking
        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)

+        ENDROUND_SELF, //the client wants to end the round for themselves only and return to the lobby
+
        EVENTMANAGER_RESPONSE,

        REQUEST_STARTGAMEFINALIZE, //tell the server you're ready to finalize round initialization
@@ -43,6 +45,7 @@ namespace Barotrauma.Networking
        READY_CHECK,
        READY_TO_SPAWN,
        TAKEOVERBOT,
+        TOGGLE_RESERVE_BENCH,

        REQUEST_BACKUP_INDICES, // client wants a list of available backups for a save file
        LUA_NET_MESSAGE