summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-07-19 09:00:42 +0200
committerGitHub <noreply@github.com>2019-07-19 09:00:42 +0200
commit40dec5591646721aed89b326e8f33d28839e7436 (patch)
tree13c1547d2e4add0e865703168f53c121babec515
parent36182104e8d656850edbd1fa903d7be9c2faff28 (diff)
parentba6fbe5fa771e6190cfc0a6d93ec774f5412d548 (diff)
Merge pull request #30600 from vortexofdoom/dualshock_joypad
Added DualShock Equivalents to Joypad Button 10 and 11
-rw-r--r--editor/project_settings_editor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp
index 001846604c..f05b6b5890 100644
--- a/editor/project_settings_editor.cpp
+++ b/editor/project_settings_editor.cpp
@@ -52,8 +52,8 @@ static const char *_button_names[JOY_BUTTON_MAX] = {
"R2",
"L3",
"R3",
- "Select, Nintendo -",
- "Start, Nintendo +",
+ "Select, DualShock Share, Nintendo -",
+ "Start, DualShock Options, Nintendo +",
"D-Pad Up",
"D-Pad Down",
"D-Pad Left",