Merge pull request #78703 from Calinou/update-gamepad-button-axis-names

[3.x] Update gamepad button/axis names to match 4.0
This commit is contained in:
Rémi Verschelde 2023-06-26 18:05:09 +02:00
commit d85cf41665
No known key found for this signature in database
GPG key ID: C3336907360768E1

View file

@ -44,23 +44,23 @@
ProjectSettingsEditor *ProjectSettingsEditor::singleton = nullptr; ProjectSettingsEditor *ProjectSettingsEditor::singleton = nullptr;
static const char *_button_names[JOY_BUTTON_MAX] = { static const char *_button_names[JOY_BUTTON_MAX] = {
"DualShock Cross, Xbox A, Nintendo B", "Bottom Action, Sony Cross, Xbox A, Nintendo B",
"DualShock Circle, Xbox B, Nintendo A", "Right Action, Sony Circle, Xbox B, Nintendo A",
"DualShock Square, Xbox X, Nintendo Y", "Left Action, Sony Square, Xbox X, Nintendo Y",
"DualShock Triangle, Xbox Y, Nintendo X", "Top Action, Sony Triangle, Xbox Y, Nintendo X",
"L, L1", "Left Shoulder, Sony L1, Xbox LB",
"R, R1", "Right Shoulder, Sony R1, Xbox RB",
"L2", "Left Trigger, Sony L2, Xbox LT",
"R2", "Right Trigger, Sony R2, Xbox RT",
"L3", "Left Stick, Sony L3, Xbox L/LS",
"R3", "Right Stick, Sony R3, Xbox R/RS",
"Select, DualShock Share, Nintendo -", "Back, Sony Select, Xbox Back, Nintendo -",
"Start, DualShock Options, Nintendo +", "Start, Xbox Menu, Nintendo +",
"D-Pad Up", "D-pad Up",
"D-Pad Down", "D-pad Down",
"D-Pad Left", "D-pad Left",
"D-Pad Right", "D-pad Right",
"Home, DualShock PS, Guide", "Guide, Sony PS, Xbox Home",
"Xbox Share, PS5 Microphone, Nintendo Capture", "Xbox Share, PS5 Microphone, Nintendo Capture",
"Xbox Paddle 1", "Xbox Paddle 1",
"Xbox Paddle 2", "Xbox Paddle 2",
@ -79,8 +79,8 @@ static const char *_axis_names[JOY_AXIS_MAX * 2] = {
" (Right Stick Up)", " (Right Stick Up)",
" (Right Stick Down)", " (Right Stick Down)",
"", "", "", "", "", "", "", "",
"", " (L2)", "", " (Left Trigger, Sony L2, Xbox LT)",
"", " (R2)" "", " (Right Trigger, Sony R2, Xbox RT)"
}; };
void ProjectSettingsEditor::_unhandled_input(const Ref<InputEvent> &p_event) { void ProjectSettingsEditor::_unhandled_input(const Ref<InputEvent> &p_event) {