Revert "Merge remote-tracking branch 'ddnet/master'"

This reverts commit 2b82186, reversing changes made to cee2906.
StormAxs · Oct 3, 2024 · 1f79bf4 · 1f79bf4
1 parent 2b82186
commit 1f79bf4
Show file tree

Hide file tree

Showing 653 changed files with 27,108 additions and 55,121 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -31,10 +31,6 @@ Checks: >
   -bugprone-suspicious-include,
   -bugprone-unhandled-self-assignment,
   -bugprone-suspicious-realloc-usage,
-  -bugprone-switch-missing-default-case,
-  -bugprone-casting-through-void,
-  -bugprone-multi-level-implicit-pointer-conversion,
-  -bugprone-unchecked-optional-access,
   clang-analyzer-*,
   -clang-analyzer-optin.cplusplus.UninitializedObject,
   -clang-analyzer-optin.cplusplus.VirtualCall,
@@ -54,7 +50,6 @@ Checks: >
   -misc-static-assert,
   -misc-unused-parameters,
   -misc-use-anonymous-namespace,
-  -misc-include-cleaner,
   modernize-avoid-bind,
   modernize-concat-nested-namespaces,
   modernize-deprecated-headers,
@@ -82,6 +77,7 @@ Checks: >
   -readability-function-cognitive-complexity,
   -readability-function-size,
   -readability-identifier-length,
+  -readability-identifier-naming,
   -readability-implicit-bool-conversion,
   -readability-isolate-declaration,
   -readability-magic-numbers,
@@ -90,59 +86,6 @@ Checks: >
   -readability-simplify-boolean-expr,
   -readability-suspicious-call-argument,
   -readability-uppercase-literal-suffix,
-  -readability-use-std-min-max,
-  -readability-avoid-nested-conditional-operator,
   performance-*,
   -performance-no-int-to-ptr,
-  -performance-enum-size,
   portability-*,
-
-WarningsAsErrors:
-  readability-identifier-naming,
-
-CheckOptions:
-  - key:             readability-identifier-naming.LocalVariableCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.StaticConstantCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.StaticVariableCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.LocalConstantCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.ClassMemberCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.MemberCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.MemberPrefix
-    value:           m_
-  - key:             readability-identifier-naming.MemberIgnoredRegexp
-    value:           '^(m_ap|m_v|m_p|m_a|ms_p|[a-z]$).*'
-  - key:             readability-identifier-naming.ClassMemberPrefix
-    value:           ms_
-  - key:             readability-identifier-naming.StaticVariablePrefix
-    value:           s_
-  - key:             readability-identifier-naming.ClassMethodCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.ClassCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.ClassPrefix
-    value:           C
-  - key:             readability-identifier-naming.StructPrefix
-    value:           S
-  - key:             readability-identifier-naming.StructIgnoredRegexp
-    value:           '^C.*'
-  - key:             readability-identifier-naming.ClassIgnoredRegexp
-    value:           '^(I|CCommandProcessorFragment_Vulkan$).*'
-  - key:             readability-identifier-naming.ParameterCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.ParameterIgnoredRegexp
-    value:           '^(p|a|v|[a-z]$|[xy][0123]$).*'
-  - key:             readability-identifier-naming.ClassMethodIgnoredRegexp
-    value:           '^(Con_).*'
-  - key:             readability-identifier-naming.ClassMemberIgnoredRegexp
-    value:           '^(m_a|m_v|m_p|ms_p|ms_a|ms_v|s_1024x1024ImgSize$|s_ImageBufferCacheId$|s_VertexBufferCacheId$|s_StagingBufferImageCacheId$|REPLACEMENT_CHARACTER$|(MAX|MIN)_FONT_SIZE$|MAXIMUM_ATLAS_DIMENSION$|INITIAL_ATLAS_DIMENSION$|MAX_SECTION_DIMENSION_MAPPED$|MIN_SECTION_DIMENSION$|s_StagingBufferCacheId$).*'
-  - key:             readability-identifier-naming.LocalConstantIgnoredRegexp
-    value:           '^(p|a|v|s_|MAX_ANIM_SPEED$|DATA_OFFSET$|HEADER_LEN$|MIN_ANIM_SPEED$|[hwdcbqstf]$|[xt][0123]$|result$|sub$|it$|len$|d[xy]$).*'
-  - key:             readability-identifier-naming.LocalVariableIgnoredRegexp
-    value:           '^(p|a|s_|FT_|TB_|s_|ul_|v|[xy]i$|[zijklxyhmrgbacwestnduvqf]$|[dmpwsitcf][xy]$|(ch|skel)[0-2]?$|it$|tw$|dt$|th$|ls$|func$|res$|shader$|len$|maxLength$|length$|offset$|offpos$|result$|bg$|sp$|url$|index$|ctxt$|key$|null$|logger$|LAST_MODIFIED$|teleNr$|target$|id$|hit$|hsl[0-2]?$|rgb[0-2]?$|dir$|tmp$|sub$|ret$|rendered$|size$|isWeaponCollide$|zerochar$|dist$|sound$|match$|best_matches$|matches$|nohook$|btn$|savedLayers$|l[hw]$|evilz$|sec$|min$|to2$|delay$|[xy]Fract$|[xy]Int$|imgg[xy]$|skip$|localPlayer$|fdratio$|[rgbat][0-2]$|[xy][0-3]$|x[rl]$).*'
-
diff --git a/.editorconfig b/.editorconfig
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,7 +41,7 @@ jobs:
           fancy: false
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
@@ -51,13 +51,11 @@ jobs:
         sudo apt-get update -y
         # mount: /var/lib/grub/esp: special device /dev/disk/by-id/scsi-... does not exist.
         # sudo apt-get upgrade -y
