From aaba742e82ea525919322bd580ada490be64c141 Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Wed, 3 Jan 2018 15:56:39 -0800 Subject: [PATCH 1/5] Update buttonmap.xml with keyboard and controller Data from ScummVM source: https://github.com/libretro/scummvm/blob/master/backends/platform/libretro/libretro.cpp and: https://github.com/libretro/scummvm/blob/master/backends/platform/libretro/os.cpp Keyboard data painstakingly taken from: https://github.com/scummvm/scummvm/blob/master/common/keyboard.h --- game.libretro.scummvm/addon.xml.in | 3 + game.libretro.scummvm/resources/buttonmap.xml | 173 +++++++++++++++++- 2 files changed, 168 insertions(+), 8 deletions(-) diff --git a/game.libretro.scummvm/addon.xml.in b/game.libretro.scummvm/addon.xml.in index c1b3de6..6bcd8cf 100644 --- a/game.libretro.scummvm/addon.xml.in +++ b/game.libretro.scummvm/addon.xml.in @@ -5,6 +5,9 @@ provider-name="Libretro"> + + + diff --git a/game.libretro.scummvm/resources/buttonmap.xml b/game.libretro.scummvm/resources/buttonmap.xml index 3623982..c7515a6 100644 --- a/game.libretro.scummvm/resources/buttonmap.xml +++ b/game.libretro.scummvm/resources/buttonmap.xml @@ -1,11 +1,168 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 1478d11694f90078591cab1109833a3ff8cdc6d7 Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Wed, 3 Jan 2018 16:07:57 -0800 Subject: [PATCH 2/5] Add topology.xml Data from ScummVM source: https://github.com/libretro/scummvm/blob/master/backends/platform/libretro/libretro.cpp and: https://github.com/libretro/scummvm/blob/master/backends/platform/libretro/os.cpp --- game.libretro.scummvm/resources/topology.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 game.libretro.scummvm/resources/topology.xml diff --git a/game.libretro.scummvm/resources/topology.xml b/game.libretro.scummvm/resources/topology.xml new file mode 100644 index 0000000..129900b --- /dev/null +++ b/game.libretro.scummvm/resources/topology.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + From 96f7b07e0691c770d60870eafcc329c66683f392 Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Sat, 6 Jan 2018 14:25:22 -0800 Subject: [PATCH 3/5] buttonmap.xml: Fix broken analog stick --- game.libretro.scummvm/resources/buttonmap.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game.libretro.scummvm/resources/buttonmap.xml b/game.libretro.scummvm/resources/buttonmap.xml index c7515a6..05db1c8 100644 --- a/game.libretro.scummvm/resources/buttonmap.xml +++ b/game.libretro.scummvm/resources/buttonmap.xml @@ -1,6 +1,6 @@ - + From fb6a7d69faa35aea0fdbe0cbd9239f57000d0d6d Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Sat, 6 Jan 2018 14:25:31 -0800 Subject: [PATCH 4/5] Swap A/B buttons for Default Controller -> RetroPad map --- game.libretro.scummvm/resources/buttonmap.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game.libretro.scummvm/resources/buttonmap.xml b/game.libretro.scummvm/resources/buttonmap.xml index 05db1c8..2ca21d8 100644 --- a/game.libretro.scummvm/resources/buttonmap.xml +++ b/game.libretro.scummvm/resources/buttonmap.xml @@ -2,9 +2,9 @@ - + - + From db2a2a9977fbbc3c0c4b57919ebc3a667b5b5dfc Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Mon, 15 Jan 2018 10:57:53 -0800 Subject: [PATCH 5/5] buttonmap.xml: Replace alphabetic names with numeric ones This improves readability when sorted by name. --- game.libretro.scummvm/resources/buttonmap.xml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/game.libretro.scummvm/resources/buttonmap.xml b/game.libretro.scummvm/resources/buttonmap.xml index 2ca21d8..fe63b75 100644 --- a/game.libretro.scummvm/resources/buttonmap.xml +++ b/game.libretro.scummvm/resources/buttonmap.xml @@ -47,16 +47,16 @@ - - - - - - - - - - + + + + + + + + + +