7631 Commits

Author SHA1 Message Date
OBattler
8ec062e1ec And of course, release the mutex as well after we're done. 2022-02-20 01:30:37 +01:00
OBattler
f35ee02157 Merge branch 'master' of https://github.com/86Box/86Box 2022-02-20 01:22:44 +01:00
OBattler
bd32abf94e Attempt to make the main thread wait for network mutex. 2022-02-20 01:22:28 +01:00
Miran Grča
42b22c5296
Merge pull request #2141 from Cacodemon345/newqt
FAudio audio backend
2022-02-19 19:01:12 +01:00
David Hrdlička
e03a0c446e Fix Mac bundles (hopefully finally) 2022-02-19 16:28:57 +01:00
David Hrdlička
a625f37237 Add EditorConfig for JSON files 2022-02-19 08:55:17 -05:00
Cacodemon345
09716ae284 FAudio audio backend 2022-02-19 15:40:00 +06:00
Jasmine Iwanek
649a6ac5b2
Merge branch '86Box:master' into master 2022-02-18 18:16:38 -05:00
David Hrdlička
5a2bfc7325 Revert "Only run actions for the master branch"
This reverts commit 7d3cfc0fe5a36539cd3b860469f98240e53c4314.
2022-02-19 00:13:51 +01:00
Jasmine Iwanek
6d57d031fa
Update cmake.yml 2022-02-18 17:38:16 -05:00
Jasmine Iwanek
78629c077e
Make all branches build again 2022-02-18 17:37:26 -05:00
David Hrdlička
7d3cfc0fe5 Only run actions for the master branch 2022-02-18 22:03:17 +01:00
David Hrdlička
4d6821f458
Merge pull request #2137 from jriwanek-forks/update-actions
Disable excessive GH Actions builds
2022-02-18 21:55:52 +01:00
Jasmine Iwanek
f059e6b8fd Disable excessive GH Actions builds 2022-02-18 15:52:04 -05:00
OBattler
ee5630f9c4 Updated the version number to 3.3. 2022-02-18 21:44:42 +01:00
David Hrdlička
76fbaa4b8c Revert "Merge branch 'master' of https://github.com/86Box/86Box"
This reverts commit efb79217f2cef968f58b6dc9065c5135f0790222, reversing
changes made to 351db812e07cb85e34f11bb26d3121f4193e685c.
2022-02-18 21:42:05 +01:00
RichardG867
08c8a02f28 Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30 2022-02-18 14:41:34 -03:00
RichardG867
520820a6a8 snd_cs423x: Temporarily disable PnP key disabling mechanism 2022-02-18 14:41:24 -03:00
RichardG867
de6a5b4e79 isapnp: Add method for disabling the PnP key for a single device 2022-02-18 14:34:43 -03:00
OBattler
efb79217f2 Merge branch 'master' of https://github.com/86Box/86Box
# Conflicts:
#	CMakeLists.txt
#	src/include_make/86box/version.h
2022-02-18 17:53:05 +01:00
OBattler
0a71f19213 Updated the version number to 3.3. 2022-02-18 17:51:00 +01:00
Miran Grča
351db812e0
Merge pull request #2133 from Cacodemon345/newqt
qt: Fix network adapter combobox being grayed out when PCap is initially enabled
2022-02-18 17:49:12 +01:00
Miran Grča
5df092dc7f
Merge pull request #2136 from jriwanek-forks/fix-actions
Disable CLANG64 builds for now
2022-02-18 17:49:02 +01:00
RichardG867
07cba51e7b Implement Crystal CS4235 2022-02-18 13:46:04 -03:00
Jasmine Iwanek
79703457cf Disable CLANG64 builds for now 2022-02-18 04:52:03 -05:00
RichardG867
7f0c8fae5c snd_cs423x: Actually fix the startup crash, caused by co-existing with VIA 686 SBPro compatibility 2022-02-17 17:46:11 -03:00
RichardG867
7696eea94e isapnp: Check if a card has a valid ROM before allowing it to be isolated 2022-02-17 16:44:49 -03:00
RichardG867
10875e7c7c snd_cs423x: Fix crash caused by initializing SBPro before ISAPnP 2022-02-17 15:22:11 -03:00
RichardG867
6544bd9fa0 Jenkins: Exclude one /usr/share directory created by SDL 2022-02-17 15:20:32 -03:00
Cacodemon345
d77dd42f8e qt: Fix network adapter combobox being grayed out when PCap is initially enabled 2022-02-18 00:04:48 +06:00
RichardG867
22603a37b0 Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30 2022-02-17 11:29:50 -03:00
RichardG867
29b37d9f97 Make SST flash not fatal on size mismatch, fixes Shuttle HOT-433A with old Intel flash files 2022-02-17 11:29:35 -03:00
RichardG867
68d557188a Bump version to 3.2.1 2022-02-17 11:28:01 -03:00
Miran Grča
a4e9fc7b14
Merge pull request #2131 from Cacodemon345/patch-60
Xi2: Warp mouse cursor only on Xi2 thread
2022-02-17 11:50:16 +01:00
Cacodemon345
0ea4508ce3 qt: Fix media menu not appearing for non-HDD storage devices with certain IDE controllers 2022-02-17 14:45:52 +06:00
Cacodemon345
d87d0be2f8 qt: Uncapture mouse before exit 2022-02-17 11:51:24 +06:00
Cacodemon345
be3501cfe1 qt: Avoid crashes on X11 at exit 2022-02-17 11:45:42 +06:00
Cacodemon345
4f9af2eb77
Xi2: Warp mouse cursor only on Xi2 thread 2022-02-17 10:25:37 +06:00
RichardG867
d51d3cc4a7 Managers are Windows only 2022-02-16 16:08:43 -03:00
RichardG867
42e217c905 Copy manager notice from website 2022-02-16 13:31:32 -03:00
RichardG867
6b8f536c55 Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30 2022-02-16 13:29:44 -03:00
RichardG867
25623e0136 Copy new system requirements from website 2022-02-16 13:29:27 -03:00
David Hrdlička
ac4a6ccb9c Reverted the fix for the Qt about dialog as it wasn't broken in the first place 2022-02-16 11:34:04 +01:00
OBattler
e906886ddc And fixed Win32 as well. 2022-02-16 11:19:54 +01:00
OBattler
9b0c50f91e Fixed the fix. 2022-02-16 11:18:18 +01:00
OBattler
6a6187e104 Fixed the website button in the QT About box. 2022-02-16 11:14:38 +01:00
RichardG867
b9ecb212e2 Hide ACPI shutdown button for release 2022-02-15 21:00:55 -03:00
RichardG867
3323844e74 Fix URL hardcoding in the Qt UI 2022-02-15 20:44:13 -03:00
RichardG867
f4dfb044c7 Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30 2022-02-15 20:18:49 -03:00
RichardG867
633ac3ad9d Jenkins: Add zlib to appimage dependencies 2022-02-15 19:56:26 -03:00