JosJuice 24a62eec41 Merge remote-tracking branch 'upstream/master' into merge-upstream ... # Conflicts: # CMakeLists.txt # CMakeSettings.json # Data/Sys/GameSettings/GLR.ini # Data/Sys/GameSettings/HA9.ini # Data/Sys/GameSettings/MB3.ini # Data/Sys/GameSettings/MBA.ini # Data/Sys/GameSettings/MCV.ini # Data/Sys/GameSettings/MCY.ini # Data/Sys/GameSettings/NAK.ini # Data/Sys/GameSettings/NAL.ini # Data/Sys/GameSettings/NAT.ini # Data/Sys/GameSettings/R8P.ini # Data/Sys/GameSettings/R9I.ini # Data/Sys/GameSettings/REF.ini # Data/Sys/GameSettings/RES.ini # Data/Sys/GameSettings/RMHE08.ini # Data/Sys/GameSettings/RMHP08.ini # Data/Sys/GameSettings/SE2.ini # Data/Sys/GameSettings/WW2.ini # Data/Sys/GameSettings/WW3.ini # Data/Sys/GameSettings/WWI.ini # Externals/Bochs_disasm/Bochs_disasm.vcxproj # Externals/FreeSurround/FreeSurround.vcxproj # Externals/LZO/LZO.vcxproj # Externals/SFML/build/vc2010/SFML_Network.vcxproj # Externals/bzip2/bzip2.vcxproj # Externals/cpp-optparse/cpp-optparse.vcxproj # Externals/cubeb/msvc/cubeb.vcxproj # Externals/curl/curl.vcxproj # Externals/curl/lib/CMakeLists.txt # Externals/discord-rpc/src/discord-rpc.vcxproj # Externals/ed25519/ed25519.vcxproj # Externals/enet/enet.vcxproj # Externals/glslang/glslang.vcxproj # Externals/imgui/imgui.vcxproj # Externals/liblzma/liblzma.vcxproj # Externals/libpng/png/png.vcxproj # Externals/libusb/libusb_static_2013.vcxproj # Externals/mbedtls/mbedTLS.vcxproj # Externals/miniupnpc/miniupnpc.vcxproj # Externals/minizip/minizip.vcxproj # Externals/picojson/picojson.vcxproj # Externals/pugixml/pugixml.vcxproj # Externals/soundtouch/SoundTouch.vcxproj # Externals/xxhash/xxhash.vcxproj # Externals/zlib/zlib.vcxproj # Externals/zstd/zstd.vcxproj # Languages/Languages.vcxproj # Source/Android/jni/MainAndroid.cpp # Source/Core/AudioCommon/AudioCommon.vcxproj # Source/Core/Common/Common.vcxproj # Source/Core/Common/Common.vcxproj.filters # Source/Core/Common/Logging/Log.h # Source/Core/Common/StringUtil.cpp # Source/Core/Core/CMakeLists.txt # Source/Core/Core/ConfigManager.cpp # Source/Core/Core/ConfigManager.h # Source/Core/Core/Core.vcxproj # Source/Core/Core/Core.vcxproj.filters # Source/Core/Core/HotkeyManager.cpp # Source/Core/Core/State.cpp # Source/Core/DiscIO/DiscIO.vcxproj # Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj # Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp # Source/Core/DolphinQt/DolphinQt.vcxproj # Source/Core/InputCommon/InputCommon.vcxproj # Source/Core/InputCommon/InputCommon.vcxproj.filters # Source/Core/UICommon/UICommon.vcxproj # Source/Core/UpdaterCommon/UpdaterCommon.vcxproj # Source/Core/VideoBackends/D3D/D3D.vcxproj # Source/Core/VideoBackends/D3D12/D3D12.vcxproj # Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj # Source/Core/VideoBackends/Null/Null.vcxproj # Source/Core/VideoBackends/OGL/OGL.vcxproj # Source/Core/VideoBackends/Software/Software.vcxproj # Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj # Source/Core/VideoCommon/OnScreenDisplay.cpp # Source/Core/VideoCommon/OnScreenDisplay.h # Source/Core/VideoCommon/VideoCommon.vcxproj # Source/Core/WinUpdater/WinUpdater.vcxproj # Source/DSPTool/DSPTool.vcxproj # Source/PCH/pch.vcxproj # Source/UnitTests/UnitTests.vcxproj		2020-12-01 23:44:32 +01:00
..
Android	InputCommon: Decouple ButtonManager and Touchscreen from Android	2019-11-28 15:20:51 -05:00
DInput	InputCommon: Migrate logging over to fmt	2020-10-23 13:16:18 -04:00
DualShockUDPClient	InputCommon: Migrate logging over to fmt	2020-10-23 13:16:18 -04:00
evdev	InputCommon: Migrate logging over to fmt	2020-10-23 13:16:18 -04:00
ForceFeedback	InputCommon: Use nested namespace specifiers where applicable	2019-06-17 16:51:41 -04:00
OSX	InputCommon: Migrate logging over to fmt	2020-10-23 13:16:18 -04:00
Pipes	even with 87dc83e	2020-07-25 17:39:01 -04:00
Quartz	ControllerInterface: Add platform consistent names for modifier keys.	2020-09-25 20:29:18 -05:00
SDL	InputCommon: Migrate logging over to fmt	2020-10-23 13:16:18 -04:00
Touch	Android: Enfore correct stick gate in overlay	2020-06-29 01:20:02 +02:00
Wiimote	InputCommon: Migrate logging over to fmt	2020-10-23 13:16:18 -04:00
Win32	InputCommon: Migrate logging over to fmt	2020-10-23 13:16:18 -04:00
XInput	InputCommon: Constify Device::Input::IsDetectable function.	2020-02-22 10:27:43 -06:00
Xlib	Linux/XInput2: Fix keys being stuck pressed on focus loss.	2020-10-19 11:46:01 -05:00
ControllerInterface.cpp	InputCommon: Migrate logging over to fmt	2020-10-23 13:16:18 -04:00
ControllerInterface.h	InputCommon: Make "Cursor" inputs aware of the rendered aspect ratio.	2020-01-24 09:20:41 -06:00
Device.cpp	InputCommon: Improve input detection to produce buton combinations.	2020-09-25 22:51:32 -05:00
Device.h	InputCommon: Improve input detection to produce buton combinations.	2020-09-25 22:51:32 -05:00