From eb2518f4622d84030b1c57b621a0cf4a2684b670 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Mon, 26 Jun 2023 09:46:02 +0200 Subject: [PATCH] Update gamepad button/axis names to match 4.0 --- editor/project_settings_editor.cpp | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index 5739c6b108b..6b186a3ee9a 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -44,23 +44,23 @@ ProjectSettingsEditor *ProjectSettingsEditor::singleton = nullptr; static const char *_button_names[JOY_BUTTON_MAX] = { - "DualShock Cross, Xbox A, Nintendo B", - "DualShock Circle, Xbox B, Nintendo A", - "DualShock Square, Xbox X, Nintendo Y", - "DualShock Triangle, Xbox Y, Nintendo X", - "L, L1", - "R, R1", - "L2", - "R2", - "L3", - "R3", - "Select, DualShock Share, Nintendo -", - "Start, DualShock Options, Nintendo +", - "D-Pad Up", - "D-Pad Down", - "D-Pad Left", - "D-Pad Right", - "Home, DualShock PS, Guide", + "Bottom Action, Sony Cross, Xbox A, Nintendo B", + "Right Action, Sony Circle, Xbox B, Nintendo A", + "Left Action, Sony Square, Xbox X, Nintendo Y", + "Top Action, Sony Triangle, Xbox Y, Nintendo X", + "Left Shoulder, Sony L1, Xbox LB", + "Right Shoulder, Sony R1, Xbox RB", + "Left Trigger, Sony L2, Xbox LT", + "Right Trigger, Sony R2, Xbox RT", + "Left Stick, Sony L3, Xbox L/LS", + "Right Stick, Sony R3, Xbox R/RS", + "Back, Sony Select, Xbox Back, Nintendo -", + "Start, Xbox Menu, Nintendo +", + "D-pad Up", + "D-pad Down", + "D-pad Left", + "D-pad Right", + "Guide, Sony PS, Xbox Home", "Xbox Share, PS5 Microphone, Nintendo Capture", "Xbox Paddle 1", "Xbox Paddle 2", @@ -79,8 +79,8 @@ static const char *_axis_names[JOY_AXIS_MAX * 2] = { " (Right Stick Up)", " (Right Stick Down)", "", "", "", "", - "", " (L2)", - "", " (R2)" + "", " (Left Trigger, Sony L2, Xbox LT)", + "", " (Right Trigger, Sony R2, Xbox RT)" }; void ProjectSettingsEditor::_unhandled_input(const Ref &p_event) {