Merge remote-tracking branch 'upstream/master'

LizardByte · ReenigneArcher · Feb 9, 2025 · Oct 30, 2022 · Oct 30, 2022 · Oct 30, 2022
commit 6c667e61d089bc94d3070c35577178fa5035c857
diff --git a/.clang-format b/.clang-format
@@ -6,27 +6,34 @@
 # Generated from CLion C/C++ Code Style settings
 BasedOnStyle: LLVM
 AccessModifierOffset: -2
-AlignAfterOpenBracket: DontAlign
-AlignConsecutiveAssignments: false
+AlignAfterOpenBracket: BlockIndent
+AlignConsecutiveAssignments: None
+AlignEscapedNewlines: DontAlign
 AlignOperands: Align
 AllowAllArgumentsOnNextLine: false
 AllowAllConstructorInitializersOnNextLine: false
 AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: Always
+AllowShortBlocksOnASingleLine: Empty
 AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: WithoutElse
-AllowShortLambdasOnASingleLine: All
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: None
 AllowShortLoopsOnASingleLine: true
 AlignTrailingComments: false
-AlwaysBreakAfterReturnType: All
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
 AlwaysBreakTemplateDeclarations: MultiLine
-BreakBeforeBraces: Custom
+BinPackArguments: false
+BinPackParameters: false
+BracedInitializerIndentWidth: 2
 BraceWrapping:
   AfterCaseLabel: false
   AfterClass: false
   AfterControlStatement: Never
   AfterEnum: false
+  AfterExternBlock: true
   AfterFunction: false
   AfterNamespace: false
   AfterObjCDeclaration: false
@@ -36,39 +43,75 @@ BraceWrapping:
   IndentBraces: false
   SplitEmptyFunction: false
   SplitEmptyRecord: true
+BreakArrays: true
 BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
 BreakBeforeTernaryOperators: false
 BreakConstructorInitializers: AfterColon
 BreakInheritanceList: AfterColon
 ColumnLimit: 0
 CompactNamespaces: false
 ContinuationIndentWidth: 2
+Cpp11BracedListStyle: true
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: Always
+ExperimentalAutoDetectBinPacking: true
+FixNamespaceComments: true
+IncludeBlocks: Regroup
+IndentAccessModifiers: false
+IndentCaseBlocks: true
 IndentCaseLabels: true
+IndentExternBlock: Indent
+IndentGotoLabels: true
 IndentPPDirectives: BeforeHash
 IndentWidth: 2
+IndentWrappedFunctionNames: true
+InsertBraces: true
+InsertNewlineAtEOF: true
 KeepEmptyLinesAtTheStartOfBlocks: false
+LineEnding: LF
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: All
+ObjCBinPackProtocolList: Never
 ObjCSpaceAfterProperty: true
 ObjCSpaceBeforeProtocolList: true
+PackConstructorInitializers: Never
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 1
+PenaltyBreakString: 1
+PenaltyBreakFirstLessLess: 0
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 100000000
 PointerAlignment: Right
+ReferenceAlignment: Pointer
 ReflowComments: true
+RemoveBracesLLVM: false
+RemoveSemicolon: false
+SeparateDefinitionBlocks: Always
+SortIncludes: CaseInsensitive
+SortUsingDeclarations: Lexicographic
 SpaceAfterCStyleCast: true
 SpaceAfterLogicalNot: false
-SpaceAfterTemplateKeyword: true
+SpaceAfterTemplateKeyword: false
 SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
 SpaceBeforeCpp11BracedList: true
 SpaceBeforeCtorInitializerColon: false
 SpaceBeforeInheritanceColon: false
+SpaceBeforeJsonColon: false
 SpaceBeforeParens: ControlStatements
 SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 2
 SpacesInAngles: Never
 SpacesInCStyleCastParentheses: false
 SpacesInContainerLiterals: false
+SpacesInLineCommentPrefix:
+  Maximum: 3
+  Minimum: 1
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
 TabWidth: 2
-Cpp11BracedListStyle: false
 UseTab: Never
