OBattler
bdc8c711bf
Merge branch 'master' of https://github.com/86Box/86Box
2021-12-18 17:49:27 +01:00
OBattler
fe4ae456f8
File dialogs now set wopenfilestring to all 0x00's before reusing it.
2021-12-18 17:49:14 +01:00
Miran Grča
e99eb8f64d
Merge pull request #1943 from 86Box/tc1995
...
Added QEMU's fifo8 code.
2021-12-18 15:01:05 +01:00
TC1995
688748adbe
Added QEMU's fifo8 code.
...
Added the NCR 53c90 SCSI MCA card and reworked the AMD PCscsi/Tekram DC390 code to use a better port.
2021-12-18 14:44:14 +01:00
ts-korhonen
dbbc4bb8f1
Merge branch 'master' of https://github.com/86Box/86Box into qt
2021-12-18 15:35:28 +02:00
Miran Grča
ae128ebb0e
Merge pull request #1940 from ts-korhonen/master
...
Fix window resizing not always working
2021-12-17 21:35:09 +01:00
ts-korhonen
a03d0f0461
Merge branch 'master' of https://github.com/86Box/86Box
2021-12-17 22:28:11 +02:00
ts-korhonen
766f15d858
Better c++ compatibility to the doresize change
2021-12-17 22:26:21 +02:00
ts-korhonen
d3467568b0
qt: port atomic_flag doresize from master
2021-12-17 22:23:08 +02:00
ts-korhonen
3825d5c53c
Merge branch 'master' into qt
2021-12-17 22:17:14 +02:00
ts-korhonen
805638ddd8
Fix window resize not always working
...
Change doresize to atomic_flag to prevent race condition
2021-12-17 22:15:21 +02:00
ts-korhonen
fee52c0b99
Merge branch 'master' of https://github.com/86Box/86Box into qt
2021-12-17 21:33:46 +02:00
ts-korhonen
31fe83072e
qt: remove redundant files
2021-12-17 21:33:11 +02:00
ts-korhonen
d8483b7c9b
Merge branch 'winqt5' of https://github.com/Cacodemon345/86Box into qt
2021-12-17 21:09:58 +02:00
ts-korhonen
9f7e46afb7
Merge branch 'master' of https://github.com/86Box/86Box into qt
2021-12-17 21:03:48 +02:00
Cacodemon345
227e177b11
Implement action exclusivity in menus
2021-12-18 01:03:05 +06:00
David Hrdlička
7381ab6928
Minor changes to threading
...
- Renamed `cpp11_thread.cpp` to `thread.cpp`
- Removed features that are only supported by Win32 threads (`thread_wait` with timeout and mutex with spinlock)
- Fixed formatting in `thread.cpp`
2021-12-17 19:59:25 +01:00
Cacodemon345
0313d02073
Delegate input events of HardwareRenderer to RendererStack
2021-12-18 00:37:30 +06:00
OBattler
149c67335a
Added a sanity check to the PCap code.
2021-12-17 19:23:46 +01:00
OBattler
64c38701c6
Might as well revert it completely.
2021-12-17 19:15:40 +01:00
OBattler
ea88934c21
Unique lock on event set and reset.
2021-12-17 19:14:28 +01:00
OBattler
57f879ba0b
No notify on reset event.
2021-12-17 19:11:02 +01:00
OBattler
8996a61ba4
And one last fix.
2021-12-17 18:57:22 +01:00
Cacodemon345
cfbc9c22dc
Merge remote-tracking branch 'upstream/master' into winqt5
2021-12-17 23:55:32 +06:00
David Hrdlička
0131550432
Revert "Use recursive mutexes in the C++ thread implementation"
...
This reverts commit 153ac6df9a
.
2021-12-17 18:51:29 +01:00
OBattler
9c7a3477aa
Proper reimplementation of C++11 thread event signaling and the network code now uses an atomic instead of mutexes for wait.
2021-12-17 18:48:13 +01:00
David Hrdlička
153ac6df9a
Use recursive mutexes in the C++ thread implementation
2021-12-17 18:32:11 +01:00
ts-korhonen
ffde0ea254
qt: fix mouse grab on opengl renderer (for windows)
2021-12-17 18:37:57 +02:00
ts-korhonen
0c7450a08a
Merge branch 'winqt5' of https://github.com/Cacodemon345/86Box into qt
2021-12-17 16:48:31 +02:00
ts-korhonen
265abedb3b
Merge branch 'qt' of https://github.com/jgilje/86Box into qt
2021-12-17 16:23:59 +02:00
Cacodemon345
2aa93d2e17
Merge remote-tracking branch 'winqt/qt' into winqt5
2021-12-17 16:36:47 +06:00
Joakim L. Gilje
c3c5a87a70
fixups after latest merge: plat_midi_ => rtmidi_, framebuffer is now 2048x2048
2021-12-17 11:10:32 +01:00
Joakim L. Gilje
d548dd7e52
Merge branch 'master' of github.com:86box/86Box into qt
2021-12-17 10:59:04 +01:00
David Hrdlička
e0a73a99ec
Turn the RtMidi module into a full standalone MIDI module
...
Removes the now-redundant platform MIDI infrastructure
2021-12-17 10:10:59 +01:00
David Hrdlička
275919859a
Fix typos
2021-12-17 07:41:07 +01:00
Cacodemon345
30376341d1
Start of windowed OpenGL rendering
2021-12-17 12:17:54 +06:00
David Hrdlička
7df9e2a454
Add a compile option to choose between thread implementations
2021-12-17 06:59:53 +01:00
ts-korhonen
e686a0ad87
qt: Buffer/texture size to 2048x2048
2021-12-17 07:52:30 +02:00
ts-korhonen
2589a79f6a
Merge branch 'master' of https://github.com/86Box/86Box into qt
2021-12-17 07:38:43 +02:00
ts-korhonen
2e4c5fd94c
Merge branch 'qt' of https://github.com/jgilje/86Box into qt
2021-12-17 07:37:04 +02:00
OBattler
707acadd36
Replaced the Win32 threads with the proven to be better performing C++11 threads.
2021-12-17 03:49:54 +01:00
OBattler
84ff7ab6ff
Fixed OpenGL 3.0 core.
2021-12-17 03:44:22 +01:00
OBattler
ce8f66bc07
Reduced the texture size back 2048x2048.
2021-12-17 03:30:13 +01:00
Joakim L. Gilje
f8cd957aac
missing include for unique_ptr
2021-12-16 22:30:48 +01:00
ts-korhonen
b3c0485515
qt: import plugins only for win32 build
2021-12-16 23:05:55 +02:00
Joakim L. Gilje
c1c857a0f9
Merge branch 'master' of github.com:86box/86Box into qt
2021-12-16 20:27:33 +01:00
ts-korhonen
f0233bbede
Merge branch 'master' of https://github.com/86Box/86Box into qt
2021-12-16 19:35:38 +02:00
ts-korhonen
bb4859e55e
Merge branch 'qt' of https://github.com/jgilje/86Box into qt
2021-12-16 19:35:34 +02:00
Joakim L. Gilje
92b7ea8536
simplified (from @OBattler)
2021-12-16 13:52:37 +01:00
OBattler
ff02073050
Moved the machine RAM sanity check to machine_get_max_ram().
2021-12-16 13:18:09 +01:00