edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse source
This commit is contained in:
Headshot 2020-11-07 14:43:49 -03:00 committed by GitHub
parent 2ef7f2e6fb 92df1f1627
commit 86b1b86a1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 2715 additions and 2711 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/languages/belarusian.txt
View file

@ -832,7 +832,7 @@ Activate
Save Save
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Switch weapon when out of ammo Switch weapon when out of ammo

2
data/languages/bosnian.txt
View file

@ -1180,7 +1180,7 @@ Theme
Demos directory Demos directory
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Skip the main menu Skip the main menu

10
data/languages/brazilian_portuguese.txt
View file

@ -1279,7 +1279,7 @@ Your nickname '%s' is already used (%d points). Do you still want to use it?
Checking for existing player with your name Checking for existing player with your name
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Game sound volume Game sound volume
@ -1295,13 +1295,13 @@ Highlight
== ==
Manual Manual
== == Manual
Race Race
== == Corrida
Auto Auto
== == Auto
Replay Replay
== == Reproduzir

2
data/languages/bulgarian.txt
View file

@ -829,7 +829,7 @@ Activate
Save Save
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Switch weapon when out of ammo Switch weapon when out of ammo

10
data/languages/catalan.txt
View file

@ -1194,7 +1194,7 @@ Theme
Demos directory Demos directory
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Skip the main menu Skip the main menu
@ -1274,13 +1274,13 @@ Play
== ==
Manual Manual
== == Manual
Race Race
== == Carrera
Auto Auto
== == Auto
Replay Replay
== == Repetició

2
data/languages/chuvash.txt
View file

@ -832,7 +832,7 @@ Activate
Save Save
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Switch weapon when out of ammo Switch weapon when out of ammo

2
data/languages/czech.txt
View file

@ -835,7 +835,7 @@ Activate
Save Save
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Switch weapon when out of ammo Switch weapon when out of ammo

2
data/languages/danish.txt
View file

@ -832,7 +832,7 @@ Activate
Save Save
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Switch weapon when out of ammo Switch weapon when out of ammo

10
data/languages/dutch.txt
View file

@ -1206,7 +1206,7 @@ Theme
Demos directory Demos directory
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Skip the main menu Skip the main menu
@ -1286,16 +1286,16 @@ Play
== ==
Manual Manual
== == Manual
Race Race
== == Race
Auto Auto
== == Automatisch
Replay Replay
== == Herhaling
Net Net
== ==

2
data/languages/finnish.txt
View file

@ -833,7 +833,7 @@ Activate
Save Save
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Switch weapon when out of ammo Switch weapon when out of ammo

2637
data/languages/french.txt
View file

File diff suppressed because it is too large Load diff

6
data/languages/german.txt
View file

@ -1280,9 +1280,6 @@ Your nickname '%s' is already used (%d points). Do you still want to use it?
Checking for existing player with your name Checking for existing player with your name
== Prüfe auf existierenden Spieler mit deinem Namen == Prüfe auf existierenden Spieler mit deinem Namen
Smooth Camera
== Weiche Kamera
Game sound volume Game sound volume
== Spiel-Lautstärke == Spiel-Lautstärke
@ -1306,3 +1303,6 @@ Auto
Replay Replay
== Wiederholung == Wiederholung
Smooth Dynamic Camera
== Weiche Dynamische Kamera

2
data/languages/greek.txt
View file

@ -835,7 +835,7 @@ Activate
Save Save
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Switch weapon when out of ammo Switch weapon when out of ammo

2596
data/languages/hungarian.txt
View file

File diff suppressed because it is too large Load diff

2
data/languages/italian.txt
View file

@ -872,7 +872,7 @@ Activate
Save Save
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Switch weapon when out of ammo Switch weapon when out of ammo

2
data/languages/japanese.txt
View file

@ -832,7 +832,7 @@ Activate
Save Save
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Switch weapon when out of ammo Switch weapon when out of ammo

2
data/languages/korean.txt
View file

@ -834,7 +834,7 @@ Activate
Save Save
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Switch weapon when out of ammo Switch weapon when out of ammo

2
data/languages/kyrgyz.txt
View file

@ -826,7 +826,7 @@ Activate
Save Save
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Switch weapon when out of ammo Switch weapon when out of ammo

10
data/languages/norwegian.txt
View file

@ -1202,7 +1202,7 @@ Theme
Demos directory Demos directory
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Skip the main menu Skip the main menu
@ -1282,13 +1282,13 @@ Play
== ==
Manual Manual
== == Manuell
Race Race
== == Løp
Auto Auto
== == Auto
Replay Replay
== == Opptak

2
data/languages/persian.txt
View file

@ -601,7 +601,7 @@ Activate
Save Save
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Switch weapon on pickup Switch weapon on pickup

10
data/languages/polish.txt
View file

