ShuriZma
synced commits to refs/pull/12651/merge at ShuriZma/dolphin from mirror
2024-03-21 04:22:31 +00:00
3e39cabd77
Merge 25833cfd62b62698977c16ad8037b1c8064942fa into 2d5286d2e26a42b724fd91f6506a7998de730848
2d5286d2e2
Merge pull request #12642 from jordan-woyak/state-write-osd-errors
03f2b99ffe
Merge pull request #12603 from Sam-Belliveau/oklab_resampling
b19cf1f962
Merge pull request #12650 from jordan-woyak/balloon-tip-multimon
7f1e7314de
Merge pull request #12649 from mitaclaw/kill-is-running-in-current-thread
ShuriZma
synced commits to refs/pull/12652/head at ShuriZma/dolphin from mirror
2024-03-21 04:22:31 +00:00
146504d635
Common: add json utility functions 'ReadStringFromJson' and 'ReadBoolFromJson' to match 'ReadNumericFromJson' functionality for other data types, similarly support other data types for 'ToJsonArray'
69694494ce
Common: update 'ReadNumericOrDefault' to 'ReadNumericFromJson' and have it return an optional, this provides the caller with more flexibility
ShuriZma
synced commits to refs/pull/12652/merge at ShuriZma/dolphin from mirror
2024-03-21 04:22:31 +00:00
a5e6e72724
Merge 146504d6357513fded0eaf4edc77e0c2a1ee1640 into 2d5286d2e26a42b724fd91f6506a7998de730848
2d5286d2e2
Merge pull request #12642 from jordan-woyak/state-write-osd-errors
03f2b99ffe
Merge pull request #12603 from Sam-Belliveau/oklab_resampling
b19cf1f962
Merge pull request #12650 from jordan-woyak/balloon-tip-multimon
7f1e7314de
Merge pull request #12649 from mitaclaw/kill-is-running-in-current-thread
ShuriZma
synced commits to refs/pull/8785/merge at ShuriZma/dolphin from mirror
2024-03-21 04:22:31 +00:00
663e9e8cfe
Merge e0d588e375375eb693d4eae8b773666f22670970 into 2d5286d2e26a42b724fd91f6506a7998de730848
2d5286d2e2
Merge pull request #12642 from jordan-woyak/state-write-osd-errors
03f2b99ffe
Merge pull request #12603 from Sam-Belliveau/oklab_resampling
b19cf1f962
Merge pull request #12650 from jordan-woyak/balloon-tip-multimon
7f1e7314de
Merge pull request #12649 from mitaclaw/kill-is-running-in-current-thread
ShuriZma
synced commits to refs/pull/12569/merge at ShuriZma/dolphin from mirror
2024-03-21 04:22:30 +00:00
b7e56cce7f
Merge d17495a75a51b0c695554d40649ab1b2bc9c249e into 76a74daac2b61f417f7730b9dd427f7eec8d8d5a
76a74daac2
Merge pull request #12641 from jordan-woyak/d3d-before-ogl
ac5c2d9bf2
VideoCommon: Prefer D3D11/12 over OpenGL on Windows.
ShuriZma
synced commits to refs/pull/12580/merge at ShuriZma/dolphin from mirror
2024-03-21 04:22:30 +00:00
3dad52c51d
Merge 0c3a531cd1f50ee6af04b59ad02a51b3c6972920 into 2d5286d2e26a42b724fd91f6506a7998de730848
2d5286d2e2
Merge pull request #12642 from jordan-woyak/state-write-osd-errors
03f2b99ffe
Merge pull request #12603 from Sam-Belliveau/oklab_resampling
b19cf1f962
Merge pull request #12650 from jordan-woyak/balloon-tip-multimon
7f1e7314de
Merge pull request #12649 from mitaclaw/kill-is-running-in-current-thread
ShuriZma
synced commits to refs/pull/12584/merge at ShuriZma/dolphin from mirror
2024-03-21 04:22:30 +00:00
4a9ced1b1e
Merge 05f7fe851e35dcdff095078d457d274fc511e62b into 76a74daac2b61f417f7730b9dd427f7eec8d8d5a
76a74daac2
Merge pull request #12641 from jordan-woyak/d3d-before-ogl
ac5c2d9bf2
VideoCommon: Prefer D3D11/12 over OpenGL on Windows.
ShuriZma
synced commits to refs/pull/12594/merge at ShuriZma/dolphin from mirror
2024-03-21 04:22:30 +00:00
01127cc6a4
Merge 7569275d1f4e06944f6117e296a8fc1e25638cb7 into 76a74daac2b61f417f7730b9dd427f7eec8d8d5a
76a74daac2
Merge pull request #12641 from jordan-woyak/d3d-before-ogl
ac5c2d9bf2
VideoCommon: Prefer D3D11/12 over OpenGL on Windows.
ShuriZma
synced commits to refs/pull/12606/merge at ShuriZma/dolphin from mirror
2024-03-21 04:22:30 +00:00
7bd4f722df
Merge 0d4cb5ddc7741f8266869bdae453bb2805200e55 into 2d5286d2e26a42b724fd91f6506a7998de730848
2d5286d2e2
Merge pull request #12642 from jordan-woyak/state-write-osd-errors
03f2b99ffe
Merge pull request #12603 from Sam-Belliveau/oklab_resampling
b19cf1f962
Merge pull request #12650 from jordan-woyak/balloon-tip-multimon
7f1e7314de
Merge pull request #12649 from mitaclaw/kill-is-running-in-current-thread
ShuriZma
synced commits to refs/pull/12611/merge at ShuriZma/dolphin from mirror
2024-03-21 04:22:30 +00:00
5009d341ab
Merge c0871d8d051b381bcbfc752a46076d26098ef4b4 into 2d5286d2e26a42b724fd91f6506a7998de730848
2d5286d2e2
Merge pull request #12642 from jordan-woyak/state-write-osd-errors
03f2b99ffe
Merge pull request #12603 from Sam-Belliveau/oklab_resampling
b19cf1f962
Merge pull request #12650 from jordan-woyak/balloon-tip-multimon
7f1e7314de
Merge pull request #12649 from mitaclaw/kill-is-running-in-current-thread
ShuriZma
synced commits to refs/pull/12614/merge at ShuriZma/dolphin from mirror
2024-03-21 04:22:30 +00:00
545a7a92d1
Merge 9029b7a08283f64f993f87d8378c6d6e285eba06 into 2d5286d2e26a42b724fd91f6506a7998de730848
2d5286d2e2
Merge pull request #12642 from jordan-woyak/state-write-osd-errors
03f2b99ffe
Merge pull request #12603 from Sam-Belliveau/oklab_resampling
b19cf1f962
Merge pull request #12650 from jordan-woyak/balloon-tip-multimon
7f1e7314de
Merge pull request #12649 from mitaclaw/kill-is-running-in-current-thread
ShuriZma
synced commits to refs/pull/12617/merge at ShuriZma/dolphin from mirror
2024-03-21 04:22:30 +00:00
58c7c5c6c3
Merge 5da0bac61c2733ef0218820aeb6b919c42580207 into 76a74daac2b61f417f7730b9dd427f7eec8d8d5a
76a74daac2
Merge pull request #12641 from jordan-woyak/d3d-before-ogl
ac5c2d9bf2
VideoCommon: Prefer D3D11/12 over OpenGL on Windows.
ShuriZma
synced commits to refs/pull/12619/merge at ShuriZma/dolphin from mirror
2024-03-21 04:22:30 +00:00
18265521b4
Merge 325792432abecaf89f3279f934dcc186df4354a7 into 76a74daac2b61f417f7730b9dd427f7eec8d8d5a
76a74daac2
Merge pull request #12641 from jordan-woyak/d3d-before-ogl
ac5c2d9bf2
VideoCommon: Prefer D3D11/12 over OpenGL on Windows.
ShuriZma
synced commits to refs/pull/12620/merge at ShuriZma/dolphin from mirror
2024-03-21 04:22:30 +00:00
934c8a16eb
Merge 456844639815b4bd2f136c161d6e558f96e6182e into 2d5286d2e26a42b724fd91f6506a7998de730848
2d5286d2e2
Merge pull request #12642 from jordan-woyak/state-write-osd-errors
03f2b99ffe
Merge pull request #12603 from Sam-Belliveau/oklab_resampling
b19cf1f962
Merge pull request #12650 from jordan-woyak/balloon-tip-multimon
7f1e7314de
Merge pull request #12649 from mitaclaw/kill-is-running-in-current-thread
ShuriZma
synced commits to refs/pull/12624/merge at ShuriZma/dolphin from mirror
2024-03-21 04:22:30 +00:00
98d9906e4a
Merge 158f876b8c9e6a7e72850dcc9034503080230338 into 2d5286d2e26a42b724fd91f6506a7998de730848
2d5286d2e2
Merge pull request #12642 from jordan-woyak/state-write-osd-errors
03f2b99ffe
Merge pull request #12603 from Sam-Belliveau/oklab_resampling
b19cf1f962
Merge pull request #12650 from jordan-woyak/balloon-tip-multimon
7f1e7314de
Merge pull request #12649 from mitaclaw/kill-is-running-in-current-thread
ShuriZma
synced commits to refs/pull/12626/merge at ShuriZma/dolphin from mirror
2024-03-21 04:22:30 +00:00
7a58686eb4
Merge 11dd5ba4853008f1aebd08d634512f626cd9bcfc into 76a74daac2b61f417f7730b9dd427f7eec8d8d5a
76a74daac2
Merge pull request #12641 from jordan-woyak/d3d-before-ogl
ac5c2d9bf2
VideoCommon: Prefer D3D11/12 over OpenGL on Windows.
ShuriZma
synced commits to refs/pull/12631/merge at ShuriZma/dolphin from mirror
2024-03-21 04:22:30 +00:00
3b41d1722a
Merge b23dbad0985216aa7de57ed58042b022121e7c13 into 76a74daac2b61f417f7730b9dd427f7eec8d8d5a
76a74daac2
Merge pull request #12641 from jordan-woyak/d3d-before-ogl
ac5c2d9bf2
VideoCommon: Prefer D3D11/12 over OpenGL on Windows.
ShuriZma
synced commits to refs/pull/12636/merge at ShuriZma/dolphin from mirror
2024-03-21 04:22:30 +00:00
4b7779b41c
Merge b661855573e3b7282a83efd19872d4d416cce8f7 into 2d5286d2e26a42b724fd91f6506a7998de730848
2d5286d2e2
Merge pull request #12642 from jordan-woyak/state-write-osd-errors
03f2b99ffe
Merge pull request #12603 from Sam-Belliveau/oklab_resampling
b19cf1f962
Merge pull request #12650 from jordan-woyak/balloon-tip-multimon
7f1e7314de
Merge pull request #12649 from mitaclaw/kill-is-running-in-current-thread
ShuriZma
synced commits to refs/pull/12639/merge at ShuriZma/dolphin from mirror
2024-03-21 04:22:30 +00:00
901bd399b9
Merge 8495a129643e924118ba08c09e5611645b60cc05 into 76a74daac2b61f417f7730b9dd427f7eec8d8d5a
76a74daac2
Merge pull request #12641 from jordan-woyak/d3d-before-ogl
ac5c2d9bf2
VideoCommon: Prefer D3D11/12 over OpenGL on Windows.
ShuriZma
synced commits to refs/pull/12642/head at ShuriZma/dolphin from mirror
2024-03-21 04:22:30 +00:00
f922129255
Core/State: Display messages on state write failures.