Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Reset as a mappable control #19472

Merged
merged 2 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Core/KeyMap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,7 @@ const KeyMap_IntStrPair psp_button_names[] = {
{VIRTKEY_SPEED_CUSTOM2, "Alt speed 2"},
{VIRTKEY_SPEED_ANALOG, "Analog speed"},
{VIRTKEY_PAUSE, "Pause"},
{VIRTKEY_RESET_EMULATION, "Reset"},
{VIRTKEY_FRAME_ADVANCE, "Frame Advance"},
#if !defined(MOBILE_DEVICE)
{VIRTKEY_RECORD, "Audio/Video Recording" },
Expand Down
1 change: 1 addition & 0 deletions Core/KeyMap.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ enum {
VIRTKEY_EXIT_APP = 0x40000029,
VIRTKEY_TOGGLE_MOUSE = 0x40000030,
VIRTKEY_TOGGLE_TOUCH_CONTROLS = 0x40000031,
VIRTKEY_RESET_EMULATION = 0x40000032,
VIRTKEY_LAST,
VIRTKEY_COUNT = VIRTKEY_LAST - VIRTKEY_FIRST
};
Expand Down
4 changes: 4 additions & 0 deletions UI/EmuScreen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,10 @@ void EmuScreen::onVKey(int virtualKeyCode, bool down) {
}
break;

case VIRTKEY_RESET_EMULATION:
System_PostUIMessage(UIMessage::REQUEST_GAME_RESET);
break;

#ifndef MOBILE_DEVICE
case VIRTKEY_RECORD:
if (down) {
Expand Down
1 change: 1 addition & 0 deletions UI/GamepadEmu.h
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@ namespace CustomKeyData {
{ ImageID::invalid(), VIRTKEY_ANALOG_ROTATE_CW },
{ ImageID::invalid(), VIRTKEY_ANALOG_ROTATE_CCW },
{ ImageID::invalid(), VIRTKEY_PAUSE },
{ ImageID::invalid(), VIRTKEY_RESET_EMULATION },
{ ImageID::invalid(), VIRTKEY_DEVMENU },
#ifndef MOBILE_DEVICE
{ ImageID::invalid(), VIRTKEY_RECORD },
Expand Down
1 change: 1 addition & 0 deletions assets/lang/ar_AE.ini
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,7 @@ R = R
RapidFire = Rapid-fire
Record = تسجيل
Remote hold = Remote hold
Reset = ‎إ&عادة
Rewind = Rewind
Right = Dpad Right
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/az_AZ.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Rapid-fire
Record = Record
Remote hold = Remote hold
Reset = Reset
Rewind = Rewind
Right = Dpad Right
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/bg_BG.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Rapid-fire
Record = Record
Remote hold = Remote hold
Reset = Reset
Rewind = Rewind
Right = Dpad Надясно
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/ca_ES.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Rapid-fire
Record = Record
Remote hold = Remote hold
Reset = Reiniciar
Rewind = Rewind
Right = Dpad Right
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/cz_CZ.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Rychlá palba
Record = Record
Remote hold = Remote hold
Reset = Resetovat
Rewind = Přetočit
Right = Dpad Doprava
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/da_DK.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Hurtigskydning
Record = Record
Remote hold = Remote hold
Reset = Nulstil
Rewind = Spol tilbage
Right = Dpad højre
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/de_DE.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Schnellfeuer
Record = Aufnehmen
Remote hold = Remote hold
Reset = Zurücksetzen
Rewind = Zurückspulen
Right = Steuerkreuz Rechts
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/dr_ID.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = RapidFire
Record = Record
Remote hold = Remote hold
Reset = Papole
Rewind = Rewind
Right = Kanan
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/en_US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,7 @@ R = R
RapidFire = Rapid-fire
Record = Record
Remote hold = Remote hold
Reset = Reset
Rewind = Rewind
Right = Dpad Right
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/es_ES.ini
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,7 @@ R = R
RapidFire = Fuego rápido
Record = Grabar
Remote hold = Mantener remoto
Reset = Reiniciar
Rewind = Rebobinar
Right = Cruceta derecha
Right Analog Stick = Stick derecho
Expand Down
1 change: 1 addition & 0 deletions assets/lang/es_LA.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Disparo rápido
Record = Record
Remote hold = Mantener remotamente
Reset = Reiniciar
Rewind = Retroceso
Right = Derecha
Right Analog Stick = Análogo derecho
Expand Down
1 change: 1 addition & 0 deletions assets/lang/fa_IR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = RapidFire
Record = Record
Remote hold = Remote hold
Reset = ‎راه اندازی دوباره
Rewind = Rewind
Right = Right
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/fi_FI.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Nopea tulitus
Record = Nauhoita
Remote hold = Remote hold
Reset = Nollaa
Rewind = Takaisinkelaus
Right = Oikealle
Right Analog Stick = Oikea analoginen sauva
Expand Down
1 change: 1 addition & 0 deletions assets/lang/fr_FR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Tir rapide
Record = Record
Remote hold = Verrouillage distant
Reset = Redémarrer
Rewind = Rembobiner
Right = Droite
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/gl_ES.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Fogo rápido
Record = Record
Remote hold = Remote hold
Reset = Re&iniciar
Rewind = Rebobinar
Right = D-Pad Dereita
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/gr_EL.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Ταχεία βολή
Record = Record
Remote hold = Remote hold
Reset = Επανεκκίνηση
Rewind = Αντιστροφή
Right = Δεξιά
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/he_IL.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = RapidFire
Record = Record
Remote hold = Remote hold
Reset = אחרונים
Rewind = Rewind
Right = >
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/he_IL_invert.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = RapidFire
Record = Record
Remote hold = Remote hold
Reset = Reset
Rewind = Rewind
Right = >
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/hr_HR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Rapid-fire
Record = Record
Remote hold = Remote hold
Reset = Resetiraj
Rewind = Rewind
Right = Dpad Desno
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/hu_HU.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Gyorstüzelés
Record = Record
Remote hold = Távoli zár
Reset = Újraindítás
Rewind = Visszatekerés
Right = D-Pad Jobbra
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/id_ID.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Tembakan beruntun
Record = Rekam
Remote hold = Pegangan jarak jauh
Reset = Atur ulang
Rewind = Putar ulang
Right = Dpad kanan
Right Analog Stick = Stik analog kanan
Expand Down
1 change: 1 addition & 0 deletions assets/lang/it_IT.ini
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,7 @@ R = R
RapidFire = Fuoco rapido
Record = Record
Remote hold = Blocco da remoto
Reset = Reset
Rewind = Riavvolgi
Right = D-Pad Destro
Right Analog Stick = Stick Analogico destro
Expand Down
1 change: 1 addition & 0 deletions assets/lang/ja_JP.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = 連射
Record = Record
Remote hold = リモートホールド
Reset = リセット(&E)
Rewind = 巻き戻す
Right = 十字キー 右
Right Analog Stick = 右アナログパッド
Expand Down
1 change: 1 addition & 0 deletions assets/lang/jv_ID.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = RapidFire
Record = Record
Remote hold = Remote hold
Reset = Ngreset
Rewind = Rewind
Right = Kanan
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/ko_KR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -809,6 +809,7 @@ R = R
RapidFire = 연사
Record = 녹화
Remote hold = 리모트 잠금
Reset = 재설정(&E)
Rewind = 되감기
Right = 십자 패드 오른쪽
Right Analog Stick = 오른쪽 아날로그 스틱
Expand Down
1 change: 1 addition & 0 deletions assets/lang/ku_SO.ini
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ R = R
RapidFire = Rapid-fire
Record = Record
Remote hold = Remote hold
Reset = Reset
Rewind = Rewind
Right = Dpad Right
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/lo_LA.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = ປຸ່ມລົວຕໍ່ເນື່ອງ
Record = Record
Remote hold = Remote hold
Reset = ຣີເຊັດ
Rewind = ໝຸນກັບ
Right = Dpad ຂວາ
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/lt-LT.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Greita-"ugnis"
Record = Record
Remote hold = Remote hold
Reset = Perkrauti
Rewind = "Rewind"
Right = Krypčių mygtukas dešinėn
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/ms_MY.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Tembak-Berterusan
Record = Record
Remote hold = Remote hold
Reset = Mu&la semula
Rewind = Kembali semula
Right = Dpad Kanan
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/nl_NL.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Snelvuur
Record = Record
Remote hold = Vasthouden op afstand
Reset = Opnieuw opstarten
Rewind = Terugspoelen
Right = Rechts
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/no_NO.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Rapid-fire
Record = Record
Remote hold = Remote hold
Reset = Reset
Rewind = Rewind
Right = Dpad Right
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/pl_PL.ini
Original file line number Diff line number Diff line change
Expand Up @@ -817,6 +817,7 @@ R = R
RapidFire = Auto. strzelanie
Record = Nagraj
Remote hold = Zdalne przytrzymanie
Reset = Zrestartuj
Rewind = Przewiń do tyłu
Right = Strzałka w prawo
Right Analog Stick = Prawa gałka analogowa
Expand Down
9 changes: 5 additions & 4 deletions assets/lang/pt_BR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,7 @@ R = R
RapidFire = Fogo rápido
Record = Gravar
Remote hold = Segurar remoto
Reset = Resetar
Rewind = Retroceder
Right = Direcional Direito
Right Analog Stick = Direcional Análogico Direito
Expand Down Expand Up @@ -1025,10 +1026,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
Expand Down
1 change: 1 addition & 0 deletions assets/lang/pt_PT.ini
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,7 @@ R = R
RapidFire = Disparo rápido
Record = Gravar
Remote hold = Segurar remoto
Reset = Reiniciar
Rewind = Retroceder
Right = Direcional Direito
Right Analog Stick = Direcional Análogico Direito
Expand Down
1 change: 1 addition & 0 deletions assets/lang/ro_RO.ini
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,7 @@ R = R
RapidFire = Foc-rapid
Record = Record
Remote hold = Remote hold
Reset = Reset
Rewind = Re-afișare
Right = Dpad Dreapta
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/ru_RU.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Турбокнопка
Record = Запись
Remote hold = Удалённый hold
Reset = Перезапустить
Rewind = Возврат
Right = Вправо
Right Analog Stick = Правый аналоговый стик
Expand Down
1 change: 1 addition & 0 deletions assets/lang/sv_SE.ini
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,7 @@ R = R
RapidFire = Rapid-fire
Record = Spela in
Remote hold = Remote hold
Reset = Reset
Rewind = Spola tillbaka
Right = D-pad Höger
Right Analog Stick = Analog-sticka höger
Expand Down
1 change: 1 addition & 0 deletions assets/lang/tg_PH.ini
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,7 @@ R = R
RapidFire = Tuloy-tuloy na pagpindot (Rapid Fire)
Record = Record
Remote hold = I-Hold (Remote)
Reset = I-Reset
Rewind = I-Rewind
Right = Kanan
Right Analog Stick = Analog Stick sa Kanan
Expand Down
1 change: 1 addition & 0 deletions assets/lang/th_TH.ini
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,7 @@ R = อาร์
RapidFire = กดรัวต่อเนื่อง
Record = บันทึกหน้าจอ
Remote hold = หยุดการใช้รีโมท
Reset = รีเซ็ต
Rewind = โหลดสเตทพื้นหลัง
Right = ลูกศรขวา
Right Analog Stick = ปุ่มอนาล็อกขวา
Expand Down
1 change: 1 addition & 0 deletions assets/lang/tr_TR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,7 @@ R = R
RapidFire = Seri Ateş
Record = Kayıt
Remote hold = Uzaktan tutma
Reset = Sıfırla
Rewind = Geri Sar
Right = Dpad Sağ
Right Analog Stick = Sağ Analog çubuk
Expand Down
1 change: 1 addition & 0 deletions assets/lang/uk_UA.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Турбо кнопка
Record = Record
Remote hold = Віддалене утримання
Reset = Скинути
Rewind = Повернення
Right = Вправо
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/vi_VN.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = Rapid-fire
Record = Record
Remote hold = Giữ điều khiển
Reset = Khởi động lại
Rewind = Tua nhanh
Right = Phải
Right Analog Stick = Right Analog Stick
Expand Down
1 change: 1 addition & 0 deletions assets/lang/zh_CN.ini
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ R = R
RapidFire = 连发键
Record = 录制
Remote hold = 锁键(遥控器)
Reset = 重置(&E)
Rewind = 读取倒带
Right = 方向键:右
Right Analog Stick = 右摇杆
Expand Down
Loading
Loading