Merge remote-tracking branch 'upstreamOrigin/master'

.clang-tidy

@@ -81,7 +81,6 @@ Checks: >
   -readability-implicit-bool-conversion,
   -readability-isolate-declaration,
   -readability-magic-numbers,
-  -readability-make-member-function-const,
   -readability-named-parameter,
   -readability-non-const-parameter,
   -readability-simplify-boolean-expr,

.github/workflows/build.yml

@@ -56,7 +56,6 @@ jobs:
     - name: Prepare Linux (non-fancy)
       if: ${{ contains(matrix.os, 'ubuntu') && !matrix.fancy }}
       run: |
-        rustup default 1.48.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/
@@ -92,7 +91,7 @@ jobs:
         brew update || 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 python@3.10
+        brew link --overwrite python@3.11
         brew upgrade freetype
         pip3 install dmgbuild
         echo /Library/Frameworks/Python.framework/Versions/3.11/bin >> $GITHUB_PATH

.gitignore

@@ -53,6 +53,7 @@ libsteam_api.a
 config_retrieve
 config_store
 crapnet
+demo_extract_chat
 dilate
 dummy_map
 fake_server

CMakeLists.txt

@@ -1391,6 +1391,7 @@ set(EXPECTED_DATA
   editor/background.png
   editor/checker.png
   editor/cursor.png
+  editor/cursor_resize.png
   editor/entities/DDNet.png
   editor/entities/FNG.png
   editor/entities/Race.png
@@ -1543,6 +1544,7 @@ set(EXPECTED_DATA
   menuimages/play_game.png
   menuimages/settings.png
   particles.png
+  race_flag.png
   shader/pipeline.frag
   shader/pipeline.vert
   shader/prim.frag
@@ -1887,6 +1889,7 @@ set_src(ENGINE_INTERFACE GLOB src/engine
   keys.h
   map.h
   message.h
+  notifications.h
   rust.h
   server.h
   serverbrowser.h
@@ -2013,7 +2016,6 @@ set_src(GAME_SHARED GLOB src/game
   teamscore.cpp
   teamscore.h
   tuning.h
-  variables.h
   version.h
   voting.h
 )
@@ -2158,6 +2160,7 @@ if(CLIENT)
     updater.h
     video.cpp
     video.h
+    warning.cpp
   )
   set_src(GAME_CLIENT GLOB_RECURSE src/game/client
     animstate.cpp
@@ -2198,10 +2201,10 @@ if(CLIENT)
     components/ghost.h
     components/hud.cpp
     components/hud.h
+    components/infomessages.cpp
+    components/infomessages.h
     components/items.cpp
     components/items.h
-    components/killmessages.cpp
-    components/killmessages.h
     components/mapimages.cpp
     components/mapimages.h
     components/maplayers.cpp
@@ -2300,13 +2303,22 @@ if(CLIENT)
     component.h
     editor.cpp
     editor.h
+    editor_action.h
+    editor_actions.cpp
+    editor_actions.h
+    editor_history.cpp
+    editor_history.h
     editor_object.cpp
     editor_object.h
+    editor_props.cpp
+    editor_trackers.cpp
+    editor_trackers.h
     explanations.cpp
     map_grid.cpp
     map_grid.h
     map_view.cpp
     map_view.h
+    mapitems.h
     mapitems/envelope.cpp
     mapitems/envelope.h
     mapitems/image.cpp
@@ -3089,7 +3101,6 @@ if(NOT DEV)
   endif()
   install(TARGETS ${TARGETS_TOOLS} DESTINATION ${CMAKE_INSTALL_LIBDIR}/ddnet COMPONENT tools)
   install(FILES other/ddnet.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications COMPONENT client)
-  install(FILES other/ddnet.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo COMPONENT client)
   foreach(SIZE 16 32 48 256)
     install(FILES other/icons/DDNet_${SIZE}x${SIZE}x32.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME ddnet.png COMPONENT client)
     install(FILES other/icons/DDNet-Server_${SIZE}x${SIZE}x32.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME ddnet-server.png COMPONENT server)

README.md

@@ -91,5 +91,3 @@ tc_rainbow
 tc_rainbow_others
 tc_rainbow_mode
 add_profile
-```
-

codecov.yml

@@ -6,3 +6,6 @@ coverage:
     project:
       default:
         target: 0%
+    patch:
+      default:
+        target: 0%

data/languages/brazilian_portuguese.txt

@@ -29,6 +29,7 @@
 # Rafael Fontenelle   2023-07-07 12:11:00
 # Rafael Fontenelle   2023-08-14 14:17:00
 # Rafael Fontenelle   2023-09-25 14:23:00
+# Rafael Fontenelle   2023-12-05 17:01:00
 ##### /authors #####
 
 ##### translated strings #####
@@ -1723,56 +1724,56 @@ Render cut to video
 == Renderizar corte do vídeo
 
 Error playing demo
-== 
+== Erro ao reproduzir demo
 
 Some map images could not be loaded. Check the local console for details.
-== 
+== Algumas imagens de mapa não puderam ser carregadas. Verifique o console local para detalhes.
 
 Some map sounds could not be loaded. Check the local console for details.
-== 
+== Alguns sons de mapa não puderam ser carregadas. Verifique o console local para detalhes.
 
 Loading menu themes
-== 
+== Carregando temas de menu
 
 Render complete
-== 
+== Renderização concluída
 
 Videos directory
-== 
+== Diretório de vídeos
 
 Video was saved to '%s'
-== 
+== O vídeo foi salvo em "%s"
 
 No demo selected
-== 
+== Nenhuma demo selecionada
 
 Created
-== 
+== Criada
 
 Netversion
-== 
+== Netversion
 
 [Demo details]
 map not included
-== 
+== mapa não incluído
 
 Ghosts directory
-== 
+== Diretório de fantasmas
 
 Activate all
-== 
+== Ativar tudo
 
 Deactivate all
-== 
+== Desativar tudo
 
 Enable ghost
-== 
+== Habilitar fantasma
 
 Only save improvements
-== 
+== Salvar somente melhorias
 
 Regular background color
-== 
+== Cor de fundo regular
 
 Entities background color
-== 
+== Cor de fundo de entidades

data/languages/russian.txt

@@ -804,7 +804,7 @@ Pause
 == Пауза
 
 Kill
-== Суицид
+== Респаун
 
 Zoom in
 == Приблизить
@@ -933,7 +933,7 @@ Deaths
 == Смерти
 
 Suicides
-== Суицидов
+== Респауны
 
 Ratio
 == Соотношение

data/languages/simplified_chinese.txt

@@ -35,6 +35,7 @@
 # 2023-05-21 RemakePower
 # 2023-07-20 By
 # 2023-08-11 By
+# 2023-11-25 By
 ##### /authors #####
 
 ##### translated strings #####
@@ -1715,76 +1716,76 @@ Moved ingame
 == 游戏内移动
 
 Error playing demo
-== 
+== 回放播放错误
 
 Some map images could not be loaded. Check the local console for details.
-== 
+== 未能加载某些地图图片。检查本地控制台以获取详情。
 
 Some map sounds could not be loaded. Check the local console for details.
-== 
+== 未能加载某些地图音效。检查本地控制台以获取详情。
 
 Loading menu themes
-== 
+== 正在加载主菜单主题
 
 Render complete
-== 
+== 渲染完毕
 
 Videos directory
-== 
+== 视频目录
 
 Video was saved to '%s'
-== 
+== 视频保存至 "%s"
 
 Go back the specified duration
-== 
+== 快退指定时长
 
 [Demo player duration]
 %d min.
-== 
+== %d 分
 
 [Demo player duration]
 %d sec.
-== 
+== %d 秒
 
 Change the skip duration
-== 
+== 变更指定时长
 
 Go forward the specified duration
-== 
+== 快进指定时长
 
 Render cut to video
-== 
+== 渲染裁剪部分
 
 No demo selected
-== 
+== 未选择回放
 
 Created
-== 
+== 创建日期
 
 Netversion
-== 
+== Netversion
 
 [Demo details]
 map not included
-== 
+== 未包含地图
 
 Ghosts directory
-== 
+== 影子目录
 
 Activate all
-== 
+== 全部启用
 
 Deactivate all
-== 
+== 全部停用
 
 Enable ghost
-== 
+== 启用影子
 
 Only save improvements
-== 
+== 只保存更佳记录
 
 Regular background color
-== 
+== 原图层背景颜色
 
 Entities background color
-== 
+== 实体层背景颜色