Stash "DONE"

# Conflicts:
#	src/citra_qt/bootmanager.cpp
#	src/citra_qt/configuration/configure_motion_touch.ui
#	src/citra_qt/main.cpp
#	src/common/settings.cpp
#	src/core/CMakeLists.txt
#	src/core/core.h
This commit is contained in:
FearlessTobi
2023-01-14 17:07:51 +01:00
committed by GPUCode
parent a24cac6308
commit b2e04bf8f3
37 changed files with 2508 additions and 344 deletions

View File

@ -397,6 +397,7 @@ struct InputProfile {
std::string name;
std::array<std::string, NativeButton::NumButtons> buttons;
std::array<std::string, NativeAnalog::NumAnalogs> analogs;
std::array<std::string, NativeMotion::NumMotions> motions;
std::string motion_device;
std::string touch_device;
bool use_touch_from_button;