Merge branch 'grumpycoders:main' into main

Author: johnbaumann

.gitignore

@@ -80,6 +80,8 @@ fb.bat
 offscreen.frag
 offscreen.lua
 offscreen.vert
+offscreen.json
+output.json
 output.frag
 output.lua
 output.vert

README.md

@@ -117,14 +117,14 @@ The codebase still requires a lot of cleanup, and the current product isn't prop
 - VRAM viewer and debugger
 - fully featured MIPS debugger
 - memory cards
+- memory card manager
 - XBox controller support
 - save states
 - save state slots
 
 ### What still requires some work?
 - GLSL GPU
 - proper SPU multithreaded code
-- memory card manager
 - better customization
 - more generic dynarec
 - ...

TODO.md

@@ -6,7 +6,6 @@ List of things to still do here, in no particular order.
   - Re-add iCatbutler's PGXP stuff.
   - Add a GPU logger / debugger.
   - Properly integrate IRQ control.
-  - Better framerate control with SPU pushback.
 
 - SPU cleanup
   - Properly support CDDA/XA volume settings.
@@ -20,10 +19,8 @@ List of things to still do here, in no particular order.
   - Throw away the current parallel port support.
 
 - Scripting
-  - Add a scripting engine (LuaJIT).
-  - Bind most of the emulator functions to it.
+  - Bind more emulator functions to Lua.
   - Bind parallel port card system to it, so to have a flexible cart management system.
-  - Bind ImGui to it.
 
 - Tooling
   - Integrate dosbox-x.

src/core/pad.cc

@@ -474,8 +474,8 @@ bool PCSX::Pads::Pad::configure() {
                 hasToPop = true;
             }
 
-            const auto keyName =
-                fmt::format("{}##{}", glfwKeyToString(getButtonFromGUIIndex(i)), i);  // THe name of the mapped key
+            // The name of the mapped key
+            const auto keyName = fmt::format("{}##{}", glfwKeyToString(getButtonFromGUIIndex(i)), i);
             if (ImGui::Button(keyName.c_str(), ImVec2{-1, 0})) {
                 m_buttonToWait = i;
             }