@ -1206,7 +1206,7 @@ Theme
Demos directory Demos directory
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Skip the main menu Skip the main menu
@ -1286,13 +1286,13 @@ Play
== ==
Manual Manual
== == Instrukcja
Race Race
== == Wyścig
Auto Auto
== == Auto
Replay Replay
== == Powtórka

2
data/languages/portuguese.txt
View file

@ -1040,7 +1040,7 @@ Activate
Save Save
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Reset wanted weapon on death Reset wanted weapon on death

2
data/languages/romanian.txt
View file

@ -841,7 +841,7 @@ Activate
Save Save
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Switch weapon when out of ammo Switch weapon when out of ammo

6
data/languages/russian.txt
View file

@ -1241,8 +1241,8 @@ Theme
Demos directory Demos directory
== Папка с демо == Папка с демо
Smooth Camera Smooth Dynamic Camera
== Плавная камера == Плавная Динамическая камера
Themes directory Themes directory
== Папка с темами == Папка с темами
@ -1287,7 +1287,7 @@ Assets directory
== Папка с графикой == Папка с графикой
Manual Manual
== == Ручное
Race Race
== Гонка == Гонка

2
data/languages/serbian.txt
View file

@ -836,7 +836,7 @@ Activate
Save Save
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Switch weapon when out of ammo Switch weapon when out of ammo

10
data/languages/serbian_cyrillic.txt
View file

@ -1259,7 +1259,7 @@ Your nickname '%s' is already used (%d points). Do you still want to use it?
Checking for existing player with your name Checking for existing player with your name
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Game sound volume Game sound volume
@ -1281,13 +1281,13 @@ Use current map as background
== ==
Manual Manual
== == Упутство
Race Race
== == Трка
Auto Auto
== == Ауто
Replay Replay
== == Помнови

10
data/languages/simplified_chinese.txt
View file

@ -1243,7 +1243,7 @@ Theme
Demos directory Demos directory
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Themes directory Themes directory
@ -1292,13 +1292,13 @@ Assets directory
== ==
Manual Manual
== == 手动
Race Race
== == 竞速赛
Auto Auto
== == 自动
Replay Replay
== == 回放

2
data/languages/slovak.txt
View file

@ -832,7 +832,7 @@ Activate
Save Save
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Switch weapon when out of ammo Switch weapon when out of ammo

4
data/languages/spanish.txt
View file

@ -1208,8 +1208,8 @@ Theme
Demos directory Demos directory
== Directorio de demos == Directorio de demos
Smooth Camera Smooth Dynamic Camera
== Cámara suave == Cámara dinámica suave
Skip the main menu Skip the main menu
== Saltar el menú principal == Saltar el menú principal

10
data/languages/swedish.txt
View file

@ -1238,7 +1238,7 @@ Theme
Demos directory Demos directory
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Themes directory Themes directory
@ -1284,13 +1284,13 @@ Assets directory
== ==
Manual Manual
== == Manual
Race Race
== == Race
Auto Auto
== == Auto
Replay Replay
== == Repris

10
data/languages/traditional_chinese.txt
View file

@ -1212,7 +1212,7 @@ Theme
Demos directory Demos directory
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Skip the main menu Skip the main menu
@ -1286,13 +1286,13 @@ Play
== ==
Manual Manual
== == 手動
Race Race
== == 競速賽
Auto Auto
== == 自動
Replay Replay
== == 回放

10
data/languages/turkish.txt
View file

@ -1209,7 +1209,7 @@ Theme
Demos directory Demos directory
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Skip the main menu Skip the main menu
@ -1286,13 +1286,13 @@ Play
== ==
Manual Manual
== == Manual
Race Race
== == Yarış
Auto Auto
== == Otomatik
Replay Replay
== == Yeniden oynatma

10
data/languages/ukrainian.txt
View file

@ -1204,7 +1204,7 @@ Markers
Demos directory Demos directory
== ==
Smooth Camera Smooth Dynamic Camera
== ==
Skip the main menu Skip the main menu
@ -1281,13 +1281,13 @@ Play
== ==
Manual Manual
== == Ручна
Race Race
== == Гонка
Auto Auto
== == Авто
Replay Replay
== == Повтор

8
src/game/client/components/camera.cpp
View file

