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
JMC47
e0117a86ad
Merge pull request #8819 from JosJuice/panic-alert-deadlock-pause-on-focus-loss
...
DolphinQt: Fix the panic alert deadlock, Pause on Focus Loss edition
2020-09-15 11:46:46 -04:00
R2DLiu
9a4d2799d4
even with 0646c9a
2020-08-22 10:43:34 -04:00
Filip Gawin
0ede5d1537
Use range loop (if possible)
2020-07-18 18:29:16 -05:00
R2DLiu
1780d6bd52
more work
2020-07-16 18:39:06 -04:00
R2DLiu
76adf9000e
sort of working save states
2020-07-16 18:39:06 -04:00
R2DLiu
c9a8039957
hack out a test gui
2020-07-16 18:38:28 -04:00
R2DLiu
ced28d629d
Compiling. Online and rollback work. Replays broken currently
2020-07-16 18:35:28 -04:00
JosJuice
cc330afa6b
DolphinQt: Fix the panic alert deadlock, Pause on Focus Loss edition
...
why are there so many ways to trigger this issue
2020-05-18 19:38:56 +02:00
iwubcode
e125c61d47
VideoCommon: remove VertexShaderManager functions instead preferring the direct freelook camera methods
2020-05-03 13:34:13 -05:00
Stenzek
cdb0aa850d
Qt/RenderWidget: Remove fill background functionality
...
We no longer need this since the video backend handles clearing the
window, and it fixes MoltenVK with Qt 5.14.
2020-03-11 23:13:45 +10:00
Connor McLaughlin
a0b7c1beae
Merge pull request #8366 from Techjar/high-dpi-auto-adjust
...
Qt/RenderWidget: Account for devicePixelRatio when auto-adjusting window size
2020-01-24 11:31:09 +10:00
Techjar
3006c73bf6
Qt/RenderWidget: Account for devicePixelRatio when auto-adjusting window size
2019-11-01 14:37:29 -04:00
ferrrry
ae337dbea9
Qt: Add "renderer" window role to render window
2019-10-25 22:51:05 +01:00
spycrab
ec526fee56
Externals/Qt: Update to 5.13.1
2019-10-13 16:06:56 +02:00
Lioncash
a9663669dc
Common/CommonFuncs: Remove now-unneccessary ArraySize function
...
Since C++17, non-member std::size() is present in the standard library
which also operates on regular C arrays. Given that, we can just replace
usages of ArraySize with that where applicable.
In many cases, we can just change the actual C array ArraySize() was
called on into a std::array and just use its .size() member function
instead.
In some other cases, we can collapse the loops they were used in, into a
ranged-for loop, eliminating the need for en explicit bounds query.
2019-06-01 10:07:57 -04:00
Léo Lam
6f84984b7b
Use attribute [[fallthrough]]
2019-05-04 23:04:18 +02:00
Pokechu22
0cb27cc42c
Fix the screen going black on pause after changing windows
...
More info: https://zeduckmaster.frama.io/2016/how-to-create-a-custom-rendering-in-a-qt5-widget/
2019-04-27 23:26:44 -07:00
JMC47
6ea43235d5
Merge pull request #7841 from iwubcode/config-mgr-onion
...
Config: Move the 'Display' settings from ConfigManager to the layered config system
2019-04-21 00:01:47 -04:00
Jordan Woyak
779e618046
VideoCommon: Change free-look's middle-mouse action to roll the camera.
2019-04-17 05:10:11 -05:00
iwubcode
840afc2ad4
Config: Move the 'Display' settings from ConfigManager to the layered config system
2019-03-30 18:43:02 -05:00
spycrab
0a3279ae6b
Fix ImGui key mapping Enter to the numpad
2019-03-21 13:16:21 +01:00
spycrab
70da86f1c3
Qt: Use ModalMessageBox everywhere
2019-03-04 21:53:02 +01:00
JosJuice
b14e540671
Merge pull request #7736 from stenzek/imgui-hidpi
...
RenderWidget: Fix mouse position for imgui on hidpi screens
2019-01-25 22:45:31 +01:00
spycrab
f908612452
DolphinQt: Fix some warnings
2019-01-25 17:21:38 +01:00
Stenzek
3d8145af65
RenderWidget: Fix mouse position for imgui on hidpi screens
2019-01-26 01:31:58 +10:00
Stenzek
36ce47635b
RenderWidget: Hook up to ImGui
2019-01-25 11:15:57 +10:00
Dan B
d69740c8b4
Reimplement savestate loading via drag and drop
2019-01-16 21:19:31 +01:00
Stenzek
eb284b5d66
VideoBackends: Pass window system info from host on creation
2018-10-20 21:11:34 +10:00
Stenzek
a3961750a7
Drop Host_GetRenderSurface and pass display to backend
2018-10-20 21:11:34 +10:00
spycrab
13ba24c5a6
Move DolphinQt2 to DolphinQt
2018-07-07 00:48:38 +02:00
