Merge branch 'master' into feature/client-side-jetpack

Author: MegadreamsBE

.clang-format

@@ -55,7 +55,7 @@ Cpp11BracedListStyle: true
 DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
-FixNamespaceComments: true
+FixNamespaceComments: false
 ForEachMacros:   
   - foreach
   - Q_FOREACH
@@ -70,6 +70,7 @@ IncludeCategories:
     Priority:        3
 IncludeIsMainRegex: '([-_](test|unittest))?$'
 IndentCaseLabels: true
+InsertNewlineAtEOF: true
 IndentPPDirectives: BeforeHash
 IndentWidth:     4
 IndentWrappedFunctionNames: false
@@ -99,7 +100,7 @@ SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: ControlStatements
 SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 12
+SpacesBeforeTrailingComments: 2
 SpacesInAngles:  false
 SpacesInContainerLiterals: false
 SpacesInCStyleCastParentheses: false

.clang-tidy

@@ -0,0 +1,5 @@
+---
+Checks: 'readability-braces-around-statements,modernize-redundant-void-arg'
+CheckOptions:
+  - key: readability-braces-around-statements.ShortStatementLines
+    value: '2'

.git-blame-ignore-revs

@@ -259,3 +259,33 @@ e7c3619a5d5e0b6bf352befde6ff33c5921032b2
 # Date:   Wed Jan 7 16:42:45 2026 -0500
 #
 # codemod: disable clang-format for `__asm` directives (#4611)
+
+c2a0ba939f0fabba96450d02ec56a111658230d6
+# Author: qaisjp <qaisjp@gmail.com>
+# Date:   Sat Jan 17 10:20:18 2026 -0500
+#
+# Run ./utils/clang-format.ps1
+
+6be278d2d37f5f9686984856b72573290852ed74
+# Author: Qais Patankar <qaisjp@gmail.com>
+# Date:   Sat Jan 17 17:14:10 2026 -0500
+#
+# Remove more FixNamespaceComments changes (#4638)
+
+a665e0144e7f71a4c7898f024262393f019f6b7b
+# Author: qaisjp <qaisjp@gmail.com>
+# Date:   Sat Jan 17 17:30:03 2026 -0500
+#
+# Revert back to pre-enforcement
+
+7cd17bc67c5c2d631b6aaac1ac48521b6922045e
+# Author: qaisjp <qaisjp@gmail.com>
+# Date:   Mon Jan 19 01:50:18 2026 -0500
+#
+# fastmod '}  // namespace [a-zA-Z0-9]+$' '}' Client/ Server/ Shared/
+
+e75ba93362c6ae99d30a95d3f20a1e04ba46a22e
+# Author: qaisjp <qaisjp@gmail.com>
+# Date:   Mon Jan 19 02:08:21 2026 -0500
+#
+# Run utils/clang-format.ps1

.gitattributes

@@ -9,6 +9,7 @@
 *.hh        text diff=cpp
 *.hpp       text diff=cpp
 *.h++       text diff=cpp
+*.json      text eol=lf
 *.rc        text
 *.vcproj    text eol=crlf
 *.sln       text eol=crlf
@@ -23,6 +24,7 @@
 *.nsh       text
 *.xsd       text
 *.po        text
+*.ps1       text eol=lf
 *.ico       binary
 *.png       binary
 *.bmp       binary

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,21 @@
-Before you go ahead and create a pull request, please make sure:
+#### Summary
+<!-- What change are you making? -->
+<!-- When changing Lua APIs, consider including code samples and documentation. -->
 
-* [ ] [your code follows the coding guidelines](https://wiki.multitheftauto.com/index.php?title=Coding_guidelines)
-* [ ] your commit messages are informative ("update file.cpp" is unhelpful. "fix missing model in getVehicleNameFromModel" is helpful)
 
-If your work is incomplete, **do not prefix your pull request with "WIP"**, instead
-create a _draft_ pull request: https://github.blog/2019-02-14-introducing-draft-pull-requests/
 
-Thank you!
+#### Motivation
+<!-- Why are you making this change? Which GitHub issue does this resolve, if any? Any additional context? -->
+
+
+
+#### Test plan
+<!-- How have you tested this change? This should give confidence to the reviewer  -->
+<!-- If someone makes changes to this code in the future, what steps can they follow to check that it's still working correctly? -->
+
+
+
+#### Checklist
+
+* [ ] Your code should follow the [coding guidelines](https://wiki.multitheftauto.com/index.php?title=Coding_guidelines).
+* [ ] Smaller pull requests are easier to review. If your pull request is beefy, your pull request should be reviewable commit-by-commit.

.github/workflows/clang-format.yml

@@ -0,0 +1,15 @@
+name: clang-format
+
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  clang-format:
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run clang-format
+        shell: pwsh
+        run: ./utils/clang-format.ps1 -Verbose

.github/workflows/rebuild-pots.yaml

@@ -1,6 +1,9 @@
 name: "Rebuild en_US pot files"
 
-on: [push, workflow_dispatch]
+on:
+  schedule:
+    - cron: '0 0 * * 1'  # Every Monday at 00:00 UTC
+  workflow_dispatch:
 
 jobs:
   test:

.github/workflows/sync-master-to-maetro.yaml

@@ -83,13 +83,6 @@ Makefile
 *.make
 obj/
 
-### VisualStudioCode ###
-.vscode/*
-#!.vscode/settings.json
-#!.vscode/tasks.json
-#!.vscode/launch.json
-#!.vscode/extensions.json
-
 ### Windows ###
 # Windows thumbnail cache files
 Thumbs.db

.gitignore

@@ -0,0 +1,14 @@
+{
+	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
+	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
+
+	// List of extensions which should be recommended for users of this workspace.
+	"recommendations": [
+		"ms-vscode.powershell", // provides formatter for PowerShell scripts
+		"sleistner.vscode-fileutils" // generally helpful so you can easily delete files via the command palette
+	],
+	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
+	"unwantedRecommendations": [
+
+	]
+}