Merge branch 'ddnet' into chillerbot

chillerbot · Aug 21, 2022 · 84d6d57 · 84d6d57
2 parents bb80ed2 + 4fc6a5b
commit 84d6d57
Show file tree

Hide file tree

Showing 117 changed files with 3,771 additions and 3,338 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -726,7 +726,7 @@ endif()
 if(TARGET_OS STREQUAL "windows")
   set(PLATFORM_CLIENT)
   set(PLATFORM_CLIENT_LIBS opengl32 winmm)
-  set(PLATFORM_LIBS version ws2_32) # Windows sockets
+  set(PLATFORM_LIBS shlwapi version ws2_32) # Windows sockets
 elseif(TARGET_OS STREQUAL "mac")
   find_library(CARBON Carbon)
   find_library(COCOA Cocoa)
@@ -2169,8 +2169,8 @@ if(CLIENT)
     skin.h
     ui.cpp
     ui.h
-    ui_ex.cpp
-    ui_ex.h
+    ui_rect.cpp
+    ui_rect.h
   )
   set_src(GAME_EDITOR GLOB_RECURSE src/game/editor
     auto_map.cpp
@@ -2353,12 +2353,15 @@ if(SERVER)
     databases/connection_pool.h
     databases/mysql.cpp
     databases/sqlite.cpp
+    main.cpp
     name_ban.cpp
     name_ban.h
     register.cpp
     register.h
     server.cpp
     server.h
+    server_logger.cpp
+    server_logger.h
     sql_string_helpers.cpp
     sql_string_helpers.h
     upnp.cpp

diff --git a/data/languages/arabic.txt b/data/languages/arabic.txt
@@ -1195,6 +1195,9 @@ Connected
 Loading map file from storage
 == 
 
+Why are you slowmo replaying to read this?
+== 
+
 Initializing components
 == 
 
@@ -1237,9 +1240,6 @@ Getting game info
 Requesting to join the game
 == 
 
-Sending intial client info
-== 
-
 Are you sure that you want to disconnect and switch to a different server?
 == 
 

diff --git a/data/languages/belarusian.txt b/data/languages/belarusian.txt
@@ -631,6 +631,9 @@ Loading map file from storage
 Loading DDNet Client
 == 
 
+Why are you slowmo replaying to read this?
+== 
+
 Initializing components
 == 
 
@@ -697,9 +700,6 @@ Getting game info
 Requesting to join the game
 == 
 
-Sending intial client info
-== 
-
 Reconnect in %d sec
 == 
 

diff --git a/data/languages/bosnian.txt b/data/languages/bosnian.txt
@@ -1057,6 +1057,9 @@ Connected
 Loading map file from storage
 == 
 
+Why are you slowmo replaying to read this?
+== 
+
 Initializing components
 == 
 
@@ -1105,9 +1108,6 @@ Getting game info
 Requesting to join the game
 == 
 
-Sending intial client info
-== 
-
 Existing Player
 == 
 

diff --git a/data/languages/brazilian_portuguese.txt b/data/languages/brazilian_portuguese.txt
@@ -1,4 +1,4 @@
-##### authors #####
+##### authors #####
 #originally created by:
 # slinack
 #modified by:
@@ -63,7 +63,7 @@ All
 == Todos
 
 Are you sure that you want to delete the demo?
-== Tem certeza que deseja deletar o demo?
+== Tem certeza que deseja deletar a demo?
 
 Are you sure that you want to quit?
 == Você tem certeza que deseja sair?
@@ -135,7 +135,7 @@ Delete demo
 == Deletar demo
 
 Demo details
-== Detalhes do demo
+== Detalhes da demo
 
 Demofile: %s
 == Demo: %s
@@ -487,10 +487,10 @@ Type
 == Tipo
 
 Unable to delete the demo
-== Não foi possível deletar o demo
+== Não foi possível deletar a demo
 
 Unable to rename the demo
-== Não foi possível renomear o demo
+== Não foi possível renomear a demo
 
 Use sounds
 == Usar sons
@@ -1471,106 +1471,106 @@ Extras
 == Extras
 
 Preparing demo playback
-== 
+== Preparando reprodução da demo
 
 Connected
-== 
+== Conectado
 
 Loading map file from storage
-== 
+== Carregando arquivo de mapa do armazenamento
+
+Why are you slowmo replaying to read this?
+== Por que você está respondendo em câmera lenta para ler isso?
 
 Initializing components
-== 
+== Inicializando componentes
 
 Initializing assets
-== 
+== Inicializando ativos
 
 Initializing map logic
-== 
+== Inicializando lógica de mapa
 
 Sending initial client info
-== 
+== Enviando info iniciais do cliente
 
 Uploading map data to GPU
-== 
+== Carregando dados de mapa para GPU
 
 Getting game info
-== 
+== Obtendo info do jogo
 
 Requesting to join the game
-== 
-
-Sending intial client info
-== 
+== Solicitando entrada no jogo
 
 Loading menu images
-== 
+== Carregando imagens de menu
 
 Loading demo files
-== 
+== Carregando arquivos de demo
 
 Loading ghost files
-== 
+== Carregando arquivos de fantasma
 
 Loading skin files
-== 
+== Carregando arquivos de skins
 
 Appearance
-== 
+== Aparência
 
 Name Plate
-== 
+== Placa de nome
 
 Hook Collisions
-== 
+== Colisões de gancho
 
 Show health, shields and ammo
-== 
+== Mostrar saúde, escudos e munição
 
 DDRace HUD
-== 
+== HUD do DDRace
 
 Show client IDs in scoreboard
-== 
+== Mostrar IDs de cliente no placar
 
 Show DDRace HUD
-== 
+== Mostrar HUD do DDRace
 
 Show jumps indicator
-== 
+== Mostrar indicador de pulos
 
 Show hook strength indicator
-== 
+== Mostrar indicador de força do gancho
 
 Hook collision line
-== 
+== Linha de colisão do gancho
 
 Hook collision line width
-== 
+== Largura da linha de colisão do gancho
 
 Hook collision line opacity
-== 
+== Opacidade da linha de colisão do gancho
 
 Colors of the hook collision line, in case of a possible collision with:
-== 
+== Cores da linha de colisão do gancho, no caso de uma possível colisão com:
 
 Your movements are not taken into account when calculating the line colors
-== 
+== Seus movimentos não são levados em conta ao calcular as cores de linha
 
 Nothing hookable
-== 
+== Nada enganchável
 
 Something hookable
-== 
+== Alguma coisa enganchável
 
 A Tee
-== 
+== Um tee
 
 Loading assets
-== 
+== Carregando ativos
 
 Loading race demo files
-== 
+== Carregando arquivos de demo de corrida
 
 Loading sound files
-== 
+== Carregando arquivos de som
diff --git a/data/languages/bulgarian.txt b/data/languages/bulgarian.txt
@@ -628,6 +628,9 @@ Loading map file from storage
 Loading DDNet Client
 == 
 
+Why are you slowmo replaying to read this?
+== 
+
 Initializing components
 == 
 
@@ -694,9 +697,6 @@ Getting game info
 Requesting to join the game
 == 
 
-Sending intial client info
-== 
-
 Reconnect in %d sec
 == 
 

diff --git a/data/languages/catalan.txt b/data/languages/catalan.txt
@@ -1318,6 +1318,9 @@ Connected
 Loading map file from storage
 == 
 
+Why are you slowmo replaying to read this?
+== 
+
 Initializing components
 == 
 
@@ -1360,9 +1363,6 @@ Getting game info
 Requesting to join the game
 == 
 
-Sending intial client info
-== 
-
 Loading menu images
 == 
 

diff --git a/data/languages/chuvash.txt b/data/languages/chuvash.txt
@@ -631,6 +631,9 @@ Loading map file from storage
 Loading DDNet Client
 == 
 
+Why are you slowmo replaying to read this?
+== 
+
 Initializing components
 == 
 
@@ -697,9 +700,6 @@ Getting game info
 Requesting to join the game
 == 
 
-Sending intial client info
-== 
-
 Reconnect in %d sec
 == 
 

diff --git a/data/languages/czech.txt b/data/languages/czech.txt
@@ -1208,6 +1208,9 @@ Connected
 Loading map file from storage
 == 
 
+Why are you slowmo replaying to read this?
+== 
+
 Initializing components
 == 
 
@@ -1250,9 +1253,6 @@ Getting game info
 Requesting to join the game
 == 
 
-Sending intial client info
-== 
-
 Are you sure that you want to disconnect and switch to a different server?
 == 
 

diff --git a/data/languages/danish.txt b/data/languages/danish.txt
@@ -1206,6 +1206,9 @@ Connected
 Loading map file from storage
 == 
 
+Why are you slowmo replaying to read this?
+== 
+
 Initializing components
 == 
 
@@ -1248,9 +1251,6 @@ Getting game info
 Requesting to join the game
 == 
 
-Sending intial client info
-== 
-
 Are you sure that you want to disconnect and switch to a different server?
 == 
 

diff --git a/data/languages/dutch.txt b/data/languages/dutch.txt
@@ -1367,6 +1367,9 @@ Connected
 Loading map file from storage
 == 
 
+Why are you slowmo replaying to read this?
+== 
+
 Initializing components
 == 
 
@@ -1409,9 +1412,6 @@ Getting game info
 Requesting to join the game
 == 
 
-Sending intial client info
-== 
-
 Loading menu images
 ==