From 94fb81466fe61d45c3936024af4f69e863bb2745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 12 Dec 2023 17:55:13 +0100 Subject: [PATCH] Tilt: Make the deadzone circular, in addition to the inverse (low end radius). --- Core/Config.cpp | 2 +- Core/Config.h | 2 +- Core/TiltEventProcessor.cpp | 48 ++++++++++++++++++++++++++++----- UI/TiltAnalogSettingsScreen.cpp | 2 +- assets/lang/ar_AE.ini | 2 +- assets/lang/az_AZ.ini | 2 +- assets/lang/bg_BG.ini | 2 +- assets/lang/ca_ES.ini | 2 +- assets/lang/cz_CZ.ini | 2 +- assets/lang/da_DK.ini | 2 +- assets/lang/de_DE.ini | 2 +- assets/lang/dr_ID.ini | 2 +- assets/lang/en_US.ini | 2 +- assets/lang/es_ES.ini | 2 +- assets/lang/es_LA.ini | 2 +- assets/lang/fa_IR.ini | 2 +- assets/lang/fi_FI.ini | 2 +- assets/lang/fr_FR.ini | 2 +- assets/lang/gl_ES.ini | 2 +- assets/lang/gr_EL.ini | 2 +- assets/lang/he_IL.ini | 2 +- assets/lang/he_IL_invert.ini | 2 +- assets/lang/hr_HR.ini | 2 +- assets/lang/hu_HU.ini | 2 +- assets/lang/id_ID.ini | 2 +- assets/lang/it_IT.ini | 2 +- assets/lang/ja_JP.ini | 2 +- assets/lang/jv_ID.ini | 2 +- assets/lang/ko_KR.ini | 2 +- assets/lang/lo_LA.ini | 2 +- assets/lang/lt-LT.ini | 2 +- assets/lang/ms_MY.ini | 2 +- assets/lang/nl_NL.ini | 2 +- assets/lang/no_NO.ini | 2 +- assets/lang/pl_PL.ini | 2 +- assets/lang/pt_BR.ini | 10 +++---- assets/lang/pt_PT.ini | 4 +-- assets/lang/ro_RO.ini | 2 +- assets/lang/ru_RU.ini | 2 +- assets/lang/sv_SE.ini | 2 +- assets/lang/tg_PH.ini | 2 +- assets/lang/th_TH.ini | 2 +- assets/lang/tr_TR.ini | 2 +- assets/lang/uk_UA.ini | 2 +- assets/lang/vi_VN.ini | 2 +- assets/lang/zh_CN.ini | 2 +- assets/lang/zh_TW.ini | 2 +- 47 files changed, 93 insertions(+), 57 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index c7b194a3a35f..c11e63d33ce8 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -781,7 +781,7 @@ static const ConfigSetting controlSettings[] = { ConfigSetting("TiltSensitivityY", &g_Config.iTiltSensitivityY, 60, CfgFlag::PER_GAME), ConfigSetting("TiltAnalogDeadzoneRadius", &g_Config.fTiltAnalogDeadzoneRadius, 0.0f, CfgFlag::PER_GAME), ConfigSetting("TiltInverseDeadzone", &g_Config.fTiltInverseDeadzone, 0.0f, CfgFlag::PER_GAME), - ConfigSetting("TiltCircularInverseDeadzone", &g_Config.bTiltCircularInverseDeadzone, true, CfgFlag::PER_GAME), + ConfigSetting("TiltCircularDeadzone", &g_Config.bTiltCircularDeadzone, true, CfgFlag::PER_GAME), ConfigSetting("TiltInputType", &g_Config.iTiltInputType, 0, CfgFlag::PER_GAME), #endif diff --git a/Core/Config.h b/Core/Config.h index de2d6971cbfe..2129637a6dcc 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -293,7 +293,7 @@ struct Config { // The deadzone radius of the tilt. Only used in the analog mapping. float fTiltAnalogDeadzoneRadius; float fTiltInverseDeadzone; // An inverse deadzone for the output, counteracting excessive deadzones applied by games. See #17483. - bool bTiltCircularInverseDeadzone; + bool bTiltCircularDeadzone; // Type of tilt input currently selected: Defined in TiltEventProcessor.h // 0 - no tilt, 1 - analog stick, 2 - D-Pad, 3 - Action Buttons (Tri, Cross, Square, Circle) int iTiltInputType; diff --git a/Core/TiltEventProcessor.cpp b/Core/TiltEventProcessor.cpp index 63003d47f8ae..1ec92f741c15 100644 --- a/Core/TiltEventProcessor.cpp +++ b/Core/TiltEventProcessor.cpp @@ -34,7 +34,7 @@ void GenerateTriggerButtonEvent(int digitalX, int digitalY); // deadzone is normalized - 0 to 1 // sensitivity controls how fast the deadzone reaches max value -inline float ApplyDeadzone(float x, float deadzone) { +inline float ApplyDeadzoneAxis(float x, float deadzone) { if (deadzone >= 0.99f) { // Meaningless, and not reachable with normal controls. return x; @@ -49,14 +49,48 @@ inline float ApplyDeadzone(float x, float deadzone) { } } +inline void ApplyDeadzoneXY(float tiltX, float tiltY, float *adjustedTiltX, float *adjustedTiltY, float deadzone, bool circular) { + if (circular) { + if (tiltX == 0.0f && tiltY == 0.0f) { + *adjustedTiltX = 0.0f; + *adjustedTiltY = 0.0f; + return; + } + + float magnitude = sqrtf(tiltX * tiltX + tiltY * tiltY); + if (magnitude <= deadzone + 0.00001f) { + *adjustedTiltX = 0.0f; + *adjustedTiltY = 0.0f; + return; + } + + float factor = 1.0f / (1.0f - deadzone); + float newMagnitude = (magnitude - deadzone) * factor; + + *adjustedTiltX = (tiltX / magnitude) * newMagnitude; + *adjustedTiltY = (tiltY / magnitude) * newMagnitude; + } else { + *adjustedTiltX = ApplyDeadzoneAxis(tiltX, deadzone); + *adjustedTiltY = ApplyDeadzoneAxis(tiltY, deadzone); + } +} + // Also clamps to -1.0..1.0. // This applies a (circular if desired) inverse deadzone. inline void ApplyInverseDeadzone(float x, float y, float *outX, float *outY, float inverseDeadzone, bool circular) { if (inverseDeadzone == 0.0f) { *outX = Clamp(x, -1.0f, 1.0f); *outY = Clamp(y, -1.0f, 1.0f); + return; } + if (circular) { + // If the regular deadzone centered it, let's leave it as-is. + if (x == 0.0f && y == 0.0f) { + *outX = x; + *outY = y; + return; + } float magnitude = sqrtf(x * x + y * y); if (magnitude > 0.00001f) { magnitude = (magnitude + inverseDeadzone) / magnitude; @@ -64,8 +98,9 @@ inline void ApplyInverseDeadzone(float x, float y, float *outX, float *outY, flo *outX = Clamp(x * magnitude, -1.0f, 1.0f); *outY = Clamp(y * magnitude, -1.0f, 1.0f); } else { - *outX = Clamp(x + copysignf(inverseDeadzone, x), -1.0f, 1.0f); - *outY = Clamp(y + copysignf(inverseDeadzone, y), -1.0f, 1.0f); + // If the regular deadzone centered it, let's leave it as-is. + *outX = x == 0.0f ? 0.0f : Clamp(x + copysignf(inverseDeadzone, x), -1.0f, 1.0f); + *outY = y == 0.0f ? 0.0f : Clamp(y + copysignf(inverseDeadzone, y), -1.0f, 1.0f); } } @@ -113,8 +148,9 @@ void ProcessTilt(bool landscape, float calibrationAngle, float x, float y, float if (g_Config.iTiltInputType == TILT_ANALOG) { // Only analog mappings use the deadzone. - float adjustedTiltX = ApplyDeadzone(tiltX, g_Config.fTiltAnalogDeadzoneRadius); - float adjustedTiltY = ApplyDeadzone(tiltY, g_Config.fTiltAnalogDeadzoneRadius); + float adjustedTiltX; + float adjustedTiltY; + ApplyDeadzoneXY(tiltX, tiltY, &adjustedTiltX, &adjustedTiltY, g_Config.fTiltAnalogDeadzoneRadius, g_Config.bTiltCircularDeadzone); _dbg_assert_(!my_isnanorinf(adjustedTiltX)); _dbg_assert_(!my_isnanorinf(adjustedTiltY)); @@ -122,7 +158,7 @@ void ProcessTilt(bool landscape, float calibrationAngle, float x, float y, float // Unlike regular deadzone, where per-axis is okay, inverse deadzone (to compensate for game deadzones) really needs to be // applied on the two axes together. // TODO: Share this code with the joystick code. For now though, we keep it separate. - ApplyInverseDeadzone(adjustedTiltX, adjustedTiltY, &adjustedTiltX, &adjustedTiltY, g_Config.fTiltInverseDeadzone, g_Config.bTiltCircularInverseDeadzone); + ApplyInverseDeadzone(adjustedTiltX, adjustedTiltY, &adjustedTiltX, &adjustedTiltY, g_Config.fTiltInverseDeadzone, g_Config.bTiltCircularDeadzone); _dbg_assert_(!my_isnanorinf(adjustedTiltX)); _dbg_assert_(!my_isnanorinf(adjustedTiltY)); diff --git a/UI/TiltAnalogSettingsScreen.cpp b/UI/TiltAnalogSettingsScreen.cpp index 4f3d3d215ad0..1488f75e2bcb 100644 --- a/UI/TiltAnalogSettingsScreen.cpp +++ b/UI/TiltAnalogSettingsScreen.cpp @@ -124,7 +124,7 @@ void TiltAnalogSettingsScreen::CreateViews() { if (g_Config.iTiltInputType == 1) { settings->Add(new PopupSliderChoiceFloat(&g_Config.fTiltAnalogDeadzoneRadius, 0.0f, 0.8f, 0.0f, co->T("Deadzone radius"), 0.02f, screenManager(), "/ 1.0"))->SetEnabledFunc(enabledFunc); settings->Add(new PopupSliderChoiceFloat(&g_Config.fTiltInverseDeadzone, 0.0f, 0.8f, 0.0f, co->T("Low end radius"), 0.02f, screenManager(), "/ 1.0"))->SetEnabledFunc(enabledFunc); - settings->Add(new CheckBox(&g_Config.bTiltCircularInverseDeadzone, co->T("Circular low end radius")))->SetEnabledFunc(enabledFunc); + settings->Add(new CheckBox(&g_Config.bTiltCircularDeadzone, co->T("Circular deadzone")))->SetEnabledFunc(enabledFunc); } settings->Add(new PopupSliderChoice(&g_Config.iTiltSensitivityX, 0, 100, 60, co->T("Tilt Sensitivity along X axis"), screenManager(), "%"))->SetEnabledFunc(enabledFunc); settings->Add(new PopupSliderChoice(&g_Config.iTiltSensitivityY, 0, 100, 60, co->T("Tilt Sensitivity along Y axis"), screenManager(), "%"))->SetEnabledFunc(enabledFunc); diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini index 410f5b14863a..bbbd443f56de 100644 --- a/assets/lang/ar_AE.ini +++ b/assets/lang/ar_AE.ini @@ -103,7 +103,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = ‎معايرة Calibrated = Calibrated Calibration = ‎المعايرة -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = ‎كلاسيكي Confine Mouse = ‎حجز مؤشر الماوس في حدود نافذة البرنامج diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini index 2e4b3cecc397..1301de9f485b 100644 --- a/assets/lang/az_AZ.ini +++ b/assets/lang/az_AZ.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Calibrate Calibrated = Calibrated Calibration = Calibration -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Classic Confine Mouse = Trap mouse within window/display area diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini index 99a0f244ab4a..1aa610abdaad 100644 --- a/assets/lang/bg_BG.ini +++ b/assets/lang/bg_BG.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Calibrate Calibrated = Calibrated Calibration = Calibration -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Класик Confine Mouse = Trap mouse within window/display area diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini index 276cb290327e..5cedf68f46ed 100644 --- a/assets/lang/ca_ES.ini +++ b/assets/lang/ca_ES.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Calibrar Calibrated = Calibrat Calibration = Calibració -Circular low end radius = Ràdio inferior circular +Circular deadzone = Zona inactiva circular Circular stick input = Entrada de stick circular Classic = Clàssic Confine Mouse = Fixar el ratolí a l'àrea de la finestra/pantalla diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini index bfbce0ebb387..106f9e88c452 100644 --- a/assets/lang/cz_CZ.ini +++ b/assets/lang/cz_CZ.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Kalibrovat Calibrated = Calibrated Calibration = Kalibrace -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Klasický Confine Mouse = Trap mouse within window/display area diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini index 6e0bb9d68ee3..f1e89bd9916e 100644 --- a/assets/lang/da_DK.ini +++ b/assets/lang/da_DK.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Kalibrer Calibrated = Calibrated Calibration = Kalibrering -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Klassisk Confine Mouse = Begræns mus indenfor vindue/skærmområde diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini index c83b277bed32..9a08c81c53e9 100644 --- a/assets/lang/de_DE.ini +++ b/assets/lang/de_DE.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Kalibriere Analog Stick Calibrate = Kalibriere Steuerkreuz Calibrated = Kalibriert Calibration = Kalibrierung -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Klassisch Confine Mouse = Maus in Fenster/sichtbaren Bereich einsperren diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini index 9cb388ae4b1c..bcb8498586e7 100644 --- a/assets/lang/dr_ID.ini +++ b/assets/lang/dr_ID.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Calibrate Calibrated = Calibrated Calibration = Calibration -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Classic Confine Mouse = Trap mouse within window/display area diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini index 009cd70e5788..b54d422824c6 100644 --- a/assets/lang/en_US.ini +++ b/assets/lang/en_US.ini @@ -119,7 +119,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Calibrate Calibrated = Calibrated Calibration = Calibration -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Classic Confine Mouse = Trap mouse within window/display area diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini index dac9d446dd59..2089167b991f 100644 --- a/assets/lang/es_ES.ini +++ b/assets/lang/es_ES.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrar stick Calibrate = Calibrar Calibrated = Calibrado Calibration = Calibración -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Entrada de stick circular Classic = Clásico Confine Mouse = Fijar el ratón al área de la ventana/pantalla diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini index dd8d824bc170..264ca4215651 100644 --- a/assets/lang/es_LA.ini +++ b/assets/lang/es_LA.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrar análogo Calibrate = Calibrar Calibrated = Calibrado Calibration = Calibración -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Entrada del stick circular Classic = Clásico Confine Mouse = Fijar el ratón al área de la ventana/pantalla diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini index 8121cd95190f..e1f2373147b4 100644 --- a/assets/lang/fa_IR.ini +++ b/assets/lang/fa_IR.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = دسته آنالوگ را کالیبراسیون کن Calibrate = ‎کالیبره کردن Calibrated = کالیبراسیون شد Calibration = ‎کالیبره کردن -Circular low end radius = Circular شعاع کم پایان +Circular deadzone = Circular شعاع کم پایان Circular stick input = ورودی دایره ای Classic = ‎کلاسیک Confine Mouse = ‎محدود کردن موس به ناحیه درون پنجره diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini index 956c2e996d72..8dbd57d39827 100644 --- a/assets/lang/fi_FI.ini +++ b/assets/lang/fi_FI.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Kalibroi analoginen sauva Calibrate = Kalibroi Calibrated = Kalibroitu Calibration = Kalibraatio -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Klassinen Confine Mouse = Kaappaa hiiri ikkunan/näytön sisälle diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini index 8dfc9262eed3..7274fa089f4b 100644 --- a/assets/lang/fr_FR.ini +++ b/assets/lang/fr_FR.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Étalonner Calibrated = Calibrated Calibration = Étalonnage -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Classique Confine Mouse = Capturer la souris dans la fenêtre/zone d'affichage diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini index 3770d4279a81..9155ef730d2a 100644 --- a/assets/lang/gl_ES.ini +++ b/assets/lang/gl_ES.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Calibrar Calibrated = Calibrated Calibration = Calibración -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Clásico Confine Mouse = Trap mouse within window/display area diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini index af17d0354156..10d731d33b3c 100644 --- a/assets/lang/gr_EL.ini +++ b/assets/lang/gr_EL.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Βαθμονόμηση Calibrated = Calibrated Calibration = Βαθμονόμηση ψηφιακού πληκρολογίου -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Κλασικό Confine Mouse = Εγκλωβισμός ποντικιού μέσα στην περιοχή παραθύρου/οθόνης diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini index d1e2e9d54c86..97cf116297aa 100644 --- a/assets/lang/he_IL.ini +++ b/assets/lang/he_IL.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Calibrate Calibrated = Calibrated Calibration = Calibration -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Classic Confine Mouse = Trap mouse within window/display area diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini index fc198ee91a90..642988c35a98 100644 --- a/assets/lang/he_IL_invert.ini +++ b/assets/lang/he_IL_invert.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Calibrate Calibrated = Calibrated Calibration = Calibration -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Classic Confine Mouse = Trap mouse within window/display area diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini index 29a6c303347a..ed55312874dd 100644 --- a/assets/lang/hr_HR.ini +++ b/assets/lang/hr_HR.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Kalibriraj Calibrated = Calibrated Calibration = Kalibracija -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Klasično Confine Mouse = Zaključaj miš u window/display području diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini index 2920ead21c5f..6e9fb80d78aa 100644 --- a/assets/lang/hu_HU.ini +++ b/assets/lang/hu_HU.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Kalibrálása Calibrated = Calibrated Calibration = Kalibrálás -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Klasszikus Confine Mouse = Egérkurzor rögzítése az ablakhoz diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini index f187f91f3751..6e519251cb53 100644 --- a/assets/lang/id_ID.ini +++ b/assets/lang/id_ID.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Kalibrasi stik analog Calibrate = Kalibrasi Calibrated = Dikalibrasi Calibration = Kalibrasi -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Masukan stik melingkar Classic = Klasik Confine Mouse = Kunci mouse di area layar diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini index 37d2aa8a543c..738b7b42385a 100644 --- a/assets/lang/it_IT.ini +++ b/assets/lang/it_IT.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibra Stick Analogico Calibrate = Calibra Calibrated = Calibrato Calibration = Calibratura -Circular low end radius = Raggio circolare di base +Circular deadzone = Raggio circolare di base Circular stick input = Input circolare levetta Classic = Classico Confine Mouse = Confina il mouse all'interno dell'area della finestra diff --git a/assets/lang/ja_JP.ini b/assets/lang/ja_JP.ini index a7d279a5147c..badd09796010 100644 --- a/assets/lang/ja_JP.ini +++ b/assets/lang/ja_JP.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = アナログスティックをキャリブレートす Calibrate = キャリブレート Calibrated = キャリブレーション\n（調整）された動作 Calibration = キャリブレーション -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = 環状スティック入力 Classic = クラシック Confine Mouse = ウィンドウ/表示領域内でマウスをトラップする diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini index 63c7ea4fd6a0..d534731ce8b3 100644 --- a/assets/lang/jv_ID.ini +++ b/assets/lang/jv_ID.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Kalibrasi Calibrated = Calibrated Calibration = Kalibrasi -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Klasik Confine Mouse = Trap mouse within window/display area diff --git a/assets/lang/ko_KR.ini b/assets/lang/ko_KR.ini index b5aa3664c925..b117dd049c85 100644 --- a/assets/lang/ko_KR.ini +++ b/assets/lang/ko_KR.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = 아날로그 스틱 보정 Calibrate = 보정 Calibrated = 보정됨 Calibration = 교정 -Circular low end radius = 원형 하단 반경 +Circular deadzone = 원형 하단 반경 Circular stick input = 원형 스틱 입력 Classic = 클래식 Confine Mouse = 창/표시 영역 내에서 마우스 트랩 diff --git a/assets/lang/lo_LA.ini b/assets/lang/lo_LA.ini index 8008a5b5a667..cda85ca02cf5 100644 --- a/assets/lang/lo_LA.ini +++ b/assets/lang/lo_LA.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = ປັບຄ່າຄວາມຄາດເຄື່ອນຂອງ Calibrated = Calibrated Calibration = ປັບຄ່າຄວາມຄາດເຄື່ອນ -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = ແບບດັ້ງເດີມ Confine Mouse = ຈຳກັດເມົ້າໃນໜ້າຕ່າງ/ພື້ນທີ່ສະແດງຜົນ diff --git a/assets/lang/lt-LT.ini b/assets/lang/lt-LT.ini index 48ee31d00f9a..a66292d0fb70 100644 --- a/assets/lang/lt-LT.ini +++ b/assets/lang/lt-LT.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Kalibruoti Calibrated = Calibrated Calibration = Kalibravimas -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Klasikinis Confine Mouse = Trap mouse within window/display area diff --git a/assets/lang/ms_MY.ini b/assets/lang/ms_MY.ini index f7e83b17d496..4674cc00038e 100644 --- a/assets/lang/ms_MY.ini +++ b/assets/lang/ms_MY.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Calibrate Calibrated = Calibrated Calibration = Calibration -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Klasik Confine Mouse = Trap mouse within window/display area diff --git a/assets/lang/nl_NL.ini b/assets/lang/nl_NL.ini index e8b10427db3d..6ec8afc49ac8 100644 --- a/assets/lang/nl_NL.ini +++ b/assets/lang/nl_NL.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Kalibreren Calibrated = Calibrated Calibration = Kalibreren -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Klassiek Confine Mouse = Muis binnen venster/weergavegebied vastzetten diff --git a/assets/lang/no_NO.ini b/assets/lang/no_NO.ini index 98f09f72adf4..f6d4ba950c25 100644 --- a/assets/lang/no_NO.ini +++ b/assets/lang/no_NO.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Kalibrer Calibrated = Calibrated Calibration = Calibration -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Classic Confine Mouse = Trap mouse within window/display area diff --git a/assets/lang/pl_PL.ini b/assets/lang/pl_PL.ini index 6c41c7bd8e04..ded47eb10056 100644 --- a/assets/lang/pl_PL.ini +++ b/assets/lang/pl_PL.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Kalibracja Analoga Calibrate = Kalibracja Calibrated = Skalibrowany Calibration = Kalibracja -Circular low end radius = Okrągły promień dolny +Circular deadzone = Okrągły promień dolny Circular stick input = Okrągły odczyt analoga Classic = Klasyczny Confine Mouse = Zablokuj myszkę w oknie diff --git a/assets/lang/pt_BR.ini b/assets/lang/pt_BR.ini index f5e298310042..2bd1724846e3 100644 --- a/assets/lang/pt_BR.ini +++ b/assets/lang/pt_BR.ini @@ -119,7 +119,7 @@ Calibrate Analog Stick = Calibrar Direcional Analógico Calibrate = Calibrar Calibrated = Calibrado Calibration = Calibração -Circular low end radius = Raio low end circular +Circular deadzone = Zona morta circular Circular stick input = Entrada circular do direcional Classic = Clássico Confine Mouse = Travar o mouse dentro da janela/área de exibição @@ -987,10 +987,10 @@ tools = Ferramentas grátis usadas: # Leave extra lines blank. 4 contributors per line seems to look best. translators1 = Papel, gabrielmop, Efraim Lopes, AkiraJkr translators2 = Felipe -translators3 = -translators4 = -translators5 = -translators6 = +translators3 = +translators4 = +translators5 = +translators6 = Twitter @PPSSPP_emu = Twitter @PPSSPP_emu website = Verifique o site da web: written = Escrito em C++ pela velocidade e portabilidade diff --git a/assets/lang/pt_PT.ini b/assets/lang/pt_PT.ini index 9adcb768f3af..78ce7ddbcf7b 100644 --- a/assets/lang/pt_PT.ini +++ b/assets/lang/pt_PT.ini @@ -50,7 +50,7 @@ Hardcore Mode = Modo Desafio How to use RetroAchievements = Como usar a RetroAchievements In Encore mode - listings may be wrong below = No Modo de Repetição - as listagem abaixo poderão estar incorretas Leaderboard attempt started or failed = Tabela classificativa começou ou falhou -Leaderboard result submitted = O resultado foi enviado à tabela classificativa +Leaderboard result submitted = O resultado foi enviado à tabela classificativa Leaderboard score submission = Envio de resultados à tabela classificativa Leaderboard submission is enabled = Envio à tabela classificativa está ativado Leaderboard tracker = Rastreador da tabela classificativa @@ -119,7 +119,7 @@ Calibrate Analog Stick = Calibrar Analógico Calibrate = Calibrar Calibrated = Calibrado Calibration = Calibração -Circular low end radius = Raio circular inferior +Circular deadzone = Zona morta circular Circular stick input = Entrada circular do direcional Classic = Clássico Confine Mouse = Isolar o rato dentro da janela/área de exibição diff --git a/assets/lang/ro_RO.ini b/assets/lang/ro_RO.ini index 50043e288d44..09a51b895698 100644 --- a/assets/lang/ro_RO.ini +++ b/assets/lang/ro_RO.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Calibrare Calibrated = Calibrated Calibration = Calibrare -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Clasic Confine Mouse = Trap mouse within window/display area diff --git a/assets/lang/ru_RU.ini b/assets/lang/ru_RU.ini index a96135ba03b5..3aea1b8c388f 100644 --- a/assets/lang/ru_RU.ini +++ b/assets/lang/ru_RU.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Калибровка аналогового стика Calibrate = Калибровка Calibrated = Откалиблированный Calibration = Калибровка -Circular low end radius = Круговой радиус нижнего предела +Circular deadzone = Круговой радиус нижнего предела Circular stick input = Круговой ввод стика Classic = Классический Confine Mouse = Не давать мыши выходить за пределы окна diff --git a/assets/lang/sv_SE.ini b/assets/lang/sv_SE.ini index 286512e26e67..46e93ece6331 100644 --- a/assets/lang/sv_SE.ini +++ b/assets/lang/sv_SE.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Kalibrera analog styrspak Calibrate = Kalibrera Calibrated = Kalibrerad Calibration = Kalibrering -Circular low end radius = Circulär inner-radie +Circular deadzone = Cirkulär dödzon Circular stick input = Cirkulär analog input Classic = Klassisk Confine Mouse = Stäng in muspekaren i fönstret diff --git a/assets/lang/tg_PH.ini b/assets/lang/tg_PH.ini index f25bcdccb056..6b560d188312 100644 --- a/assets/lang/tg_PH.ini +++ b/assets/lang/tg_PH.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Calibrate Calibrated = Calibrated Calibration = Calibration -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Klasiko Confine Mouse = Trap mouse within window/display area diff --git a/assets/lang/th_TH.ini b/assets/lang/th_TH.ini index e3895af8956d..8e1f53beaf83 100644 --- a/assets/lang/th_TH.ini +++ b/assets/lang/th_TH.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = ปรับค่าความคลาดเคล Calibrate = สอบเทียบสมดุล Calibrated = ค่าความคลาดเคลื่อนที่ปรับ Calibration = ปรับค่าความคลาดเคลื่อน -Circular low end radius = รัศมีต่ำสุดของการหมุนปุ่ม +Circular deadzone = รัศมีต่ำสุดของการหมุนปุ่ม Circular stick input = ค่านำเข้าการหมุนปุ่ม Classic = แบบดั้งเดิม Confine Mouse = จำกัดเมาส์ภายในหน้าต่าง/พื้นที่แสดงผล diff --git a/assets/lang/tr_TR.ini b/assets/lang/tr_TR.ini index 35d46f3fd370..0d9c85559e9e 100644 --- a/assets/lang/tr_TR.ini +++ b/assets/lang/tr_TR.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Analog Çubuğu Kalibre Et Calibrate = Kalibre Calibrated = Kalibre edildi Calibration = Kalibrasyon -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Dairesel çubuk girişi Classic = Klasik Confine Mouse = Fareyi belirli bir pencere/görüntü alanı içinde sınırla diff --git a/assets/lang/uk_UA.ini b/assets/lang/uk_UA.ini index 958eaff8e988..521145afbddb 100644 --- a/assets/lang/uk_UA.ini +++ b/assets/lang/uk_UA.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Калібрувати Calibrated = Calibrated Calibration = Калібрування -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Класичний Confine Mouse = Не давати миші виходити за межі екрану diff --git a/assets/lang/vi_VN.ini b/assets/lang/vi_VN.ini index 9103577f6a46..4e5ebd678e3c 100644 --- a/assets/lang/vi_VN.ini +++ b/assets/lang/vi_VN.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = Calibrate Analog Stick Calibrate = Chỉnh cân bằng Calibrated = Calibrated Calibration = Đã chỉnh xong -Circular low end radius = Circular low end radius +Circular deadzone = Circular deadzone Circular stick input = Circular stick input Classic = Cổ điển Confine Mouse = hiển thị chuột diff --git a/assets/lang/zh_CN.ini b/assets/lang/zh_CN.ini index d947c12cc7ec..96602c4790a8 100644 --- a/assets/lang/zh_CN.ini +++ b/assets/lang/zh_CN.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = 校准摇杆 Calibrate = 校准 Calibrated = 校准后 Calibration = 校准 -Circular low end radius = 环形起步半径 +Circular deadzone = 环形起步半径 Circular stick input = 环四周摇杆输入 Classic = 传统 Confine Mouse = 鼠标限制在窗口 diff --git a/assets/lang/zh_TW.ini b/assets/lang/zh_TW.ini index d5d2db46e63e..b287e881819e 100644 --- a/assets/lang/zh_TW.ini +++ b/assets/lang/zh_TW.ini @@ -95,7 +95,7 @@ Calibrate Analog Stick = 校正類比搖桿 Calibrate = 校正 Calibrated = 已校正 Calibration = 校正 -Circular low end radius = 圓形低端半徑 +Circular deadzone = 圓形低端半徑 Circular stick input = 圓形搖桿輸入 Classic = 傳統 Confine Mouse = 在視窗/顯示區域內截獲滑鼠