-        sudo apt-get install pkg-config cmake ninja-build libfreetype6-dev libnotify-dev libsdl2-dev libsqlite3-dev libvulkan-dev glslang-tools spirv-tools libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libx264-dev libpng-dev valgrind gcovr libglew-dev -y
+        sudo apt-get install pkg-config cmake ninja-build libfreetype6-dev libnotify-dev libsdl2-dev libsqlite3-dev libvulkan-dev glslang-tools spirv-tools libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libx264-dev libpng-dev valgrind gcovr -y
 
     - name: Prepare Linux (non-fancy)
       if: ${{ contains(matrix.os, 'ubuntu') && !matrix.fancy }}
       run: |
-        # Our minimum supported Rust version (MSRV)
-        rustup default 1.63.0
         sudo rm -rf /var/lib/mysql/ /var/run/mysqld
         sudo mkdir /var/lib/mysql/ /var/run/mysqld/
         sudo chown mysql:mysql /var/lib/mysql/ /var/run/mysqld/
@@ -91,10 +89,12 @@ jobs:
       if: contains(matrix.os, 'macOS')
       run: |
         brew update || true
-        brew install pkg-config sdl2 ffmpeg ninja molten-vk vulkan-headers glslang spirv-tools rust || true
+        brew install pkg-config sdl2 ffmpeg ninja molten-vk vulkan-headers glslang spirv-tools || true
+        # --overwrite for:  Target /usr/local/bin/2to3 already exists.
+        brew link --overwrite [email protected]
         brew upgrade freetype
-        pip3 install --break-system-packages dmgbuild
-        echo /Library/Frameworks/Python.framework/Versions/3.12/bin >> $GITHUB_PATH
+        pip3 install dmgbuild
+        echo /Library/Frameworks/Python.framework/Versions/3.11/bin >> $GITHUB_PATH
         sudo rm -rf /Library/Developer/CommandLineTools
 
     - name: Cache Rust dependencies
@@ -151,8 +151,10 @@ jobs:
 
     - name: Upload Codecov report (unit tests)
       if: contains(matrix.os, 'ubuntu-latest')
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v3
       with:
+        gcov: true
+        gcov_include: src
         flags: unittests
 
     - name: Test headless client (start & connect)
@@ -166,8 +168,10 @@ jobs:
 
     - name: Upload Codecov report (start & connect)
       if: contains(matrix.os, 'ubuntu-latest')
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v3
       with:
+        gcov: true
+        gcov_include: src
         flags: startconnect
 
     - name: Build in release mode with debug info and all features on
@@ -200,8 +204,10 @@ jobs:
 
     - name: Upload Codecov report (integration tests)
       if: contains(matrix.os, 'ubuntu-latest')
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v3
       with:
+        gcov: true
+        gcov_include: src
         flags: integrationtests
 
     - name: Package
@@ -212,7 +218,8 @@ jobs:
         mv ${{ matrix.package-file }} artifacts
 
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: ddnet-${{ matrix.os }}
         path: release/artifacts
+
diff --git a/.github/workflows/clang-sanitizer.yml b/.github/workflows/clang-sanitizer.yml
@@ -10,18 +10,18 @@ on:
 
 jobs:
   check-clang-san:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
       CARGO_HTTP_MULTIPLEXING: false
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
     - name: Prepare linux
       run: |
         sudo apt-get update -y
-        sudo apt-get install pkg-config cmake ninja-build libfreetype6-dev libnotify-dev libsdl2-dev libsqlite3-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libx264-dev libvulkan-dev glslang-tools spirv-tools libglew-dev -y
+        sudo apt-get install pkg-config cmake ninja-build libfreetype6-dev libnotify-dev libsdl2-dev libsqlite3-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libx264-dev libvulkan-dev glslang-tools spirv-tools -y
     - name: Cache Rust dependencies
       uses: Swatinem/rust-cache@v2
     - name: Build with ASan and UBSan

diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
@@ -14,14 +14,14 @@ jobs:
     env:
       CARGO_HTTP_MULTIPLEXING: false
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
     - name: Install clang-tidy
       run: |
         sudo apt-get update -y
-        sudo apt-get install pkg-config cmake ninja-build libfreetype6-dev libnotify-dev libsdl2-dev libsqlite3-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libx264-dev clang-tidy libvulkan-dev glslang-tools spirv-tools libglew-dev -y
+        sudo apt-get install pkg-config cmake ninja-build libfreetype6-dev libnotify-dev libsdl2-dev libsqlite3-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libx264-dev clang-tidy libvulkan-dev glslang-tools spirv-tools -y
 
     - name: Cache Rust dependencies
       uses: Swatinem/rust-cache@v2
