diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-18 14:52:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-18 14:52:55 +0100 |
| commit | 7eb8a67025c04e8a72c219944e14432f38ad5135 (patch) | |
| tree | 21ecd72c7653c6f2add293ad43ec80910a68700f | |
| parent | b1f22fe756aa7b00f62f843ec296c863ec58fb50 (diff) | |
| parent | f6a504fad4ae4ca1c4ea6c5d0a6fa4a8274d48d8 (diff) | |
Merge pull request #8067 from Hinsbart/fix_ps_cross
InputMap: Rename joypad button "PS X" to "PS Cross".
| -rw-r--r-- | editor/project_settings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/project_settings.cpp b/editor/project_settings.cpp index 43c5ccf3a2..b47f95010b 100644 --- a/editor/project_settings.cpp +++ b/editor/project_settings.cpp @@ -39,7 +39,7 @@ ProjectSettings *ProjectSettings::singleton = NULL; static const char *_button_names[JOY_BUTTON_MAX] = { - "PS X, XBox A, Nintendo B", + "PS Cross, XBox A, Nintendo B", "PS Circle, XBox B, Nintendo A", "PS Square, XBox X, Nintendo Y", "PS Triangle, XBox Y, Nintendo X", |