Update to 1.11.0-RC1

os/emscripten/Dockerfile

@@ -1,4 +1,4 @@
-FROM emscripten/emsdk
+FROM emscripten/emsdk:2.0.10
 
 COPY emsdk-liblzma.patch /
 RUN cd /emsdk/upstream/emscripten && patch -p1 < /emsdk-liblzma.patch

os/emscripten/pre.js

@@ -71,6 +71,34 @@ Module.preRun.push(function() {
          *  add_server("localhost", 3979); */
     }
 
+    var leftButtonDown = false;
+    document.addEventListener("mousedown", e => {
+        if (e.button == 0) {
+            leftButtonDown = true;
+        }
+    });
+    document.addEventListener("mouseup", e => {
+        if (e.button == 0) {
+            leftButtonDown = false;
+        }
+    });
+    window.openttd_open_url = function(url, url_len) {
+        const url_string = UTF8ToString(url, url_len);
+        function openWindow() {
+            document.removeEventListener("mouseup", openWindow);
+            window.open(url_string, '_blank');
+        }
+        /* Trying to open the URL while the mouse is down results in the button getting stuck, so wait for the
+         * mouse to be released before opening it. However, when OpenTTD is lagging, the mouse can get released
+         * before the button click even registers, so check for that, and open the URL immediately if that's the
+         * case. */
+        if (leftButtonDown) {
+            document.addEventListener("mouseup", openWindow);
+        } else {
+            openWindow();
+        }
+    }
+
     /* https://github.com/emscripten-core/emscripten/pull/12995 implements this
     * properly. Till that time, we use a polyfill. */
    SOCKFS.websocket_sock_ops.createPeer_ = SOCKFS.websocket_sock_ops.createPeer;

os/macosx/Info.plist.in

@@ -29,5 +29,7 @@
         <string>Copyright 2004-${CURRENT_YEAR} The OpenTTD team</string>
         <key>NSPrincipalClass</key>
         <string>NSApplication</string>
+        <key>NSHighResolutionCapable</key>
+        <string>True</string>
 </dict>
 </plist>

os/macosx/notarize.sh

@@ -56,3 +56,13 @@ cat <<EOF > notarize.json
 EOF
 
 gon notarize.json
+
+app_filename=(_CPack_Packages/*/Bundle/openttd-*/OpenTTD.app)
+
+if [ "${app_filename}" = "_CPack_Packages/*/Bundle/openttd-*/OpenTTD.app" ]; then
+    echo "No .app found in the _CPack_Packages directory, skipping stapling."
+    exit 0
+fi;
+
+# Now staple the ticket to the .app
+xcrun stapler staple "${app_filename[0]}"

os/steam/release.vdf

@@ -0,0 +1,57 @@
+"AppBuild"
+{
+	"AppID" "1536610"
+	"Desc" "@@DESCRIPTION@@"
+
+	"SetLive" "@@BRANCH@@"
+
+	"ContentRoot" "./"
+	"BuildOutput" "build/"
+
+	"Depots"
+	{
+		"1536613"
+		{
+			"ContentRoot" "./steam-win32"
+			"FileMapping"
+			{
+				"LocalPath" "*"
+				"DepotPath" "."
+				"recursive" "1"
+			}
+		}
+
+		"1536612"
+		{
+			"ContentRoot" "./steam-win64"
+			"FileMapping"
+			{
+				"LocalPath" "*"
+				"DepotPath" "."
+				"recursive" "1"
+			}
+		}
+
+		"1536614"
+		{
+			"ContentRoot" "./steam-macos"
+			"FileMapping"
+			{
+				"LocalPath" "*"
+				"DepotPath" "."
+				"recursive" "1"
+			}
+		}
+
+		"1536615"
+		{
+			"ContentRoot" "./steam-linux"
+			"FileMapping"
+			{
+				"LocalPath" "*"
+				"DepotPath" "."
+				"recursive" "1"
+			}
+		}
+	}
+}