Merge branch 'upstream_master'

sjrc6 · Jan 8, 2025 · 03204da · 03204da
2 parents d53a08a + b17d6ed
commit 03204da
Show file tree

Hide file tree

Showing 104 changed files with 2,641 additions and 710 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -110,15 +110,13 @@ CheckOptions:
   - key:             readability-identifier-naming.LocalConstantCase
     value:           CamelCase
   - key:             readability-identifier-naming.ClassMemberCase
-    value:           CamelCase
+    value:           UPPER_CASE
   - 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

diff --git a/.pylintrc b/.pylintrc
@@ -23,3 +23,4 @@ disable=
   W0511, # fixme
   W0603, # global-statement
   R0022, # useless-option-value
+  R0917, # too-many-positional-arguments
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3608,6 +3608,7 @@ foreach(target ${TARGETS_OWN})
   target_compile_definitions(${target} PRIVATE $<$<CONFIG:Debug>:CONF_DEBUG>)
   target_include_directories(${target} SYSTEM PRIVATE ${CURL_INCLUDE_DIRS} ${SQLite3_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
   target_compile_definitions(${target} PRIVATE GLEW_STATIC)
+  target_compile_definitions(${target} PRIVATE _FILE_OFFSET_BITS=64) # Ensure off_t is 64 bit for ftello and fseeko functions
   if(CRYPTO_FOUND)
     target_compile_definitions(${target} PRIVATE CONF_OPENSSL)
     target_include_directories(${target} SYSTEM PRIVATE ${CRYPTO_INCLUDE_DIRS})

diff --git a/data/languages/arabic.txt b/data/languages/arabic.txt
@@ -1110,6 +1110,9 @@ Error saving settings
 The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
 == 
 
+"%s" is not compatible with pnglite and cannot be loaded by old DDNet versions:
+== 
+
 The format of texture %s is not RGBA which will cause visual bugs.
 == 
 
@@ -1152,6 +1155,9 @@ Restarting. Please wait…
 Loading skin files
 == 
 
+Loading background map
+== 
+
 Searching
 == 
 
@@ -1198,6 +1204,10 @@ Multi-View
 Following %s
 == 
 
+[Spectating Camera Mode Icon]
+AUTO
+== 
+
 Team %d
 == 
 
@@ -1450,6 +1460,9 @@ Close the demo player
 Toggle keyboard shortcuts
 == 
 
+Toggle auto camera
+== 
+
 Export demo cut
 == 
 
@@ -1517,6 +1530,9 @@ Edit touch controls
 Close
 == 
 
+https://wiki.ddnet.org/wiki/Touch_controls
+== 
+
 Save changes
 == 
 
@@ -1753,6 +1769,12 @@ Show health, shields and ammo
 Show local time always
 == 
 
+Authed name color in scoreboard
+== 
+
+Same clan color in scoreboard
+== 
+
 DDRace HUD
 == 
 
@@ -1801,19 +1823,28 @@ Preview
 Show friend mark (♥) in name plates
 == 
 
+Show client IDs in name plates
+== 
+
+Hook Strength
+== 
+
 Show hook strength icon indicator
 == 
 
 Show hook strength number indicator
 == 
 
-Show local player's key presses
+Size of hook strength icon and number indicator
 == 
 
-Authed name color in scoreboard
+Key Presses
 == 
 
-Same clan color in scoreboard
+Show local player's key presses
+== 
+
+Size of key press icons
 == 
 
 Hook collision line
@@ -1906,7 +1937,7 @@ Opacity
 Only save improvements
 == 
 
-Adjust the opacity of entities belonging to other teams, such as tees and nameplates
+Adjust the opacity of entities belonging to other teams, such as tees and name plates
 == 
 
 Quads are used for background decoration
@@ -1972,6 +2003,9 @@ Tutorial
 Can't find a Tutorial server
 == 
 
+Server could not be started. Make sure to grant the notification permission in the app settings so the server can run in the background.
+== 
+
 Loading race demo files
 == 
 

diff --git a/data/languages/azerbaijani.txt b/data/languages/azerbaijani.txt
@@ -1541,7 +1541,7 @@ When you cross the start line, show a ghost tee replicating the movements of you
 Opacity
 == Şəffaflıq
 
-Adjust the opacity of entities belonging to other teams, such as tees and nameplates
+Adjust the opacity of entities belonging to other teams, such as tees and name plates
 == Teelər və istifadəçi adları kimi digər qruplara aid varlıqların qeyri-şəffaflığını düzəldin
 
 Quads are used for background decoration
@@ -2039,3 +2039,37 @@ Active: Fire
 
 Active: Hook
 == Aktiv: Qarmaq
+
+"%s" is not compatible with pnglite and cannot be loaded by old DDNet versions:
+== 
+
+Loading background map
+== 
+
+[Spectating Camera Mode Icon]
+AUTO
+== 
+
+Toggle auto camera
+== 
+
+https://wiki.ddnet.org/wiki/Touch_controls
+== 
+
+Show client IDs in name plates
+== 
+
+Hook Strength
+== 
+
+Size of hook strength icon and number indicator
+== 
+
+Key Presses
+== 
+
+Size of key press icons
+== 
+
+Server could not be started. Make sure to grant the notification permission in the app settings so the server can run in the background.
+== 
diff --git a/data/languages/belarusian.txt b/data/languages/belarusian.txt
@@ -1326,7 +1326,7 @@ Show text entities
 Opacity
 == Непразр.
 
-Adjust the opacity of entities belonging to other teams, such as tees and nameplates
+Adjust the opacity of entities belonging to other teams, such as tees and name plates
 == Рэгуляванне непразрыстасці аб'ектаў іншых каманд, такіх як Tee і таблічкі з імёнамі.
 
 Show others (own team only)
@@ -1867,9 +1867,19 @@ Connect address error
 Could not connect dummy
 == 
 
+"%s" is not compatible with pnglite and cannot be loaded by old DDNet versions:
+== 
+
 Some fonts could not be loaded. Check the local console for details.
 == 
 
+Loading background map
+== 
+
+[Spectating Camera Mode Icon]
+AUTO
+== 
+
 Save skin
 == 
 
@@ -1897,6 +1907,9 @@ Add clanmates by entering their clan below and leaving the name blank.
 Offline friends and clanmates will appear here.
 == 
 
+Toggle auto camera
+== 
+
 Dummy is not allowed on this server
 == 
 
@@ -1909,6 +1922,9 @@ Edit touch controls
 Close
 == 
 
+https://wiki.ddnet.org/wiki/Touch_controls
+== 
+
 Save changes
 == 
 
@@ -1984,6 +2000,21 @@ Hz
 Show client IDs (scoreboard, chat, spectator)
 == 
 
+Show client IDs in name plates
+== 
+
+Hook Strength
+== 
+
+Size of hook strength icon and number indicator
+== 
+
+Key Presses
+== 
+
+Size of key press icons
+== 
+
 Width of your own hook collision line
 == 
 
@@ -2008,6 +2039,9 @@ Delete skin
 Unable to delete skin
 == 
 
+Server could not be started. Make sure to grant the notification permission in the app settings so the server can run in the background.
+== 
+
 [skins]
 Body
 == 

diff --git a/data/languages/bosnian.txt b/data/languages/bosnian.txt
@@ -972,6 +972,9 @@ Error saving settings
 The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
 == 
 
+"%s" is not compatible with pnglite and cannot be loaded by old DDNet versions:
+== 
+
 The format of texture %s is not RGBA which will cause visual bugs.
 == 
 
@@ -1017,6 +1020,9 @@ Restarting. Please wait…
 Loading skin files
 == 
 
+Loading background map
+== 
+
 Searching
 == 
 
@@ -1066,6 +1072,10 @@ Multi-View
 Following %s
 == 
 
+[Spectating Camera Mode Icon]
+AUTO
+== 
+
 Team %d
 == 
 
@@ -1348,6 +1358,9 @@ Close the demo player
 Toggle keyboard shortcuts
 == 
 
+Toggle auto camera
+== 
+
 Export demo cut
 == 
 
@@ -1424,6 +1437,9 @@ Edit touch controls
 Close
 == 
 
+https://wiki.ddnet.org/wiki/Touch_controls
+== 
+
 Save changes
 == 
 
@@ -1699,6 +1715,12 @@ Show health, shields and ammo
 Show local time always
 == 
 
+Authed name color in scoreboard
+== 
+
+Same clan color in scoreboard
+== 
+
 DDRace HUD
 == 
 
@@ -1750,19 +1772,28 @@ Preview
 Show friend mark (♥) in name plates
 == 
 
+Show client IDs in name plates
+== 
+
+Hook Strength
+== 
+
 Show hook strength icon indicator
 == 
 
 Show hook strength number indicator
 == 
 
-Show local player's key presses
+Size of hook strength icon and number indicator
 == 
 
-Authed name color in scoreboard
+Key Presses
 == 
 
-Same clan color in scoreboard
+Show local player's key presses
+== 
+
+Size of key press icons
 == 
 
 Hook collision line
@@ -1861,7 +1892,7 @@ Only save improvements
 Overlay entities
 == 
 
-Adjust the opacity of entities belonging to other teams, such as tees and nameplates
+Adjust the opacity of entities belonging to other teams, such as tees and name plates
 == 
 
 Quads are used for background decoration
@@ -1951,13 +1982,16 @@ Stop server
 Run server
 == 
 
-Server executable not found, can't run server
-== 
-
 [Start menu]
 Play
 == 
 
+Server could not be started. Make sure to grant the notification permission in the app settings so the server can run in the background.
+== 
+
+Server executable not found, can't run server
+== 
+
 Loading race demo files
 ==