Merge branch 'master' into bugfix/clump_atomic_models

Author: FileEX

.github/CODE_OF_CONDUCT.md

@@ -1 +1 @@
-Please refer to the [forum rules](https://forum.mtasa.com/topic/12275-forum-rules/).
+Please refer to the [forum rules](https://forum.multitheftauto.com/topic/12275-forum-rules/).

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -59,7 +59,7 @@ body:
       description: |
         Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
 
-        **Warning!** Do not post any personal information or sensitive logs here. You are responsible for redacting any personal information from the logs. If you need to post sensitive logs, you can use our [private log uploader](https://upload.mtasa.com/) which will only allow MTA staff to access the file, just paste the link to it here.
+        **Warning!** Do not post any personal information or sensitive logs here. You are responsible for redacting any personal information from the logs. If you need to post sensitive logs, you can use our [private log uploader](https://upload.multitheftauto.com/) which will only allow MTA staff to access the file, just paste the link to it here.
       render: shell
   - type: checkboxes
     id: terms

.github/SECURITY.md

@@ -7,7 +7,7 @@ Please submit your security vulnerabilities and cheats to our [private bugtracke
 
 Please do not submit vulnerabilities and cheats publicly, on GitHub or anywhere else.
 
-[private bugtracker]: https://forum.mtasa.com/forum/156-private-bugs/
+[private bugtracker]: https://forum.multitheftauto.com/forum/156-private-bugs/
 
 ## Bug Bounty
 
@@ -16,4 +16,4 @@ We also run a bug bounty programme. Please read
 
 Payment is by PayPal only -- please include your PayPal email when posting on the [private bugtracker].
 
-[bounty]: https://forum.mtasa.com/topic/66858-bounty-for-finding-security-flaws-and-working-cheats-in-mta/
+[bounty]: https://forum.multitheftauto.com/topic/66858-bounty-for-finding-security-flaws-and-working-cheats-in-mta/

.github/workflows/build.yaml

@@ -70,15 +70,10 @@ jobs:
     strategy:
       matrix:
         architecture: [x64, arm64]
-        include:
-        - architecture: x64
-          image-tag: latest
-        - architecture: arm64
-          image-tag: arm64
     name: linux-${{ matrix.architecture }}
     runs-on: ubuntu-latest
     container:
-      image: docker://ghcr.io/multitheftauto/mtasa-blue-build:${{ matrix.image-tag }}
+      image: docker://ghcr.io/multitheftauto/mtasa-blue-build:latest
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/crowdin-auto-merge.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0
+          token: ${{ secrets.POT_CI_PAT }}
 
       - name: Setup Git
         run: |
@@ -28,4 +28,4 @@ jobs:
             git push origin --delete l10n/master
           fi
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.POT_CI_PAT }}

.github/workflows/dockerimage.yaml

@@ -1,31 +1,17 @@
 name: Docker Image
 
 on: 
+  workflow_dispatch:
   push:
     branches:
     - master
     paths: 
     - '.github/workflows/build.yaml'
     - '.github/workflows/dockerimage.yaml'
-    - 'utils/compat/**'
-    - 'Dockerfile'
-    - 'Dockerfile.i386'
-    - 'Dockerfile.armhf'
-    - 'Dockerfile.arm64'
+    - 'utils/docker/**'
 
 jobs:
   build:
-    strategy:
-      matrix:
-        include:
-        - tag: latest
-          dockerfile: Dockerfile
-        - tag: i386
-          dockerfile: Dockerfile.i386
-        - tag: armhf
-          dockerfile: Dockerfile.armhf
-        - tag: arm64
-          dockerfile: Dockerfile.arm64
     if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
@@ -39,5 +25,5 @@ jobs:
     - uses: docker/build-push-action@v5
       with:
         push: true
-        file: ./${{ matrix.dockerfile }}
-        tags: ghcr.io/multitheftauto/mtasa-blue-build:${{ matrix.tag }}
+        context: utils/docker
+        tags: ghcr.io/multitheftauto/mtasa-blue-build:latest

Client/ceflauncher_DLL/CCefApp.h

@@ -19,7 +19,7 @@ class CCefApp : public CefApp, public CefRenderProcessHandler
     CCefApp() {}
     virtual CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() override { return this; };
 
-    // http://magpcss.org/ceforum/apidocs3/projects/(default)/CefRenderProcessHandler.html#OnFocusedNodeChanged(CefRefPtr%3CCefBrowser%3E,CefRefPtr%3CCefFrame%3E,CefRefPtr%3CCefDOMNode%3E)
+    // https://magpcss.org/ceforum/apidocs3/projects/(default)/CefRenderProcessHandler.html#OnFocusedNodeChanged(CefRefPtr%3CCefBrowser%3E,CefRefPtr%3CCefFrame%3E,CefRefPtr%3CCefDOMNode%3E)
     virtual void OnFocusedNodeChanged(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefDOMNode> node) override
     {
         if (m_bHasInputFocus)
@@ -53,7 +53,7 @@ class CCefApp : public CefApp, public CefRenderProcessHandler
         }
     }
 
-    // http://magpcss.org/ceforum/apidocs3/projects/(default)/CefRenderProcessHandler.html#OnContextCreated(CefRefPtr%3CCefBrowser%3E,CefRefPtr%3CCefFrame%3E,CefRefPtr%3CCefV8Context%3E)
+    // https://magpcss.org/ceforum/apidocs3/projects/(default)/CefRenderProcessHandler.html#OnContextCreated(CefRefPtr%3CCefBrowser%3E,CefRefPtr%3CCefFrame%3E,CefRefPtr%3CCefV8Context%3E)
     // //
     virtual void OnContextCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context) override
     {

Client/cefweb/CAjaxResourceHandler.h

@@ -5,7 +5,7 @@
  *  FILE:        core/AjaxResourceHandler.h
  *  PURPOSE:     CEF Handler for Ajax Requests with delayed results
  *
- *  Multi Theft Auto is available from http://www.multitheftauto.com/
+ *  Multi Theft Auto is available from https://www.multitheftauto.com/
  *
  *****************************************************************************/
 #pragma once

Client/cefweb/CWebApp.cpp

@@ -26,6 +26,11 @@ void CWebApp::OnBeforeCommandLineProcessing(const CefString& process_type, CefRe
     if (!pWebCore->GetGPUEnabled())
         command_line->AppendSwitch("disable-gpu");
 
+    // Disable the AutoDeElevate feature to make launching CEF with Admin privileges work.
+    // https://github.com/chromiumembedded/cef/issues/3960
+    // https://chromium-review.googlesource.com/c/chromium/src/+/6515318
+    command_line->AppendSwitch("do-not-de-elevate");
+
     command_line->AppendSwitch("disable-gpu-compositing"); // always disable this, causes issues with official builds
 
     // command_line->AppendSwitch("disable-d3d11");
@@ -46,7 +51,7 @@ CefRefPtr<CefResourceHandler> CWebApp::Create(CefRefPtr<CefBrowser> browser, Cef
 {
     // browser or frame are NULL if the request does not orginate from a browser window
     // This is for exmaple true for the application cache or CEFURLRequests
-    // (http://www.html5rocks.com/en/tutorials/appcache/beginner/)
+    // (https://www.html5rocks.com/en/tutorials/appcache/beginner/)
     if (!browser || !frame)
         return nullptr;
 
@@ -62,7 +67,7 @@ CefRefPtr<CefResourceHandler> CWebApp::Create(CefRefPtr<CefBrowser> browser, Cef
     SString host = UTF16ToMbUTF8(urlParts.host.str);
     if (scheme_name == "http" && host == "mta")
     {
-        // Scheme format: http://mta/resourceName/file.html or http://mta/local/file.html for the current resource
+        // Scheme format: https://mta/resourceName/file.html or https://mta/local/file.html for the current resource
 
         // Get resource name and path
         SString path = UTF16ToMbUTF8(urlParts.path.str).substr(1);            // Remove slash at the front

Client/cefweb/CWebCore.h

@@ -19,7 +19,7 @@
 #include <cef3/cef/include/cef_app.h>
 #define MTA_BROWSERDATA_PATH "mta/cef/browserdata.xml"
 #define BROWSER_LIST_UPDATE_INTERVAL (24*60*60)
-#define BROWSER_UPDATE_URL "http://cef.multitheftauto.com/get.php"
+#define BROWSER_UPDATE_URL "https://cef.multitheftauto.com/get.php"
 #define GetNextSibling(hwnd) GetWindow(hwnd, GW_HWNDNEXT) // Re-define the conflicting macro
 #define GetFirstChild(hwnd) GetTopWindow(hwnd)