Merge pull request #228 from Xphalnos/main

Adding keyboard mapping

CMakeLists.txt

@@ -81,17 +81,17 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 find_package(Boost 1.83.0 CONFIG)
 find_package(cryptopp 8.9.0 MODULE)
-find_package(fmt 10.2.0 CONFIG)
+find_package(fmt 10.2.1 CONFIG)
 find_package(glslang 14.2.0 CONFIG)
-find_package(magic_enum 0.9.5 CONFIG)
+find_package(magic_enum 0.9.6 CONFIG)
 find_package(SDL3 3.1.2 CONFIG)
 find_package(toml11 3.8.1 CONFIG)
 find_package(tsl-robin-map 1.3.0 CONFIG)
-find_package(VulkanHeaders 1.3.288 CONFIG)
+find_package(VulkanHeaders 1.3.289 CONFIG)
 find_package(VulkanMemoryAllocator 3.1.0 CONFIG)
 find_package(xbyak 7.07 CONFIG)
 find_package(xxHash 0.8.2 MODULE)
-find_package(zlib-ng 2.1.6 MODULE)
+find_package(zlib-ng 2.2.0 MODULE)
 find_package(Zydis 4.1.0 CONFIG)
 
 add_subdirectory(externals)

README.md

@@ -72,6 +72,35 @@ Check the build instructions for [**Linux**](https://github.com/shadps4-emu/shad
 |Linux SDL Build|[![Linux-sdl](https://github.com/shadps4-emu/shadPS4/actions/workflows/linux.yml/badge.svg)](https://github.com/shadps4-emu/shadPS4/actions/workflows/linux.yml)
 |Linux Qt Build|[![Linux-qt](https://github.com/shadps4-emu/shadPS4/actions/workflows/linux-qt.yml/badge.svg)](https://github.com/shadps4-emu/shadPS4/actions/workflows/linux-qt.yml)
 
+# Keyboard Mapping
+
+| Controller button | Keyboard |
+| ------------- | ------------- |
+LEFT AXIS UP | W |
+LEFT AXIS DOWN | S |
+LEFT AXIS LEFT | A |
+LEFT AXIS RIGHT | D |
+RIGHT AXIS UP | I |
+RIGHT AXIS DOWN | K |
+RIGHT AXIS LEFT | J |
+RIGHT AXIS RIGHT | L |
+TRIANGLE | Numpad 8 |
+CIRCLE | Numpad 6 |
+CROSS | Numpad 2 |
+SQUARE | Numpad 4 |
+PAD UP | UP |
+PAD DOWN | DOWN |
+PAD LEFT | LEFT |
+PAD RIGHT | RIGHT |
+OPTIONS | RETURN |
+TOUCH PAD | SPACE |
+L1 | Q |
+R1 | U |
+L2 | E |
+R2 | O |
+L3 | X |
+R3 | M |
+
 # Main team
 
 - [**georgemoralis**](https://github.com/georgemoralis)

externals/glslang

@@ -1 +1 @@
-Subproject commit ea087ff90d03947307cfe52500b74551aa35d34d
+Subproject commit 33c7e30860928bab3819c3abae8297b109a02f73

externals/magic_enum

@@ -1 +1 @@
-Subproject commit bf3c74ab7eded2a7183a3729f5cd36bc367edb08
+Subproject commit dd6a39d0ba1852cf06907e0f0573a2a10d23c2ad

externals/vulkan-headers

@@ -1 +1 @@
-Subproject commit e3c37e6e184a232e10b01dff5a065ce48c047f88
+Subproject commit 190d2cb24e90e5bf2bec0a75604a9b3586485b6d