@@ -32,3 +32,4 @@ jobs:
         cd clang-tidy
         cmake -G Ninja -DCMAKE_CXX_CLANG_TIDY="clang-tidy;-warnings-as-errors=*" -DCMAKE_C_CLANG_TIDY="clang-tidy;-warnings-as-errors=*" -DCMAKE_BUILD_TYPE=Debug -Werror=dev -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=. ..
         cmake --build . --config Debug --target everything -- -k 0
+
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -32,23 +32,23 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         submodules: true
 
     - name: Prepare Linux
       if: matrix.language == 'cpp'
       run: |
        sudo apt-get update -y
-       sudo apt-get install pkg-config cmake ninja-build libfreetype6-dev libnotify-dev libsdl2-dev libsqlite3-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libx264-dev libmariadb-dev libwebsockets-dev libvulkan-dev glslang-tools spirv-tools libglew-dev -y
+       sudo apt-get install pkg-config cmake ninja-build libfreetype6-dev libnotify-dev libsdl2-dev libsqlite3-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libx264-dev libmariadb-dev libwebsockets-dev libvulkan-dev glslang-tools spirv-tools -y
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
+        # By default, queries listed here will override any specified in a config file. 
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -13,7 +13,7 @@ jobs:
     env:
       CARGO_HTTP_MULTIPLEXING: false
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
     - name: Cache Rust dependencies
       uses: Swatinem/rust-cache@v2
     - name: Run Rustdoc
@@ -23,7 +23,7 @@ jobs:
   rustfmt:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
     - name: Run Rustfmt
       run:
         cargo fmt -- --check
@@ -41,7 +41,7 @@ jobs:
     continue-on-error: ${{ matrix.checks == 'advisories' }}
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
     - name: Cache Rust dependencies
       uses: Swatinem/rust-cache@v2
     - uses: EmbarkStudios/cargo-deny-action@v1

diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -14,17 +14,15 @@ jobs:
     env:
       CARGO_HTTP_MULTIPLEXING: false
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         submodules: true
     - name: Prepare
       run: |
         sudo apt-get update -y
-        sudo apt-get install clang-format imagemagick ddnet-tools shellcheck pkg-config cmake ninja-build libfreetype6-dev libnotify-dev libsdl2-dev libsqlite3-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libx264-dev python3-clang libvulkan-dev glslang-tools spirv-tools libglew-dev -y
+        sudo apt-get install clang-format imagemagick ddnet-tools shellcheck pkg-config cmake ninja-build libfreetype6-dev libnotify-dev libsdl2-dev libsqlite3-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libx264-dev python3-clang libvulkan-dev glslang-tools spirv-tools -y
         rustup default stable
         pip3 install pylint
-        wget -O ~/.local/bin/shfmt https://github.com/mvdan/sh/releases/download/v3.8.0/shfmt_v3.8.0_linux_amd64
-        chmod +x ~/.local/bin/shfmt
         git clone https://gitlab.com/Patiga/twmap.git/
         cd twmap/twmap-tools
         cargo install --locked --path=.
@@ -40,8 +38,6 @@ jobs:
       run: scripts/fix_style.py --dry-run
     - name: Check header guards
       run: scripts/check_header_guards.py
-    - name: Validate Languages
-      run: scripts/languages/validate.py
     - name: Check languages
       run: scripts/languages/update_all.py
     - name: Check dilated images
@@ -64,8 +60,6 @@ jobs:
     #    fi
     - name: Shellcheck
       run: find . -type f -name '*.sh' -print0 | xargs -0 shellcheck
-    - name: Shell format (shfmt)
-      run: find . -type f -name '*.sh' -print0 | xargs -0 shfmt -d
     - name: Check log error case
       run: |
         if grep -Eqr '(msg|Print).*\(.*"[Ee]rror:' src/;
@@ -83,7 +77,7 @@ jobs:
       run: scripts/check_unused_header_files.py
     - name: Check maps
       run: |
-        findings=$(find data -type f -name '*.map' ! -wholename 'data/maps/coverage.map' -print0 | xargs -0 ~/.cargo/bin/twmap-check-ddnet 2>&1 | \
+        findings=$(find data -type f -name '*.map' -print0 | xargs -0 ~/.cargo/bin/twmap-check-ddnet 2>&1 | \
           grep -v -E "\"data/maps/(ctf|dm).*\.map\": Time cps are missing on the map" | \
           grep -v -E "\"data/themes/.*\.map\": Time cps are missing on the map" | \
           grep -v -E "\"data/maps/ctf4\.map\": Map - In Image at index 3 -> Image 'jungle_doodads_old' is not a valid external image for DDNet06" | \

diff --git a/.gitignore b/.gitignore
@@ -43,9 +43,6 @@ testrunner\[1\]_include.cmake
 
 /SDL2.framework
 
-# Android
-local.properties
-
 # Ignore all the generated executables without extensions (for non-Windows
 # systems).
 DDNet