Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -35,6 +35,7 @@ install_manifest*.txt
 ninja_package
 pack_*/
 rules.ninja
+SAN.*
 testrunner\[1\]_include.cmake
 vulkan_shaders_sha256.txt
 

CMakeLists.txt

@@ -1516,11 +1516,12 @@ function(generate_source7 output_file script_parameter)
   )
 endfunction()
 
-function(generate_maps output_file)
+function(generate_maps output_file script_parameter)
   add_custom_command(OUTPUT ${output_file}
-    COMMAND ${PYTHON_EXECUTABLE} datasrc/crosscompile.py
+    COMMAND ${PYTHON_EXECUTABLE} datasrc/crosscompile.py ${script_parameter}
       > "${PROJECT_BINARY_DIR}/${output_file}"
     DEPENDS
+      datasrc/crosscompile.py
       datasrc/compile.py
       datasrc/content.py
       datasrc/datatypes.py
@@ -1568,7 +1569,8 @@ generate_source7("src/game/generated/protocol7.h" "network_header")
 generate_source7("src/game/generated/client_data7.cpp" "client_content_source")
 generate_source7("src/game/generated/client_data7.h" "client_content_header")
 
-generate_maps("src/game/generated/protocolglue.h")
+generate_maps("src/game/generated/protocolglue.h" "map_header")
+generate_maps("src/game/generated/protocolglue.cpp" "map_source")
 
 add_custom_command(OUTPUT "src/game/generated/wordlist.h"
   COMMAND ${PYTHON_EXECUTABLE} scripts/wordlist.py > ${PROJECT_BINARY_DIR}/src/game/generated/wordlist.h
@@ -1743,6 +1745,7 @@ set_src(GAME_SHARED GLOB src/game
 # A bit hacky, but these are needed to register all the UUIDs, even for stuff
 # that doesn't link game.
 set(ENGINE_UUID_SHARED
+  src/game/generated/protocolglue.cpp
   src/game/generated/protocolglue.h
   src/game/generated/protocol7.cpp
   src/game/generated/protocol7.h
@@ -1764,7 +1767,10 @@ set(GAME_GENERATED_SHARED
   src/game/generated/protocol7.h
   src/game/generated/protocolglue.h
 )
-
+set(MASTERSRV_SHARED
+  src/mastersrv/mastersrv.cpp
+  src/mastersrv/mastersrv.h
+)
 set(DEPS ${DEP_JSON} ${DEP_MD5} ${ZLIB_DEP})
 
 # Libraries
@@ -1782,7 +1788,8 @@ set(LIBS
 # Targets
 add_library(engine-shared EXCLUDE_FROM_ALL OBJECT ${ENGINE_INTERFACE} ${ENGINE_SHARED} ${ENGINE_UUID_SHARED} ${BASE})
 add_library(game-shared EXCLUDE_FROM_ALL OBJECT ${GAME_SHARED} ${GAME_GENERATED_SHARED})
-list(APPEND TARGETS_OWN engine-shared game-shared)
+add_library(mastersrv-shared EXCLUDE_FROM_ALL OBJECT ${MASTERSRV_SHARED})
+list(APPEND TARGETS_OWN engine-shared game-shared mastersrv-shared)
 
 if(DISCORD AND NOT DISCORD_DYNAMIC)
   add_library(discord-shared SHARED IMPORTED)
@@ -2064,6 +2071,7 @@ if(CLIENT)
       ${DEPS_CLIENT}
       $<TARGET_OBJECTS:engine-shared>
       $<TARGET_OBJECTS:game-shared>
+      $<TARGET_OBJECTS:mastersrv-shared>
     )
   else()
     add_executable(${TARGET_CLIENT} WIN32
@@ -2073,6 +2081,7 @@ if(CLIENT)
       ${DEPS_CLIENT}
       $<TARGET_OBJECTS:engine-shared>
       $<TARGET_OBJECTS:game-shared>
+      $<TARGET_OBJECTS:mastersrv-shared>
     )
   endif()
   target_link_libraries(${TARGET_CLIENT} ${LIBS_CLIENT})
@@ -2260,6 +2269,7 @@ if(SERVER)
     ${SERVER_ICON}
     $<TARGET_OBJECTS:engine-shared>
     $<TARGET_OBJECTS:game-shared>
+    $<TARGET_OBJECTS:mastersrv-shared>
   )
   target_link_libraries(${TARGET_SERVER} ${LIBS_SERVER})
   list(APPEND TARGETS_OWN ${TARGET_SERVER})
@@ -2280,14 +2290,15 @@ endif()
 ########################################################################
 
 if(TOOLS)
-  set_src(MASTERSRV_SRC GLOB src/mastersrv mastersrv.cpp mastersrv.h)
+  set(MASTERSRV_SRC src/mastersrv/main_mastersrv.cpp)
   set_src(TWPING_SRC GLOB src/twping twping.cpp)
 
   set(TARGET_MASTERSRV mastersrv)
   set(TARGET_TWPING twping)
 
-  add_executable(${TARGET_MASTERSRV} EXCLUDE_FROM_ALL ${MASTERSRV_SRC} $<TARGET_OBJECTS:engine-shared> ${DEPS})
-  add_executable(${TARGET_TWPING} EXCLUDE_FROM_ALL ${TWPING_SRC} $<TARGET_OBJECTS:engine-shared> ${DEPS})
+  add_executable(${TARGET_MASTERSRV} EXCLUDE_FROM_ALL ${MASTERSRV_SRC} $<TARGET_OBJECTS:engine-shared> $<TARGET_OBJECTS:mastersrv-shared> ${DEPS})
+
+  add_executable(${TARGET_TWPING} EXCLUDE_FROM_ALL ${TWPING_SRC} $<TARGET_OBJECTS:engine-shared> $<TARGET_OBJECTS:mastersrv-shared> ${DEPS})
 
   target_link_libraries(${TARGET_MASTERSRV} ${LIBS})
   target_link_libraries(${TARGET_TWPING} ${LIBS})
@@ -2328,6 +2339,9 @@ if(TOOLS)
       if(TOOL MATCHES "^config_")
         list(APPEND EXTRA_TOOL_SRC "src/tools/config_common.h")
       endif()
+      if(TOOL MATCHES "^fake_server")
+          list(APPEND TOOL_DEPS $<TARGET_OBJECTS:mastersrv-shared>)
+      endif()
       set(EXCLUDE_FROM_ALL)
       if(DEV)
         set(EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL)
@@ -2453,6 +2467,7 @@ if(GTEST_FOUND OR DOWNLOAD_GTEST)
     ${TESTS_EXTRA}
     $<TARGET_OBJECTS:engine-shared>
     $<TARGET_OBJECTS:game-shared>
+    $<TARGET_OBJECTS:mastersrv-shared>
     ${DEPS}
   )
   target_link_libraries(${TARGET_TESTRUNNER} ${LIBS} ${CURL_LIBRARIES} ${MYSQL_LIBRARIES} ${GTEST_LIBRARIES})

data/languages/simplified_chinese.txt

@@ -20,30 +20,31 @@
 # 2022-03-22 cheeser0613
 # 2022-03-24 cheeser0613
 # 2022-03-29 Dan_cao
+# 2022-04-01 Dan_cao
 ##### /authors #####
 
 ##### translated strings #####
 
 %ds left
-== 还剩%d秒
+== 还剩 %d 秒
 
 %i minute left
-== 还剩下%i分钟
+== 还剩下 %i 分钟
 
 %i minutes left
-== 还剩下%i分钟
+== 还剩下 %i 分钟
 
 %i second left
-== 还剩下%i秒钟
+== 还剩下 %i 秒钟
 
 %i seconds left
-== 还剩下%i秒钟
+== 还剩下 %i 秒钟
 
 %s wins!
-== %s胜利!
+== %s 胜利！
 
 -Page %d-
-== -第%d页-
+== -第 %d 页-
 
 Abort
 == 取消
@@ -58,7 +59,7 @@ Address
 == 地址
 
 All
-== 全部
+== 全体
 
 Are you sure that you want to delete the demo?
 == 你确定要删除这个回放吗？
@@ -163,7 +164,7 @@ Error
 == 错误
 
 Error loading demo
-== 回放读取错误
+== 回放加载错误
 
 Favorite
 == 收藏
@@ -283,7 +284,7 @@ Enable game sounds
 == 启用游戏声音
 
 Enable gun sound
-== 启用手枪声
+== 启用手枪声音
 
 Enable server message sound
 == 启用服务器消息提示音
@@ -301,7 +302,7 @@ Threaded sound loading
 == 启用多线程音频加载
 
 Name
-== 昵称
+== 名称
 
 Next weapon
 == 下一个武器
@@ -356,7 +357,7 @@ HUD
 == HUD
 
 Player country:
-== 玩家国家/地区：
+== 玩家国家 / 地区：
 
 Player options
 == 玩家选项
@@ -443,7 +444,7 @@ Show friends only
 == 只显示好友
 
 Show ingame HUD
-== 显示HUD
+== 显示 HUD
 
 Show name plates
 == 显示昵称
@@ -620,7 +621,7 @@ Dummy settings
 == 分身设置
 
 Length:
-== 长度：
+== 时长：
 
 Laser
 == 激光枪
@@ -692,7 +693,7 @@ Use DDRace Scoreboard
 == 使用 DDRace 计分板
 
 Show score
-== 显示比分
+== 显示分数
 
 Show health + ammo
 == 显示生命与弹药
@@ -923,7 +924,7 @@ File already exists, do you want to overwrite it?
 == 文件已存在，是否覆盖？
 
 Indicate map finish
-== 标记已完成地图
+== 标记已完成的地图
 
 Save
 == 保存
@@ -974,19 +975,19 @@ DDNet %s is out!
 == DDNet %s 已经更新了！
 
 Markers
-== 书签
+== 标记
 
 Filter connecting players
 == 筛选正在连接的玩家
 
 Markers:
-== 书签
+== 标记
 
 Zoom in
-== 视野放大
+== 放大视野
 
 1 new mention
-== 1 条新提及
+== 1 条新被提及消息
 
 Update failed! Check log...
 == 更新失败！请检查日志...
@@ -1004,7 +1005,7 @@ Successfully saved the replay!
 == 成功保存短时回放！
 
 Fetch Info
-== 回放详情
+== 回放信息
 
 Lock team
 == 锁定队伍
@@ -1031,7 +1032,7 @@ Hammerfly dummy
 == 分身 Hammerfly 开关
 
 Default length: %d
-== 时长: %d
+== 默认时长: %d
 
 Toggle ghost
 == 影子记录开关
@@ -1040,7 +1041,7 @@ Kill
 == 自杀
 
 Zoom out
-== 视野缩小
+== 缩小视野
 
 Show text entities
 == 显示文本实体
@@ -1052,7 +1053,7 @@ Toggle dyncam
 == 动态视野开关
 
 DDraceNetwork is a cooperative online game where the goal is for you and your group of tees to reach the finish line of the map. As a newcomer you should start on Novice servers, which host the easiest maps. Consider the ping to choose a server close to you.
-== DDraceNetwork 是一款在线合作游戏，你和你的团体里的 Tee 的目标是抵达地图的终点。作为新手你应该从有着最简单的地图的简单（Novice）服务器入门。根据延迟来选择离你相近的服务器。
+== DDraceNetwork 是一款在线合作游戏，你和你团体里的 Tee 的目标是抵达地图的终点。作为新手你应该从有着最简单地图 的简单（Novice）服务器入门。根据延迟来选择离你相近的服务器。
 
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 建议你在进入服务器前检查一下设置并根据你的喜好进行调整。
@@ -1067,7 +1068,7 @@ Server best:
 == 服务器最佳
 
 Learn
-== 教程Wiki
+== 教程 Wiki
 
 Use high DPI
 == 使用高 DPI
@@ -1131,7 +1132,7 @@ Run server
 == 运行服务器
 
 Server executable not found, can't run server
-== 找不到服务器的可执行文件，无法运行
+== 找不到服务器的可执行文件，无法运行服务器
 
 Editor
 == 编辑器
@@ -1233,7 +1234,7 @@ Discord
 == 开黑啦
 
 The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
-== 纹理文件 %s 的宽度无法被 %d 整除，或者高度无法被 %d 整除，这可能会导致视觉错误。
+== 纹理文件 %s 的宽度无法被 %d 整除，或者高度无法被 %d 整除，这可能会导致显示错误。
 
 Chat command
 == 聊天框指令（/）
@@ -1242,7 +1243,7 @@ Dummy
 == 分身
 
 Show client IDs
-== 显示客户端ID
+== 显示客户端 ID
 
 Laser Outline Color
 == 激光边框颜色
@@ -1344,7 +1345,7 @@ Windowed fullscreen
 == 窗口化全屏
 
 The format of texture %s is not RGBA which will cause visual bugs.
-== 纹理文件 %s 并非RGBA格式，这可能会导致视觉错误。
+== 纹理文件 %s 并非 RGBA 格式，这可能会导致显示错误。
 
 Join Tutorial Server
 == 进入教学服务器
@@ -1362,7 +1363,7 @@ custom
 == 自定义
 
 Graphics cards
-== 显示卡
+== 显卡
 
 auto
 == 自动