Skip to content

Commit 5b2c166

Browse files
authored
Merge branch 'master' into refactor/interfaces_cleanup_3dMarker
2 parents 7079e19 + be0307f commit 5b2c166

File tree

5,774 files changed

+910565
-155972
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

5,774 files changed

+910565
-155972
lines changed

.github/CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Please refer to the [forum rules](https://forum.mtasa.com/topic/12275-forum-rules/).
1+
Please refer to the [forum rules](https://forum.multitheftauto.com/topic/12275-forum-rules/).

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ body:
5959
description: |
6060
Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
6161
62-
**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.
62+
**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.
6363
render: shell
6464
- type: checkboxes
6565
id: terms

.github/SECURITY.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Please submit your security vulnerabilities and cheats to our [private bugtracke
77

88
Please do not submit vulnerabilities and cheats publicly, on GitHub or anywhere else.
99

10-
[private bugtracker]: https://forum.mtasa.com/forum/156-private-bugs/
10+
[private bugtracker]: https://forum.multitheftauto.com/forum/156-private-bugs/
1111

1212
## Bug Bounty
1313

@@ -16,4 +16,4 @@ We also run a bug bounty programme. Please read
1616

1717
Payment is by PayPal only -- please include your PayPal email when posting on the [private bugtracker].
1818

19-
[bounty]: https://forum.mtasa.com/topic/66858-bounty-for-finding-security-flaws-and-working-cheats-in-mta/
19+
[bounty]: https://forum.multitheftauto.com/topic/66858-bounty-for-finding-security-flaws-and-working-cheats-in-mta/

.github/workflows/build.yaml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
macOS:
5454
name: macOS
55-
runs-on: macOS-13
55+
runs-on: macOS-15
5656
steps:
5757
- uses: actions/checkout@v4
5858

@@ -64,23 +64,18 @@ jobs:
6464
run: brew link --overwrite mysql
6565

6666
- name: Run Build
67-
run: ./linux-build.sh --os=macosx
67+
run: ./linux-build.sh
6868

6969
linux:
7070
strategy:
7171
matrix:
7272
architecture: [x64, arm64]
73-
include:
74-
- architecture: x64
75-
image-tag: latest
76-
- architecture: arm64
77-
image-tag: arm64
7873
name: linux-${{ matrix.architecture }}
7974
runs-on: ubuntu-latest
8075
container:
81-
image: docker://ghcr.io/multitheftauto/mtasa-blue-build:${{ matrix.image-tag }}
76+
image: docker://ghcr.io/multitheftauto/mtasa-blue-build:latest
8277
steps:
8378
- uses: actions/checkout@v4
8479

8580
- name: Run Build
86-
run: ./linux-build.sh --arch=${{ matrix.architecture }}
81+
run: /docker-entrypoint.sh --arch=${{ matrix.architecture }}

.github/workflows/codeql.yml

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL Advanced"
13+
14+
on:
15+
push:
16+
branches: [ "master" ]
17+
pull_request:
18+
branches: [ "master" ]
19+
schedule:
20+
- cron: '19 17 * * 3'
21+
22+
jobs:
23+
analyze:
24+
name: Analyze (${{ matrix.language }})
25+
# Runner size impacts CodeQL analysis time. To learn more, please see:
26+
# - https://gh.io/recommended-hardware-resources-for-running-codeql
27+
# - https://gh.io/supported-runners-and-hardware-resources
28+
# - https://gh.io/using-larger-runners (GitHub.com only)
29+
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
30+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'windows-2025' }}
31+
permissions:
32+
# required for all workflows
33+
security-events: write
34+
35+
# required to fetch internal or private CodeQL packs
36+
packages: read
37+
38+
# only required for workflows in private repositories
39+
actions: read
40+
contents: read
41+
42+
strategy:
43+
fail-fast: false
44+
matrix:
45+
include:
46+
- language: c-cpp
47+
build-mode: none
48+
# CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift'
49+
# Use `c-cpp` to analyze code written in C, C++ or both
50+
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
51+
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
52+
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
53+
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
54+
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
55+
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
56+
steps:
57+
- name: Checkout repository
58+
uses: actions/checkout@v4
59+
60+
# Add any setup steps before running the `github/codeql-action/init` action.
61+
# This includes steps like installing compilers or runtimes (`actions/setup-node`
62+
# or others). This is typically only required for manual builds.
63+
# - name: Setup runtime (example)
64+
# uses: actions/setup-example@v1
65+
66+
# Initializes the CodeQL tools for scanning.
67+
- name: Initialize CodeQL
68+
uses: github/codeql-action/init@v3
69+
with:
70+
languages: ${{ matrix.language }}
71+
build-mode: ${{ matrix.build-mode }}
72+
# If you wish to specify custom queries, you can do so here or in a config file.
73+
# By default, queries listed here will override any specified in a config file.
74+
# Prefix the list here with "+" to use these queries and those in the config file.
75+
76+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
77+
# queries: security-extended,security-and-quality
78+
79+
# If the analyze step fails for one of the languages you are analyzing with
80+
# "We were unable to automatically build your code", modify the matrix above
81+
# to set the build mode to "manual" for that language. Then modify this step
82+
# to build your code.
83+
# ℹ️ Command-line programs to run using the OS shell.
84+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
85+
- if: matrix.build-mode == 'manual'
86+
shell: bash
87+
run: |
88+
echo 'If you are using a "manual" build mode for one or more of the' \
89+
'languages you are analyzing, replace this with the commands to build' \
90+
'your code, for example:'
91+
echo ' make bootstrap'
92+
echo ' make release'
93+
exit 1
94+
95+
- name: Perform CodeQL Analysis
96+
uses: github/codeql-action/analyze@v3
97+
with:
98+
category: "/language:${{matrix.language}}"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Checkout code
1414
uses: actions/checkout@v4
1515
with:
16-
fetch-depth: 0
16+
token: ${{ secrets.POT_CI_PAT }}
1717

1818
- name: Setup Git
1919
run: |
@@ -28,4 +28,4 @@ jobs:
2828
git push origin --delete l10n/master
2929
fi
3030
env:
31-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31+
GITHUB_TOKEN: ${{ secrets.POT_CI_PAT }}

.github/workflows/dockerimage.yaml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,17 @@
11
name: Docker Image
22

33
on:
4+
workflow_dispatch:
45
push:
56
branches:
67
- master
78
paths:
89
- '.github/workflows/build.yaml'
910
- '.github/workflows/dockerimage.yaml'
10-
- 'utils/compat/**'
11-
- 'Dockerfile'
12-
- 'Dockerfile.i386'
13-
- 'Dockerfile.armhf'
14-
- 'Dockerfile.arm64'
11+
- 'utils/docker/**'
1512

1613
jobs:
1714
build:
18-
strategy:
19-
matrix:
20-
include:
21-
- tag: latest
22-
dockerfile: Dockerfile
23-
- tag: i386
24-
dockerfile: Dockerfile.i386
25-
- tag: armhf
26-
dockerfile: Dockerfile.armhf
27-
- tag: arm64
28-
dockerfile: Dockerfile.arm64
2915
if: github.event.repository.fork == false
3016
runs-on: ubuntu-latest
3117
steps:
@@ -39,5 +25,5 @@ jobs:
3925
- uses: docker/build-push-action@v5
4026
with:
4127
push: true
42-
file: ./${{ matrix.dockerfile }}
43-
tags: ghcr.io/multitheftauto/mtasa-blue-build:${{ matrix.tag }}
28+
context: utils/docker
29+
tags: ghcr.io/multitheftauto/mtasa-blue-build:latest
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:v3="urn:schemas-microsoft-com:asm.v3">
3+
<assemblyIdentity type="win32" version="1.0.0.0" processorArchitecture="*" name="CEFLauncher" />
4+
5+
<v3:application>
6+
<windowsSettings>
7+
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">True/PM</dpiAware>
8+
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
9+
</windowsSettings>
10+
</v3:application>
11+
12+
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
13+
<application>
14+
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /> <!-- Windows 10 and Windows 11 -->
15+
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" /> <!-- Windows 8.1 -->
16+
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" /> <!-- Windows 8 -->
17+
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /> <!-- Windows 7 -->
18+
</application>
19+
</compatibility>
20+
21+
<dependency optional="yes">
22+
<dependentAssembly>
23+
<!-- Automatically use ComCtl32.dll version 6 or later. -->
24+
<assemblyIdentity
25+
type="win32"
26+
name="Microsoft.Windows.Common-Controls"
27+
version="6.0.0.0"
28+
processorArchitecture="*"
29+
publicKeyToken="6595b64144ccf1df"
30+
language="*" />
31+
</dependentAssembly>
32+
</dependency>
33+
</assembly>

Client/ceflauncher/premake5.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ project "CEFLauncher"
99
vpaths {
1010
["Headers/*"] = "**.h",
1111
["Sources/*"] = "**.cpp",
12+
["Resources/*"] = {"*.rc", "**.ico", "**.xml", "**.manifest"},
1213
["*"] = "premake5.lua"
1314
}
1415

1516
files {
1617
"premake5.lua",
1718
"*.h",
18-
"*.cpp"
19+
"*.cpp",
20+
"*.manifest",
1921
}
2022

2123
filter "architecture:not x86"

Client/ceflauncher_DLL/CCefApp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class CCefApp : public CefApp, public CefRenderProcessHandler
1919
CCefApp() {}
2020
virtual CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() override { return this; };
2121

22-
// http://magpcss.org/ceforum/apidocs3/projects/(default)/CefRenderProcessHandler.html#OnFocusedNodeChanged(CefRefPtr%3CCefBrowser%3E,CefRefPtr%3CCefFrame%3E,CefRefPtr%3CCefDOMNode%3E)
22+
// https://magpcss.org/ceforum/apidocs3/projects/(default)/CefRenderProcessHandler.html#OnFocusedNodeChanged(CefRefPtr%3CCefBrowser%3E,CefRefPtr%3CCefFrame%3E,CefRefPtr%3CCefDOMNode%3E)
2323
virtual void OnFocusedNodeChanged(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefDOMNode> node) override
2424
{
2525
if (m_bHasInputFocus)
@@ -53,7 +53,7 @@ class CCefApp : public CefApp, public CefRenderProcessHandler
5353
}
5454
}
5555

56-
// http://magpcss.org/ceforum/apidocs3/projects/(default)/CefRenderProcessHandler.html#OnContextCreated(CefRefPtr%3CCefBrowser%3E,CefRefPtr%3CCefFrame%3E,CefRefPtr%3CCefV8Context%3E)
56+
// https://magpcss.org/ceforum/apidocs3/projects/(default)/CefRenderProcessHandler.html#OnContextCreated(CefRefPtr%3CCefBrowser%3E,CefRefPtr%3CCefFrame%3E,CefRefPtr%3CCefV8Context%3E)
5757
// //
5858
virtual void OnContextCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context) override
5959
{

0 commit comments

Comments
 (0)