Merge remote-tracking branch 'ddnet/master'

.github/workflows/build.yaml

@@ -71,7 +71,8 @@ jobs:
     - name: Prepare Linux (fancy)
       if: contains(matrix.os, 'ubuntu') && matrix.fancy
       run: |
-        sudo apt-get install libmariadbclient-dev libwebsockets-dev mariadb-server-10.3 -y
+        sudo apt-get install libmariadb-dev libwebsockets-dev mariadb-server -y
+        sudo systemctl stop mysql
         sudo rm -rf /var/lib/mysql/
         sudo mysql_install_db --user=mysql --datadir=/var/lib/mysql/
         cd /usr; sudo mysqld_safe --datadir='/var/lib/mysql/' --no-watch
@@ -87,7 +88,8 @@ jobs:
       if: contains(matrix.os, 'macOS')
       run: |
         brew update || true
-        brew install pkg-config sdl2 ffmpeg python3 ninja molten-vk vulkan-headers glslang spirv-tools
+        # --overwrite for:  Target /usr/local/bin/2to3 already exists.
+        brew install --overwrite pkg-config sdl2 ffmpeg python3 ninja molten-vk vulkan-headers glslang spirv-tools
         brew upgrade freetype
         pip3 install dmgbuild
         echo /Library/Frameworks/Python.framework/Versions/3.11/bin >> $GITHUB_PATH
@@ -181,7 +183,6 @@ jobs:
     # - name: Test fancy
     #   if: matrix.fancy
     #   run: |
-    #     find /usr/lib/ -name '*libwebsockets*'
     #     cd fancy
     #     ${{ matrix.cmake-path }}cmake -E env ${{ matrix.gtest-env }} ${{ matrix.cmake-path }}cmake --build . --config RelWithDebInfo --target run_tests ${{ matrix.build-args }}
 

.github/workflows/codeql-analysis.yaml

@@ -38,7 +38,7 @@ jobs:
       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 libmariadbclient-dev libwebsockets-dev libvulkan-dev glslang-tools spirv-tools -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

.gitignore

@@ -132,6 +132,8 @@ tags
 *.sln
 *.so
 *.sqlite
+*.sqlite-shm
+*.sqlite-wal
 *.suo
 *.swp
 *.tar.gz

.gitlab/build.yml

@@ -10,8 +10,8 @@ build_cmake:
     - apt-get upgrade -y
     - apt-get install
       pkg-config
-      clang
-      cmake ninja-build
+      clang rustc
+      cargo 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

CMakeLists.txt

@@ -332,6 +332,7 @@ if(NOT MSVC AND NOT HAIKU)
     )
   endif()
   add_cxx_compiler_flag_if_supported(OUR_FLAGS_OWN -Wextra)
+  add_cxx_compiler_flag_if_supported(OUR_FLAGS_OWN -Wno-psabi) # parameter passing for argument of type ‘__gnu_cxx::__normal_iterator<CCommandProcessorFragment_Vulkan::SMemoryBlock<1>*, std::vector<CCommandProcessorFragment_Vulkan::SMemoryBlock<1>, std::allocator<CCommandProcessorFragment_Vulkan::SMemoryBlock<1> > > >’ changed in GCC 7.1
   add_cxx_compiler_flag_if_supported(OUR_FLAGS_OWN -Wno-unused-parameter)
   add_cxx_compiler_flag_if_supported(OUR_FLAGS_OWN -Wno-missing-field-initializers)
   add_cxx_compiler_flag_if_supported(OUR_FLAGS_OWN -Wformat=2) # Warn about format strings.
