Skip to content

Update ControllerInputs #924

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.

Sign up for GitHub

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

Merged
ShinyWasabi merged 1 commit into from
Apr 25, 2026
+42 −3
Merged

Update ControllerInputs #924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/game/frontend/GUI.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace YimMenu

static bool IsUsingKeyboard()
{
return ImGui::GetIO().WantCaptureKeyboard;
return ImGui::GetIO().WantTextInput;
}

static void RunScript()
Expand Down
43 changes: 41 additions & 2 deletions src/types/pad/ControllerInputs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,14 +251,51 @@ enum class ControllerInputs : uint32_t
INPUT_MP_TEXT_CHAT_TEAM,
INPUT_MP_TEXT_CHAT_FRIENDS,
INPUT_MP_TEXT_CHAT_CREW,
INPUT_PUSH_TO_TALK,
INPUT_PC_PUSH_TO_TALK,
INPUT_CREATOR_LS,
INPUT_CREATOR_RS,
INPUT_CREATOR_LT,
INPUT_CREATOR_RT,
INPUT_CREATOR_MENU_TOGGLE,
INPUT_CREATOR_ACCEPT,
INPUT_CREATOR_DELETE,
INPUT_CREATOR_SWITCH_CAMERA,
INPUT_CREATOR_TOGGLE_ORBIT_CAMERA,
INPUT_CREATOR_CAMERA_DECREASE,
INPUT_CREATOR_CAMERA_INCREASE,
INPUT_CREATOR_MENU_ACCEPT,
INPUT_CREATOR_MENU_CANCEL,
INPUT_CREATOR_FAST_ADJUST,
INPUT_CREATOR_FINE_ADJUST,
INPUT_CREATOR_FAST_ZOOM,
INPUT_CREATOR_LIST,
INPUT_CREATOR_ALT_MENU_ENTRY,
INPUT_CREATOR_WARP_AND_EDIT,
INPUT_CREATOR_TAB_LEFT,
INPUT_CREATOR_TAB_RIGHT,
INPUT_CREATOR_ROTATE_LEFT,
INPUT_CREATOR_ROTATE_RIGHT,
INPUT_CREATOR_FOV_INCREASE,
INPUT_CREATOR_FOV_DECREASE,
INPUT_CREATOR_EXTRA_OPTIONS1,
INPUT_CREATOR_EXTRA_OPTIONS2,
INPUT_CREATOR_CONTEXT_MENU,
INPUT_CREATOR_MENU_UP,
INPUT_CREATOR_MENU_DOWN,
INPUT_CREATOR_ADJUST_LEFT,
INPUT_CREATOR_ADJUST_RIGHT,
INPUT_CREATOR_RESET_FOV,
INPUT_CREATOR_ENTITY_RAISE,
INPUT_CREATOR_ENTITY_LOWER,
INPUT_CREATOR_TOGGLE_DESCRIPTIONS,
INPUT_CREATOR_MENU,
INPUT_CREATOR_MENU_DELETE,
INPUT_CREATOR_MOVE_LR,
INPUT_CREATOR_MOVE_UD,
INPUT_CREATOR_MOVE_UP_ONLY,
INPUT_CREATOR_MOVE_DOWN_ONLY,
INPUT_CREATOR_MOVE_LEFT_ONLY,
INPUT_CREATOR_MOVE_RIGHT_ONLY,
INPUT_ATTACK2,
INPUT_RAPPEL_JUMP,
INPUT_RAPPEL_LONG_JUMP,
Expand Down Expand Up @@ -336,7 +373,7 @@ enum class ControllerInputs : uint32_t
INPUT_VEH_FLY_ATTACK2,
INPUT_RADIO_WHEEL_UD,
INPUT_RADIO_WHEEL_LR,
INPUT_VEH_SLOWMO_UD,
INPUT_VEH_SLOWMO_UP,
INPUT_VEH_SLOWMO_UP_ONLY,
INPUT_VEH_SLOWMO_DOWN_ONLY,
INPUT_VEH_HYDRAULICS_CONTROL_TOGGLE,
Expand All @@ -360,6 +397,8 @@ enum class ControllerInputs : uint32_t
INPUT_VEH_FLY_BOMB_BAY,
INPUT_VEH_FLY_COUNTER,
INPUT_VEH_TRANSFORM,
INPUT_VEH_SHIFT_GEAR_UP,
INPUT_VEH_SHIFT_GEAR_DOWN,
MAX_INPUTS,
UNDEFINED_INPUT,
DYNAMIC_MAPPING_MOUSE_X,
Expand Down
Loading