@ -129,10 +129,10 @@ void CCamera::OnRender()
static vec2 s_CurrentCameraOffset[2] = {vec2(0, 0), vec2(0, 0)}; static vec2 s_CurrentCameraOffset[2] = {vec2(0, 0), vec2(0, 0)};
static float s_SpeedBias = 0.5f; static float s_SpeedBias = 0.5f;
if(g_Config.m_ClCameraSmoothness > 0) if(g_Config.m_ClDyncamSmoothness > 0)
{ {
float CameraSpeed = (1.0f - (g_Config.m_ClCameraSmoothness / 100.0f)) * 9.5f + 0.5f; float CameraSpeed = (1.0f - (g_Config.m_ClDyncamSmoothness / 100.0f)) * 9.5f + 0.5f;
float CameraStabilizingFactor = 1 + g_Config.m_ClCameraStabilizing / 100.0f; float CameraStabilizingFactor = 1 + g_Config.m_ClDyncamStabilizing / 100.0f;
s_SpeedBias += CameraSpeed * DeltaTime; s_SpeedBias += CameraSpeed * DeltaTime;
if(g_Config.m_ClDyncam) if(g_Config.m_ClDyncam)
@ -158,7 +158,7 @@ void CCamera::OnRender()
TargetCameraOffset = normalize(m_pClient->m_pControls->m_MousePos[g_Config.m_ClDummy]) * OffsetAmount; TargetCameraOffset = normalize(m_pClient->m_pControls->m_MousePos[g_Config.m_ClDummy]) * OffsetAmount;
} }
if(g_Config.m_ClCameraSmoothness > 0) if(g_Config.m_ClDyncamSmoothness > 0)
s_CurrentCameraOffset[g_Config.m_ClDummy] += (TargetCameraOffset - s_CurrentCameraOffset[g_Config.m_ClDummy]) * minimum(DeltaTime * s_SpeedBias, 1.0f); s_CurrentCameraOffset[g_Config.m_ClDummy] += (TargetCameraOffset - s_CurrentCameraOffset[g_Config.m_ClDummy]) * minimum(DeltaTime * s_SpeedBias, 1.0f);
else else
s_CurrentCameraOffset[g_Config.m_ClDummy] = TargetCameraOffset; s_CurrentCameraOffset[g_Config.m_ClDummy] = TargetCameraOffset;

21
src/game/client/components/menus_settings.cpp
View file

@ -107,19 +107,22 @@ void CMenus::RenderSettingsGeneral(CUIRect MainView)
} }
} }
// smooth camera // smooth dynamic camera
Left.HSplitTop(5.0f, 0, &Left); Left.HSplitTop(5.0f, 0, &Left);
Left.HSplitTop(20.0f, &Button, &Left); Left.HSplitTop(20.0f, &Button, &Left);
if(DoButton_CheckBox(&g_Config.m_ClCameraSmoothness, Localize("Smooth Camera"), g_Config.m_ClCameraSmoothness, &Button)) if(g_Config.m_ClDyncam)
{ {
if(g_Config.m_ClCameraSmoothness) if(DoButton_CheckBox(&g_Config.m_ClDyncamSmoothness, Localize("Smooth Dynamic Camera"), g_Config.m_ClDyncamSmoothness, &Button))
{ {
g_Config.m_ClCameraSmoothness = 0; if(g_Config.m_ClDyncamSmoothness)
} {
else g_Config.m_ClDyncamSmoothness = 0;
{ }
g_Config.m_ClCameraSmoothness = 50; else
g_Config.m_ClCameraStabilizing = 50; {
g_Config.m_ClDyncamSmoothness = 50;
g_Config.m_ClDyncamStabilizing = 50;
}
} }
} }

4
src/game/variables.h
View file

@ -71,8 +71,8 @@ MACRO_CONFIG_INT(ClDyncamMousesens, cl_dyncam_mousesens, 0, 0, 100000, CFGFLAG_C
MACRO_CONFIG_INT(ClDyncamDeadzone, cl_dyncam_deadzone, 300, 1, 1300, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Dynamic camera dead zone") MACRO_CONFIG_INT(ClDyncamDeadzone, cl_dyncam_deadzone, 300, 1, 1300, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Dynamic camera dead zone")
MACRO_CONFIG_INT(ClDyncamFollowFactor, cl_dyncam_follow_factor, 60, 0, 200, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Dynamic camera follow factor") MACRO_CONFIG_INT(ClDyncamFollowFactor, cl_dyncam_follow_factor, 60, 0, 200, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Dynamic camera follow factor")
MACRO_CONFIG_INT(ClCameraSmoothness, cl_camera_smoothness, 0, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Transition amount of the camera movement, 0=instant, 100=slow and smooth") MACRO_CONFIG_INT(ClDyncamSmoothness, cl_dyncam_smoothness, 0, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Transition amount of the camera movement, 0=instant, 100=slow and smooth")
MACRO_CONFIG_INT(ClCameraStabilizing, cl_camera_stabilizing, 0, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Amount of camera slowdown during fast cursor movement. High value can cause delay in camera movement") MACRO_CONFIG_INT(ClDyncamStabilizing, cl_dyncam_stabilizing, 0, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Amount of camera slowdown during fast cursor movement. High value can cause delay in camera movement")
MACRO_CONFIG_INT(EdZoomTarget, ed_zoom_target, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Zoom to the current mouse target") MACRO_CONFIG_INT(EdZoomTarget, ed_zoom_target, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Zoom to the current mouse target")
MACRO_CONFIG_INT(EdShowkeys, ed_showkeys, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "") MACRO_CONFIG_INT(EdShowkeys, ed_showkeys, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "")