7813 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
OBattler	c19b06d404	Added a sanity check and more clean-ups.	2022-02-20 14:19:38 +01:00
OBattler	01e0609ab6	And more network clean-ups and fixes.	2022-02-20 13:58:38 +01:00
Miran Grča	83f29f88cd	Merge pull request #2148 from Cacodemon345/patch-61 ... qt: Fix high CPU usage when paused	2022-02-20 12:26:42 +01:00
Cacodemon345	be900f1d32	qt: Fix high CPU usage when paused	2022-02-20 15:04:24 +06:00
Jasmine Iwanek	a66e392b26	A few missed bits	2022-02-20 00:58:08 -05:00
Jasmine Iwanek	b797b7f667	Merge branch 'more-updates' of https://github.com/jriwanek-forks/86Box into more-updates	2022-02-20 00:33:50 -05:00
Jasmine Iwanek	78c7573705	use defines for LPT and Serial port count ... Also fixes LPT4 device setting.	2022-02-20 00:33:47 -05:00
Jasmine Iwanek	2836c7f05b	CONFIG_MIDI -> CONFIG_MIDI_OUT	2022-02-20 00:33:05 -05:00
Jasmine Iwanek	25e9087f3f	clean up spaces and tabs at the end of lines	2022-02-20 00:33:04 -05:00
Jasmine Iwanek	a6b0b8d631	clean up spaces and tabs at the end of lines	2022-02-19 23:52:47 -05:00
Jasmine Iwanek	1362ade967	Merge branch 'master' into more-updates	2022-02-19 23:39:55 -05:00
OBattler	7928bc8c1c	And even more.	2022-02-20 02:03:42 +01:00
OBattler	f06736ed9a	And more.	2022-02-20 02:01:56 +01:00
OBattler	b4c1e801c5	Some more network changes.	2022-02-20 02:00:23 +01:00
OBattler	4d56f89fb2	Merge branch 'master' of https://github.com/86Box/86Box ... # Conflicts: # src/win/Makefile.mingw	2022-02-20 01:46:02 +01:00
OBattler	8ac721d395	Fixed linking with Makefile.mingw.	2022-02-20 01:41:31 +01:00
David Hrdlička	623b38975c	Don't link OpenAL on legacy makefile if disabled	2022-02-20 01:40:56 +01:00
OBattler	572a08b478	Merge branch 'master' of https://github.com/86Box/86Box	2022-02-20 01:30:56 +01:00
OBattler	8ec062e1ec	And of course, release the mutex as well after we're done.	2022-02-20 01:30:37 +01:00
David Hrdlička	268e880830	Merge branch 'feature/xaudio2'	2022-02-20 01:27:48 +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
David Hrdlička	8f5981bbfd	Jenkins: Disable FAudio for now	2022-02-20 01:14:47 +01:00
David Hrdlička	4f4ed24e8d	Try to find FAudio manually if no pkgconfig is found for it	2022-02-20 01:01:14 +01:00
David Hrdlička	5f0453746f	Add FAudio to the Mac and Linux GitHub build actions dependencies	2022-02-20 00:51:53 +01:00
David Hrdlička	0f3c2232ad	Add XAudio2 support to the legacy Makefile	2022-02-20 00:48:39 +01:00
David Hrdlička	6a63ae21f8	Remove the USE_OPENAL define as the reason for its introduction is gone	2022-02-20 00:46:24 +01:00
David Hrdlička	3101d74658	Add XAudio2 support to the FAudio sound backend	2022-02-20 00:41:28 +01:00
David Hrdlička	72a7c9cdcf	Rename faudio.cpp to xaudio2.c	2022-02-20 00:34:26 +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	4287e44824	newlines at end of file	2022-02-18 21:38:51 -05:00
Jasmine Iwanek	30e0c7f21b	A couple of cleanups I missed	2022-02-18 19:47:35 -05:00
Jasmine Iwanek	6b5fc80c50	Update khrplatform.h from upstream	2022-02-18 19:46:31 -05:00
Jasmine Iwanek	3d9ce0f725	Merge branch 'master' into more-updates	2022-02-18 19:44:15 -05:00
Jasmine Iwanek	7fc893bdb0	Include guards on our headers	2022-02-18 19:42:21 -05: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 7d3cfc0fe5.	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 efb79217f2, reversing changes made to 351db812e0.	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