Changelog 3752 (#4736)

changelog-dev.md

@@ -26,13 +26,13 @@ Jip
 - (#4474) Ground attack now ignores all props/units
     You can now assign a ground attack exactly where you clicked without it accidentally snapping to props or units
 
-- (3e34599) Prevent being able to issue 'empty' reclaim orders
+- (3dd620c) Prevent being able to issue 'empty' reclaim orders
     It is now impossible to create a reclaim order with no prop or unit attached to it
 
 - (#4474) Move command mode no longer creates patrol orders by accident
     When you specifically issue move commands using the hotkey (usually 'm') or by clicking on the move command button it now ignores the 'convert to patrol' functionality
 
-- (3e34599) Remove the use of CTRL to issue commands with formations
+- (3dd620c) Remove the use of CTRL to issue commands with formations
     When you hold control units first move towards each other and create a formation before they would go to where you told them to. This is a hidden feature of the engine and often players were not aware. We patched this out because often people use the same key for hotkeys, after which players (usually accidentally) would issue a formation order instead of a regular move or attack move order
 
 - (#4510) Add a game option to set the zoom threshold at which reclaim values are grouped together in the reclaim-overlay
@@ -209,7 +209,7 @@ We've been consistently improving the performance of the game by re-implementing
 - (#4451) Reduce overhead of passing regeneration values to UI
     These values are no longer passed via the sync, but attached to the state of the unit instead
 
-- (#4466, #4492, #4597, 3e34599, 9c9dda3) Reduce traffic between the sim and the UI layers
+- (#4466, #4492, #4597, 3dd620c, 9c9dda3) Reduce traffic between the sim and the UI layers
     Every bit of data we send to the UI is (deep) copied and usually thrown away afterwards. This involves a lot of memory management and that is the most expensive type of logic that a computer can run these days.
 
 - (#4517, #4534, #4532, #4533, #4531, #4528, #4529, #4530, #4582, #4552, #4585, #4549, #4596, #4611)
@@ -299,6 +299,8 @@ If you have that interest and/or experience and you'd like to help out then you
 
 - (#4731) Fix the auto balance button in the lobby being too large
 
+- (3e34599) Remove logging of console commands
+
 ## Mod incompatibility
 
 There appears to be an issue with the UI mod 'Supreme Economy v2.3'. We've notified the maintainer.

changelog.md

@@ -1,6 +1,19 @@
 
 Some sections of the changelog are available in other languages such as [French](changelog-fr.md) or [Russian](changelog-ru.md)
 
+# Game version 3752 (25th of February, 2022)
+
+See the patch notes of 3751 for the full patch notes.
+
+## Bug fixes
+
+- (#4736) Attempt at fixing the autolobby options missmatch
+
+## Contributors
+
+- Jip (#4736)
+- Sheikah (#4736)
+
 # Game version 3751 (25th of February, 2022)
 
 In this first development update of 2023, we introduce three month's work of bugfixes, quality of life changes, and assorted improvements. It is, by far, the most exciting patch we've released so far. While the full changes are detailed below, a quick summary of those changes we think you'll find most important:
@@ -29,14 +42,14 @@ Jip
 - (#4474) Ground attack now ignores all props/units
     You can now assign a ground attack exactly where you clicked without it accidentally snapping to props or units
 
-- (3e34599) Prevent being able to issue 'empty' reclaim orders
+- (3dd620c) Prevent being able to issue 'empty' reclaim orders
     It is now impossible to create a reclaim order with no prop or unit attached to it
 
 - (#4474) Move command mode no longer creates patrol orders by accident
     When you specifically issue move commands using the hotkey (usually 'm') or by clicking on the move command button it now ignores the 'convert to patrol' functionality
 
-- (3e34599) Remove the use of CTRL to issue commands with formations
-    When you hold control units first move towards each other and create a formation before they would go to where you told them to. This is a hidden feature of the engine and often players were not aware. We patched this out because often people use the same key for hotkeys, after which players (usually accidentally) would issue a formation order instead of a regular move or attack move order
+- (3dd620c) Remove the use of CTRL to issue commands with formations
+    When you hold control units first move towards each other and create a formation before they would go to where you told them to. This is a hidden feature of the engine and often players were not aware. We patched this out because often people use the same key for hotkeys, after which players (usually accidentally) would issue a formation order instead of a regular move or attack move order. You can still create formation orders by holding the right mouse button
 
 - (#4510) Add a game option to set the zoom threshold at which reclaim values are grouped together in the reclaim-overlay
 
@@ -212,7 +225,7 @@ We've been consistently improving the performance of the game by re-implementing
 - (#4451) Reduce overhead of passing regeneration values to UI
     These values are no longer passed via the sync, but attached to the state of the unit instead
 
-- (#4466, #4492, #4597, 3e34599, 9c9dda3) Reduce traffic between the sim and the UI layers
+- (#4466, #4492, #4597, 3dd620c, 9c9dda3) Reduce traffic between the sim and the UI layers
     Every bit of data we send to the UI is (deep) copied and usually thrown away afterwards. This involves a lot of memory management and that is the most expensive type of logic that a computer can run these days.
 
 - (#4517, #4534, #4532, #4533, #4531, #4528, #4529, #4530, #4582, #4552, #4585, #4549, #4596, #4611)
@@ -302,6 +315,8 @@ If you have that interest and/or experience and you'd like to help out then you
 
 - (#4731) Fix the auto balance button in the lobby being too large
 
+- (3e34599) Remove logging of console commands
+
 ## Mod incompatibility
 
 There appears to be an issue with the UI mod 'Supreme Economy v2.3'. We've notified the maintainer.

lua/ui/game/reclaim.lua

@@ -14,7 +14,6 @@ local MathMax = math.max
 local MathMin = math.min
 local TableGetn = table.getn
 
-
 ---@class UIReclaimDataPoint
 ---@field mass number
 ---@field position Vector

lua/ui/lobby/autolobby.lua

@@ -304,7 +304,7 @@ local function InitLobbyComm(protocol, localPort, desiredPlayerName, localPlayer
     end
 
     lobbyComm.DataReceived = function(self, data)
-        LOG('DATA RECEIVED: ', repr(data))
+        LOG('DATA RECEIVED: ', reprsl(data))
 
         if data.Type == 'LaunchStatus' then
             peerLaunchStatuses[data.SenderID] = data.Status
@@ -319,15 +319,26 @@ local function InitLobbyComm(protocol, localPort, desiredPlayerName, localPlayer
         else
             --  Non-Host Messages
             if data.Type == 'Launch' then
-                LOG(repr(data.GameInfo))
+                -- The client compares the game options with those of the host. They both look like the local 'gameInfo' as defined 
+                -- above, but the host adds these fields upon launch (see: CheckForLaunch) so that we can display them on the scoreboard. 
+                -- A client won't have this information attached, and therefore we remove it manually here
                 local hostOptions = table.copy(data.GameInfo.GameOptions)
-                -- The host options contain some extra data that we don't care about
                 hostOptions['Ratings'] = nil
                 hostOptions['ScenarioFile'] = nil
+                hostOptions['Divisions'] = nil
+
                 -- This is a sanity check so we don't accidentally launch games
                 -- with the wrong game settings because the host is using a
                 -- client that doesn't support game options for matchmaker.
                 if not table.equal(gameInfo.GameOptions, hostOptions) then
+                    WARN("Game options missmatch!")
+
+                    LOG("Client settings: ")
+                    reprsl(gameInfo.GameOptions)
+
+                    LOG("Host settings: ")
+                    reprsl(hostOptions)
+
                     SetDialog(parent, Strings.LaunchRejected, "<LOC _Exit>", CleanupAndExit)
 
                     self:BroadcastData({ Type = 'LaunchStatus', Status = 'Rejected' })

lua/ui/lobby/changelogData.lua

@@ -1,4 +1,4 @@
-last_version = 3751
+last_version = 3752
 
 ---@alias PatchNotesType "Hotfix"|"Developers patch"|"Balance patch"
 
@@ -12,6 +12,24 @@ last_version = 3751
 
 ---@type PatchNotes[]
 gamePatches = {
+    {
+        version = 3752,
+        name = "Hotfix",
+        description = {
+            "# Game version 3752 (25th of February, 2022)",
+            "",
+            "See the patch notes of 3751 for the full patch notes.",
+            "",
+            "## Bug fixes",
+            "",
+            "- (#4736) Attempt at fixing the autolobby options missmatch",
+            "",
+            "## Contributors",
+            "",
+            "- Jip (#4736)",
+            "- Sheikah (#4736)",
+        }
+    },
     {
         version = 3751,
         name = "Developers patch",
@@ -66,6 +84,7 @@ gamePatches = {
             "    When you hold control units first move towards each other and create a formation before they would go to where you told them to. ",
             "    This is a hidden feature of the engine and often players were not aware. We patched this out because often people use the same key ",
             "    for hotkeys, after which players (usually accidentally) would issue a formation order instead of a regular move or attack move order",
+            "    You can still create formation orders by holding the right mouse button",
             "",
             "- (#4510) Add a game option to set the zoom threshold at which reclaim values are grouped together in the reclaim-overlay",
             "",

lua/version.lua

@@ -1,6 +1,6 @@
-local Version = "3751"
----@alias PATCH "3751"
----@alias VERSION "1.5.3751"
+local Version = "3752"
+---@alias PATCH "3752"
+---@alias VERSION "1.5.3752"
 ---@return PATCH
 function GetVersion()
     LOG('Supreme Commander: Forged Alliance version ' .. Version)

mod_info.lua

@@ -3,7 +3,7 @@
 -- Documentation for the extended FAF mod_info.lua format can be found here:
 -- https://github.com/FAForever/fa/wiki/mod_info.lua-documentation
 name = "Forged Alliance Forever"
-version = 3751
+version = 3752
 _faf_modname='faf'
 copyright = "Forged Alliance Forever Community"
 description = "Forged Alliance Forever extends Forged Alliance, bringing new patches, game modes, units, ladder, and much more!"

scripts/release-faf-develop.sh

@@ -1,4 +1,11 @@
 
+# Checklist before doing a release:
+
+echo "Press enter if the executable is set to release, if required"
+read
+
+# Doing the release
+
 git checkout faforever/deploy/fafdevelop 
 git pull faforever deploy/fafdevelop