mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-10-05 07:39:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
dolphin/Source/Core/DolphinQt/Config
History
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
..
ControllerInterface DolphinQt: resolve Qt5.15 deprecations 2020-08-23 13:57:05 -07:00
Graphics Merge remote-tracking branch 'upstream/master' into merge-upstream 2020-12-01 23:44:32 +01:00
Mapping Qt/IOWindow: Remove Apply button. 2020-11-26 00:47:37 +01:00
ToolTipControls DolphinQt: Add generic tooltip controls 2020-11-28 11:49:14 -06:00
ARCodeWidget.cpp Merge pull request #8277 from lioncash/code 2019-08-09 23:42:55 +10:00
ARCodeWidget.h DolphinQt/Config/ARCodeWidget: Use forward declarations where applicable 2019-07-31 09:48:45 -04:00
CheatCodeEditor.cpp DolphinQt: Replace QStringLiteral with alternatives where applicable 2019-07-30 09:06:03 -04:00
CheatCodeEditor.h
CheatWarningWidget.cpp Connect numerous QPushButtons to use clicked signal instead of pressed. This unifies UI behaviour more. 2019-07-24 00:18:58 +02:00
CheatWarningWidget.h Mark files as non-executable 2019-06-02 12:31:40 +01:00
ControllersWindow.cpp DolphinQt: resolve Qt5.15 deprecations 2020-08-23 13:57:05 -07:00
ControllersWindow.h InputCommon: Add real Wii Remote support to ControllerInterface. Add option to connect additional Wii Remotes. 2020-02-17 16:14:01 -06:00
FilesystemWidget.cpp DolphinQt: Run tasks that use progress dialogs on separate threads 2020-04-03 12:53:38 +02:00
FilesystemWidget.h VolumeVerifier: Check hashes in Wii partitions 2019-04-09 14:18:45 +02:00
GameConfigEdit.cpp DolphinQt: Use qOverload where applicable 2020-04-28 16:54:19 +02:00
GameConfigEdit.h DolphinQt/GameConfigEdit: Remove unimplemented SetReadOnly() member function 2020-01-27 15:44:52 -05:00
GameConfigHighlighter.cpp Qt/GameConfigWidget: Complete overhaul 2019-01-26 00:41:22 +01:00
GameConfigHighlighter.h Qt/GameConfigWidget: Complete overhaul 2019-01-26 00:41:22 +01:00
GameConfigWidget.cpp Remove redundant "Emulation" from "DSP HLE Emulation" 2020-05-03 17:54:05 +02:00
GameConfigWidget.h DolphinQt/GameConfigWidget: Remove unimplemented EditUserConfig() member function 2020-01-27 15:46:52 -05:00
GeckoCodeWidget.cpp Remove double space in GeckoCodeWidget code view 2019-09-01 11:22:42 -07:00
GeckoCodeWidget.h DolphinQt/Config/GeckoCodeWidget: Use forward declarations where applicable 2019-07-31 09:54:54 -04:00
InfoWidget.cpp Show NKitness in file format string 2020-10-06 19:35:00 +02:00
InfoWidget.h Show file format details in game properties 2020-06-21 20:47:23 +02:00
LogConfigWidget.cpp Common: Unify logging namespace with Common 2019-11-28 05:13:21 -05:00
LogConfigWidget.h DolphinQt: Add debug log option in GUI for debug builds 2019-05-08 14:47:34 +02:00
LogWidget.cpp Qt: Use better method of getting default monospace font 2020-09-15 04:48:44 -04:00
LogWidget.h Common: Unify logging namespace with Common 2019-11-28 05:13:21 -05:00
NewPatchDialog.cpp DolphinQt: Use qOverload where applicable 2020-04-28 16:54:19 +02:00
NewPatchDialog.h Reformat repo to clang-format 7.0 rules 2019-05-06 18:48:04 +00:00
PatchesWidget.cpp Connect numerous QPushButtons to use clicked signal instead of pressed. This unifies UI behaviour more. 2019-07-24 00:18:58 +02:00
PatchesWidget.h
PropertiesDialog.cpp DiscIO: Add functions CreateDisc and CreateWAD 2019-07-18 22:29:04 +02:00
PropertiesDialog.h
SettingsWindow.cpp Add Slippi pane to settings 2020-07-16 18:34:08 -04:00
SettingsWindow.h
VerifyWidget.cpp Replace Windows CMake lambda constexpr capture workaround 2020-06-25 13:11:29 +02:00
VerifyWidget.h VolumeVerifier: Add datfile parsing 2019-08-24 16:37:19 +02:00