Android 260

Merge yuzu-emu#13096
Merge yuzu-emu#13075
2024-02-22 00:57:08 +00:00 · 2024-02-22 00:57:08 +00:00 · 2024-02-22 00:57:08 +00:00 · 2024-02-22 00:57:08 +00:00 · 2024-02-22 00:57:07 +00:00 · 2024-02-22 00:57:07 +00:00
2 changed files with 1 additions and 1 deletions
--- a/README.md
+++ b/README.md
@@ -6,7 +6,6 @@
 | [13000](https://github.com/yuzu-emu/yuzu//pull/13000) | [`461eaca7e`](https://github.com/yuzu-emu/yuzu//pull/13000/files) | device_memory_manager: skip unregistered interfaces on invalidate | [liamwhite](https://github.com/liamwhite/) | Yes |
 | [13075](https://github.com/yuzu-emu/yuzu//pull/13075) | [`f46dc3168`](https://github.com/yuzu-emu/yuzu//pull/13075/files) | shader_recompiler: throw on missing geometry streams in geometry shaders | [liamwhite](https://github.com/liamwhite/) | Yes |
 | [13096](https://github.com/yuzu-emu/yuzu//pull/13096) | [`0a8759057`](https://github.com/yuzu-emu/yuzu//pull/13096/files) | texture_cache: use two-pass collection for costly load resources | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [13105](https://github.com/yuzu-emu/yuzu//pull/13105) | [`de5422b1f`](https://github.com/yuzu-emu/yuzu//pull/13105/files) | android: Misc controller fixes | [t895](https://github.com/t895/) | Yes |


 End of merge log. You can find the original README.md below the break.
--- a/src/core/file_sys/fssystem/fssystem_aes_xts_storage.h
+++ b/src/core/file_sys/fssystem/fssystem_aes_xts_storage.h
@@ -3,6 +3,7 @@

 #pragma once

+#include <mutex>
 #include <optional>

 #include "core/crypto/aes_util.h"
Author	SHA1	Message	Date
yuzubot	f44933930d	Android 260	2024-02-22 00:57:08 +00:00
yuzubot	e96826419b	Merge yuzu-emu#13096	2024-02-22 00:57:08 +00:00
yuzubot	3f232161be	Merge yuzu-emu#13075	2024-02-22 00:57:08 +00:00
yuzubot	98eb3df15c	Merge yuzu-emu#13000	2024-02-22 00:57:08 +00:00
yuzubot	74ba9dde58	Merge yuzu-emu#12982	2024-02-22 00:57:07 +00:00
yuzubot	f3f63aa1e7	Merge yuzu-emu#12749	2024-02-22 00:57:07 +00:00
yuzubot	1bea1ee418	Merge yuzu-emu#12461	2024-02-22 00:57:07 +00:00
liamwhite	8bbc209950	Merge pull request #13105 from t895/connection-fix android: Misc controller fixes	2024-02-21 10:43:46 -05:00
liamwhite	9e1a67b950	fs: add missing mutex header for member (#13106 )	2024-02-21 16:43:05 +01:00
t895	de5422b1fd	android: Connect controllers with supported styles If you tried to connect a controller that was previously configured with an unsupported style for your game, when you try to connect that controller, it will immediately disconnect. This ensures that the controller that is being connected will be changed to the first supported style index before being connected.	2024-02-21 08:37:55 -05:00
t895	45f450fca5	android: Add additional check for hasMapping Controls can have no mapping if they are either "[empty]" or and empty string. This was causing an issue if you reset mapping on all controllers and then tried to play a game. The check to determine whether auto mapping was required would fail and leave you will no mapped controllers. This feels a bit like user error but it smooths things out if you forget so I see it as necessary.	2024-02-21 08:17:30 -05:00
t895	9a3fd76b25	android: Enable all controller styles on emulation shutdown	2024-02-21 08:13:54 -05:00