Commit Graph

6847 Commits

Author SHA1 Message Date
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
OBattler
1d5d304aaa Updated the name and the comment of the Kaimei 486. 2021-12-16 13:15:09 +01:00
Joakim L. Gilje
17a75137de include <algorithm> for std::min 2021-12-16 12:53:04 +01:00
ts-korhonen
07e0b54171 qt: Set vsync off for hardware renderers 2021-12-16 07:52:33 +02:00
ts-korhonen
9d313fde17 qt: clear buffers_in_use flags when changing renderer 2021-12-15 21:19:46 +02:00
ts-korhonen
75c045c103 Merge branch 'qt' of https://github.com/jgilje/86Box into qt 2021-12-15 21:09:59 +02:00
Joakim L. Gilje
1cc09b9033 make sure render-widget gets deleted when switching 2021-12-15 20:02:35 +01:00
Joakim L. Gilje
d2115bc5e4 init the renderer on demand, instead of always ready 2021-12-15 19:58:09 +01:00
ts-korhonen
2bd2dd9add Merge branch 'qt' of https://github.com/jgilje/86Box into qt 2021-12-15 19:20:25 +02:00
Joakim L. Gilje
cf79387f35 accidentally used machine_getname_ex when populating machine types 2021-12-15 12:13:40 +01:00
ts-korhonen
0e4e795992 qt: Add missing include 2021-12-15 07:50:31 +02:00
ts-korhonen
f3b0a857c4 Define M_PI on sdl_joystick.cpp if undefined 2021-12-15 00:50:46 +02:00
ts-korhonen
d570be1a50 Merge branch 'qt' of https://github.com/jgilje/86Box into qt 2021-12-15 00:43:46 +02:00
ts-korhonen
7c2cd35965 qt: Add overload protection to renderers
Added atomic_flags for renderer buffers to prevent concurrent usage and
overloading the renderer with draw requests when it's busy.
2021-12-15 00:37:48 +02:00
Joakim L. Gilje
dec90c7ae0 refactored setTitle to just be a normal AutoConnection signal 2021-12-14 20:30:09 +01:00
Joakim L. Gilje
61ab0e60ca merged in machine flags/bus refactoring started in 6661ff5dcc 2021-12-14 13:53:56 +01:00
Joakim L. Gilje
5fcddcbfdd removed old code 2021-12-14 13:18:50 +01:00
Joakim L. Gilje
2af0a72b05 Merge branch 'master' of github.com:86box/86Box into qt 2021-12-14 13:17:03 +01:00
Joakim L. Gilje
d82211fd17 Merge pull request #28 from Cacodemon345/patch-34
Fix compilation on macOS
2021-12-14 13:10:23 +01:00
Cacodemon345
a4905da036 Fix compilation on macOS 2021-12-14 16:33:53 +06:00
Joakim L. Gilje
4ff78e3766 Merge remote-tracking branch 'origin/qt' into qt 2021-12-13 22:45:53 +01:00
Joakim L. Gilje
a39307d178 ported joystick config to qt. sdl-joystick implementation from pcem 2021-12-13 22:45:37 +01:00
Joakim L. Gilje
7ed8d46c2c Merge pull request #27 from Cacodemon345/qt
Status bar improvements
2021-12-13 20:59:19 +01:00
Cacodemon345
aca31d5d28 Remove misleading comment 2021-12-14 01:58:00 +06:00
Cacodemon345
9cd5f8a070 Fix HDDs on certain buses not appearing in status bar 2021-12-14 01:56:28 +06:00
Cacodemon345
f3536e8f79 Open sound gain dialog on double-click 2021-12-14 01:02:08 +06:00
Cacodemon345
35b6c031d1 Merge branch 'qt' of ssh://github.com/Cacodemon345/86box into qt 2021-12-14 00:56:39 +06:00
Cacodemon345
4f72c4c9ea Make sure status bar icons trigger menus 2021-12-14 00:54:38 +06:00
Cacodemon345
dcd7fb6245 Merge branch 'qt' of https://github.com/jgilje/86box into qt 2021-12-14 00:39:50 +06:00