diff --git a/.codeql-prebuild-cpp-Linux.sh b/.codeql-prebuild-cpp-Linux.sh
@@ -0,0 +1,11 @@
+# install dependencies for C++ analysis
+set -e
+
+chmod +x ./scripts/linux_build.sh
+./scripts/linux_build.sh --skip-package --ubuntu-test-repo
+
+# Delete CUDA
+rm -rf ./build/cuda
+
+# skip autobuild
+echo "skip_autobuild=true" >> "$GITHUB_OUTPUT"
diff --git a/.codeql-prebuild-cpp-Windows.sh b/.codeql-prebuild-cpp-Windows.sh
@@ -0,0 +1,37 @@
+# install dependencies for C++ analysis
+set -e
+
+# update pacman
+pacman --noconfirm -Syu
+
+# install dependencies
+dependencies=(
+  "git"
+  "mingw-w64-ucrt-x86_64-boost"
+  "mingw-w64-ucrt-x86_64-cmake"
+  "mingw-w64-ucrt-x86_64-cppwinrt"
+  "mingw-w64-ucrt-x86_64-curl-winssl"
+  "mingw-w64-ucrt-x86_64-MinHook"
+  "mingw-w64-ucrt-x86_64-miniupnpc"
+  "mingw-w64-ucrt-x86_64-nlohmann-json"
+  "mingw-w64-ucrt-x86_64-nodejs"
+  "mingw-w64-ucrt-x86_64-nsis"
+  "mingw-w64-ucrt-x86_64-onevpl"
+  "mingw-w64-ucrt-x86_64-openssl"
+  "mingw-w64-ucrt-x86_64-opus"
+  "mingw-w64-ucrt-x86_64-toolchain"
+)
+pacman -S --noconfirm "${dependencies[@]}"
+
+# build
+mkdir -p build
+cmake \
+  -B build \
+  -G Ninja \
+  -S . \
+  -DBUILD_DOCS=OFF \
+  -DBUILD_WERROR=ON
+ninja -C build
+
+# skip autobuild
+echo "skip_autobuild=true" >> "$GITHUB_OUTPUT"
diff --git a/.codeql-prebuild-cpp-macOS.sh b/.codeql-prebuild-cpp-macOS.sh
@@ -0,0 +1,29 @@
+# install dependencies for C++ analysis
+set -e
+
+# install dependencies
+dependencies=(
+  "boost"
+  "cmake"
+  "miniupnpc"
+  "ninja"
+  "node"
+  "openssl@3"
+  "opus"
+  "pkg-config"
+)
+brew install "${dependencies[@]}"
+
+# build
+mkdir -p build
+cmake \
+  -B build \
+  -G Ninja \
+  -S . \
+  -DBOOST_USE_STATIC=OFF \
+  -DBUILD_DOCS=OFF \
+  -DBUILD_WERROR=ON
+ninja -C build
+
+# skip autobuild
+echo "skip_autobuild=true" >> "$GITHUB_OUTPUT"
diff --git a/.codeql-prebuild-cpp.sh b/.codeql-prebuild-cpp.sh
diff --git a/.dockerignore b/.dockerignore
@@ -4,15 +4,22 @@
 # do not ignore .git, needed for versioning
 !/.git
 
+# do not ignore .rstcheck.cfg, needed to test building docs
+!/.rstcheck.cfg
+
 # ignore repo directories and files
-docs/
+docker/
 gh-pages-template/
 scripts/
 tools/
 crowdin.yml
 
+# don't ignore linux build script
+!scripts/linux_build.sh
+
 # ignore dev directories
 build/
+cmake-*/
 venv/
 
 # ignore artifacts

diff --git a/.flake8 b/.flake8
@@ -1,7 +1,6 @@
 [flake8]
 filename =
-    *.py,
-    *.pys
+    *.py
 max-line-length = 120
 extend-exclude =
     venv/
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,6 @@
+# ensure dockerfiles are checked out with LF line endings
+Dockerfile text eol=lf
+*.dockerfile text eol=lf
+
+# ensure flatpak lint json files are checked out with LF line endings
+*flatpak-lint-*.json text eol=lf