@@ -1950,6 +1951,7 @@ set_src(ENGINE_SHARED GLOB_RECURSE src/engine/shared
   kernel.cpp
   linereader.cpp
   linereader.h
+  localization.h
   map.cpp
   map.h
   masterserver.cpp

README.md

@@ -39,17 +39,19 @@ You can install the required libraries on your system, `touch CMakeLists.txt` an
 
 On older distributions like Ubuntu 18.04 don't install `google-mock`, but instead set `-DDOWNLOAD_GTEST=ON` when building to get a more recent gtest/gmock version.
 
+On older distributions `rustc` version might be too old, to get an up-to-date Rust compiler you can use [rustup](https://rustup.rs/) with stable channel instead or try the `rustc-mozilla` package.
+
 Or on CentOS, RedHat and AlmaLinux like this:
 
     sudo yum install cargo cmake ffmpeg-devel freetype-devel gcc gcc-c++ git glew-devel glslang gmock-devel gtest-devel libcurl-devel libnotify-devel libogg-devel libpng-devel libx264-devel make openssl-devel opus-devel opusfile-devel python2 rust SDL2-devel spirv-tools sqlite-devel vulkan-devel wavpack-devel
 
 Or on Fedora like this:
 
-    sudo dnf install cmake ffmpeg-devel freetype-devel gcc gcc-c++ git glew-devel glslang gmock-devel gtest-devel libcurl-devel libnotify-devel libogg-devel libpng-devel make openssl-devel opus-devel opusfile-devel python2 SDL2-devel spirv-tools sqlite-devel vulkan-devel wavpack-devel x264-devel
+    sudo dnf install cargo cmake ffmpeg-devel freetype-devel gcc gcc-c++ git glew-devel glslang gmock-devel gtest-devel libcurl-devel libnotify-devel libogg-devel libpng-devel make openssl-devel opus-devel opusfile-devel python2 SDL2-devel spirv-tools sqlite-devel vulkan-devel wavpack-devel x264-devel
 
 Or on Arch Linux like this:
 
-    sudo pacman -S --needed base-devel cargo cmake curl ffmpeg freetype2 git glew glslang gmock libnotify libpng opusfile python rust sdl2 spirv-tools sqlite vulkan-headers vulkan-icd-loader wavpack x264
+    sudo pacman -S --needed base-devel cmake curl ffmpeg freetype2 git glew glslang gmock libnotify libpng opusfile python rust sdl2 spirv-tools sqlite vulkan-headers vulkan-icd-loader wavpack x264
 
 Or on Gentoo like this:
 

data/languages/arabic.txt

@@ -41,15 +41,9 @@ Address
 All
 == ﻞﻜﻟﺍ
 
-Are you sure that you want to delete the demo?
-== ﻮﻳﺪﻴﻔﻟﺍ ﻑﺬﺤﻟ ﺪﻛﺎﺘﻣ ﺖﻧﺍ ﻞﻫ
-
 Are you sure that you want to quit?
 == ﻪﺒﻌﻠﻟﺍ ﻕﻼﻏﻻ ﺪﻛﺎﺘﻣ ﺖﻧﺍ ﻞﻫ
 
-Are you sure that you want to remove the player from your friends list?
-== ﺀﺎﻗﺪﺻﻻﺍ ﺔﻤﺋﺎﻗ ﻦﻣ ﺐﻋﻼﻟﺍ ﺍﺬﻫ ﻪﻟﺍﺯﻻ ﺪﻛﺎﺘﻣ ﺖﻧﺍ ﻞﻫ
-
 Automatically record demos
 == ﻲﺋﺎﻘﻠﺗ ﻮﻳﺪﻴﻓ ﻞﻴﺠﺴﺗ
 
@@ -459,9 +453,6 @@ Try again
 Type
 == ﺭﻮﻃ
 
-Unable to delete the demo
-== ﻮﻳﺪﻴﻓﻟﺍ ﻑﺬﺤﺑ ﻞﺸﻓ
-
 Unable to rename the demo
 == ﻮﻳﺪﻴﻓﻟﺍ ﺔﻴﻤﺴﺗ ﺓﺩﺎﻋﺎﺑ ﻞﺸﻓ
 
@@ -993,9 +984,6 @@ transmits your player name to info.ddnet.org
 Server best:
 == :ﺮﻓﺮﻴﺳ ﻞﻀﻓﺍ
 
-Destination file already exist
-== ﻞﻌﻔﻟﺎﺑ ﺩﻮﺟﻮﻣ ﺏﻮﻠﻄﻤﻟﺍ ﻒﻠﻤﻟﺍ
-
 Render demo
 == ﻮﻳﺪﻴﻓﻟﺍ ﻞﻴﻤﺤﺗ
 
@@ -1237,7 +1225,10 @@ Getting game info
 Requesting to join the game
 == 
 
-Are you sure that you want to disconnect and switch to a different server?
+Cancel
+== 
+
+File '%s' already exists, do you want to overwrite it?
 == 
 
 Join Tutorial Server
@@ -1276,9 +1267,18 @@ Getting server list from master server
 Refreshing...
 == 
 
+Are you sure that you want to disconnect and switch to a different server?
+== 
+
 Leak IP
 == 
 
+Are you sure that you want to remove the player '%s' from your friends list?
+== 
+
+Are you sure that you want to remove the clan '%s' from your friends list?
+== 
+
 Play the current demo
 == 
 
@@ -1288,6 +1288,12 @@ Pause the current demo
 Stop the current demo
 == 
 
+Go back one tick
+== 
+
+Go forward one tick
+== 
+
 Slow down the demo
 == 
 
@@ -1303,18 +1309,30 @@ Mark the end of a cut
 Export cut as a separate demo
 == 
 
+Go back one marker
+== 
+
+Go forward one marker
+== 
+
 Toggle keyboard shortcuts
 == 
 
 Loading demo files
 == 
 
-Menu opened. Press Esc key again to close menu.
+Are you sure that you want to delete the demo '%s'?
+== 
+
+Unable to delete the demo '%s'
 == 
 
 Loading ghost files
 == 
 
+Menu opened. Press Esc key again to close menu.
+== 
+
 Settings file
 == 
 
@@ -1392,6 +1410,12 @@ UI mouse sens.
 Controller
 == 
 
+Reset controls
+== 
+
+Are you sure that you want to reset the controls to their defaults?
+== 
+
 Dummy
 == 
 

data/languages/belarusian.txt

@@ -43,15 +43,9 @@ Address
 All
 == Усё
 
-Are you sure that you want to delete the demo?
-== Вы ўпэўнены, што жадаеце выдаліць дэма?
-
 Are you sure that you want to quit?
 == Вы сапраўды жадаеце выйсці?
 
-Are you sure that you want to remove the player from your friends list?
-== Вы ўпэўнены, што жадаеце выдаліць гульца з сяброў?
-
 Automatically record demos
 == Аўтаматычна запісваць дэма
 
@@ -461,9 +455,6 @@ Try again
 Type
 == Тып
 
-Unable to delete the demo
-== Немагчыма выдаліць дэма
-
 Unable to rename the demo
 == Немагчыма пераназваць дэма
 
@@ -706,21 +697,6 @@ Reconnect in %d sec
 Render demo
 == 
 
-Replace video
-== 
-
-File already exists, do you want to overwrite it?
-== 
-
-Are you sure that you want to disconnect?
-== 
-
-Disconnect Dummy
-== 
-
-Are you sure that you want to disconnect your dummy?
-== 
-
 Welcome to DDNet
 == 
 
@@ -745,13 +721,16 @@ Your nickname '%s' is already used (%d points). Do you still want to use it?
 Checking for existing player with your name
 == 
 
-Are you sure that you want to disconnect and switch to a different server?
+Country / Region
 == 
 
-Country / Region
+Cancel
+== 
+
+File '%s' already exists, do you want to overwrite it?
 == 
 
-Destination file already exist
+Replace video
 == 
 
 Speed
@@ -823,6 +802,9 @@ Exclude
 Refreshing...
 == 
 
+Are you sure that you want to disconnect and switch to a different server?
+== 
+
 Filter connecting players
 == 
 
@@ -841,12 +823,21 @@ Types
 Leak IP
 == 
 
+Are you sure that you want to remove the player '%s' from your friends list?
+== 
+
+Are you sure that you want to remove the clan '%s' from your friends list?
+== 
+
 Select a name
 == 
 
 Please use a different name
 == 
 
+File already exists, do you want to overwrite it?
+== 
+
 Remove chat
 == 
 
@@ -859,6 +850,12 @@ Pause the current demo
 Stop the current demo
 == 
 
+Go back one tick
+== 
+
+Go forward one tick
+== 
+
 Slow down the demo
 == 
 
@@ -874,6 +871,12 @@ Mark the end of a cut
 Export cut as a separate demo
 == 
 
+Go back one marker
+== 
+
+Go forward one marker
+== 
+
 Toggle keyboard shortcuts
 == 
 
@@ -907,10 +910,16 @@ Fetch Info
 Demos directory
 == 
 
+Are you sure that you want to delete the demo '%s'?
+== 
+
 Render
 == 
 
-Menu opened. Press Esc key again to close menu.
+Unable to delete the demo '%s'
+== 
+
+Are you sure that you want to disconnect?
 == 
 
 Connect Dummy
@@ -919,6 +928,12 @@ Connect Dummy
 Connecting dummy
 == 
 
+Disconnect Dummy
+== 
+
+Are you sure that you want to disconnect your dummy?
+== 
+
 Kill
 == 
 
@@ -943,6 +958,9 @@ Activate
 Save
 == 
 
+Menu opened. Press Esc key again to close menu.
+== 
+
 Smooth Dynamic Camera
 == 
 
@@ -1113,6 +1131,12 @@ UI mouse sens.
 Controller
 == 
 
+Reset controls
+== 
+
+Are you sure that you want to reset the controls to their defaults?
+== 
+
 Dummy
 ==