Release 3734 (FAForever#3801)

apollodeathstar · Apr 22, 2022 · 16f295d · 16f295d
1 parent 9db625d
commit 16f295d
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 4 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,14 @@
+Game version 3734 (22nd of April, 2022)
+===================================
+
+### Bug fixes
+
+ - Fix (another) missing parameter in matchmaking (#3801) 
+
+### Contributors
+
+ - Jip (#3801)
+
 Game version 3733 (22nd of April, 2022)
 ===================================
 

diff --git a/lua/ui/lobby/autolobby-classes.lua b/lua/ui/lobby/autolobby-classes.lua
@@ -85,7 +85,7 @@ ConnectionStatus = Class(Group) {
             if self.ConnectedPlayersCount == 1 then 
                 connectionsText = LOCF('<LOC AutoLobbyConnectionsTextSingular>%s / %s is connected', tostring(self.ConnectedPlayersCount), tostring(self.TotalPlayersCount))
             else 
-                connectionsText = LOCF('<LOC AutoLobbyConnectionsTextPlural>%s / %s are connected', tostring(self.ConnectedPlayersCount))
+                connectionsText = LOCF('<LOC AutoLobbyConnectionsTextPlural>%s / %s are connected', tostring(self.ConnectedPlayersCount), tostring(self.TotalPlayersCount))
             end
         end
 

diff --git a/lua/ui/lobby/autolobby.lua b/lua/ui/lobby/autolobby.lua
@@ -253,6 +253,7 @@ local function CreateUI()
     -- construct the connection status GUI and position it right below the dialog
     connectionStatusGUI = ConnectionStatus(GetFrame(0))
     LayoutHelpers.CenteredBelow(connectionStatusGUI, currentDialog, 20)
+    LayoutHelpers.DepthOverParent(connectionStatusGUI, background, 1)
 end
 
 

diff --git a/lua/ui/lobby/changelogData.lua b/lua/ui/lobby/changelogData.lua
@@ -1,5 +1,20 @@
 last_version = 3732
 gamePatches = {
+    {
+        version = 3732, -- purposefully set to 3732, so that it shows on top of game version 3732. Should be fixed in next release
+        name = "Game version 3734",
+        description = {
+            "",
+            "### Bug fixes",
+            "",
+            " - Fix (another) missing parameter in matchmaking (#3801) ",
+            "",
+            "### Contributors",
+            "",
+            " - Jip (#3801)",
+        },
+    },
+
     {
         version = 3732, -- purposefully set to 3732, so that it shows on top of game version 3732. Should be fixed in next release
         name = "Game version 3733",

diff --git a/lua/version.lua b/lua/version.lua
@@ -1,4 +1,4 @@
-local Version = '3733'
+local Version = '3734'
 function GetVersion()
     LOG('Supreme Commander: Forged Alliance version ' .. Version)
     return Version

diff --git a/mod_info.lua b/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 = 3733
+version = 3734
 _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!"

diff --git a/scripts/release-faf-develop.sh b/scripts/release-faf-develop.sh
@@ -2,17 +2,25 @@
 git checkout faforever/deploy/fafdevelop 
 git pull faforever deploy/fafdevelop 
 
+read
+
 git checkout faforever/develop
 git pull faforever develop 
 git pull faforever deploy/fafdevelop --rebase
 git push faforever HEAD:develop 
 
+read
+
 git checkout faforever/master 
 git pull faforever master 
 git pull faforever develop --rebase
 git push faforever HEAD:master
 
+read
+
 git checkout faforever/deploy/faf 
 git pull faforever deploy/faf  
 git pull faforever master --rebase
-git push faforever HEAD:deploy/faf
+git push faforever HEAD:deploy/faf
+
+read