diff options
author | pineappleEA <pineaea@gmail.com> | 2024-02-25 22:23:49 +0100 |
---|---|---|
committer | pineappleEA <pineaea@gmail.com> | 2024-02-25 22:23:49 +0100 |
commit | 3f175c996aa01b7b7650ea2014dbb676305fc428 (patch) | |
tree | f1f9fd2b9478e296d386ef9b869a4a307e0e2978 | |
parent | 9e57191fe7e64eb2c569206b88819e02b42ece10 (diff) |
early-access version 4171EA-4171
-rwxr-xr-x | README.md | 2 | ||||
-rwxr-xr-x | src/hid_core/frontend/emulated_controller.cpp | 5 | ||||
-rwxr-xr-x | tools/reset-submodules.sh | 8 |
3 files changed, 11 insertions, 4 deletions
@@ -1,7 +1,7 @@ | |||
1 | yuzu emulator early access | 1 | yuzu emulator early access |
2 | ============= | 2 | ============= |
3 | 3 | ||
4 | This is the source code for early-access 4170. | 4 | This is the source code for early-access 4171. |
5 | 5 | ||
6 | ## Legal Notice | 6 | ## Legal Notice |
7 | 7 | ||
diff --git a/src/hid_core/frontend/emulated_controller.cpp b/src/hid_core/frontend/emulated_controller.cpp index 7664341bd..9aa08d5cc 100755 --- a/src/hid_core/frontend/emulated_controller.cpp +++ b/src/hid_core/frontend/emulated_controller.cpp | |||
@@ -176,10 +176,9 @@ void EmulatedController::LoadDevices() { | |||
176 | if (npad_id_type == NpadIdType::Player1 || npad_id_type == NpadIdType::Handheld) { | 176 | if (npad_id_type == NpadIdType::Player1 || npad_id_type == NpadIdType::Handheld) { |
177 | camera_params[1] = Common::ParamPackage{"engine:camera,camera:1"}; | 177 | camera_params[1] = Common::ParamPackage{"engine:camera,camera:1"}; |
178 | nfc_params[0] = Common::ParamPackage{"engine:virtual_amiibo,nfc:1"}; | 178 | nfc_params[0] = Common::ParamPackage{"engine:virtual_amiibo,nfc:1"}; |
179 | #ifdef HAVE_LIBUSB | 179 | #ifndef ANDROID |
180 | ring_params[1] = Common::ParamPackage{"engine:joycon,axis_x:100,axis_y:101"}; | 180 | ring_params[1] = Common::ParamPackage{"engine:joycon,axis_x:100,axis_y:101"}; |
181 | #endif | 181 | #else |
182 | #ifdef ANDROID | ||
183 | android_params = Common::ParamPackage{"engine:android,port:100"}; | 182 | android_params = Common::ParamPackage{"engine:android,port:100"}; |
184 | #endif | 183 | #endif |
185 | } | 184 | } |
diff --git a/tools/reset-submodules.sh b/tools/reset-submodules.sh new file mode 100755 index 000000000..6fdfe0bcd --- /dev/null +++ b/tools/reset-submodules.sh | |||
@@ -0,0 +1,8 @@ | |||
1 | #!/bin/bash -ex | ||
2 | |||
3 | # SPDX-FileCopyrightText: 2024 yuzu Emulator Project | ||
4 | # SPDX-License-Identifier: MIT | ||
5 | |||
6 | git submodule sync | ||
7 | git submodule foreach --recursive git reset --hard | ||
8 | git submodule update --init --recursive | ||