Commit Graph

6832 Commits

Author SHA1 Message Date
OBattler
71cca642ac And another. 2021-12-04 02:27:57 +01:00
OBattler
7ef61299d6 And another. 2021-12-04 02:25:59 +01:00
OBattler
b75a81bdc2 And another. 2021-12-04 02:24:54 +01:00
OBattler
3fc0a73f3e And another fix. 2021-12-04 02:22:28 +01:00
OBattler
ed3cb694a7 Fixes to the Croatian and Slovenian translations. 2021-12-04 02:21:10 +01:00
OBattler
a69369c1ba Merge branch 'master' of https://github.com/86Box/86Box
# Conflicts:
#	src/CMakeLists.txt
2021-12-04 01:34:15 +01:00
OBattler
69b40be0cb Missing endif(). 2021-12-04 01:32:20 +01:00
David Hrdlička
7064e76896 Revert "Attempted fix for RtMidi."
This reverts commit 9e00ac9c9f.
2021-12-04 01:31:30 +01:00
OBattler
9e00ac9c9f Attempted fix for RtMidi. 2021-12-04 01:24:27 +01:00
OBattler
051b41ea6c Updated MacOS bundle version. 2021-12-04 01:21:11 +01:00
OBattler
89c5bbb115 Fixes by basic2004 for the Japanese and Korean translations. 2021-12-04 00:17:45 +01:00
OBattler
f36462639a Fixed the OpenGL menu in the Chinese (Simplified) translation. 2021-12-03 23:34:42 +01:00
David Hrdlička
538b9bc478 Fix link order in MSYS2 build 2021-12-03 23:10:46 +01:00
David Hrdlička
2175fc5888 Require C++11 support; fixes the Mac build 2021-12-03 21:51:31 +01:00
David Hrdlička
156e88f20a Use static MSVCRT only when using static vcpkg deps
Should fix MT/MD mismatch with rtmidi
2021-12-03 21:51:31 +01:00
David Hrdlička
4338560466 Properly find rtmidi on the CMake build 2021-12-03 21:51:31 +01:00
David Hrdlička
8a66570e9d Add rtmidi to Linux and Mac jobs 2021-12-03 21:17:30 +01:00
Cacodemon345
5c2682ff8c Fix transparency/whiteness glitches on Wayland/macOS 2021-12-04 02:14:06 +06:00
David Hrdlička
e7ae91ed59 Fix the rtmidi dependency 2021-12-03 20:54:52 +01:00
OBattler
54551fc6c4 RtMidi fixes. 2021-12-03 20:20:02 +01:00
OBattler
0e5df9f3ce Merge branch 'master' of https://github.com/86Box/86Box 2021-12-03 20:12:55 +01:00
OBattler
3eaa6153b5 Switched MIDI to RtMidi. 2021-12-03 20:12:44 +01:00
Miran Grča
303707998b Update for RTMidi. 2021-12-03 20:10:45 +01:00
OBattler
4a7b330f3f Minor Russian translation fixes by mlow. 2021-12-03 19:48:51 +01:00
ts-korhonen
2ae53720b9 Merge branch 'qt' of https://github.com/jgilje/86Box into qt 2021-12-03 17:23:31 +02:00
Joakim L. Gilje
b34737a7e7 removed atomic_bool for events => use standard mutex around the event state 2021-12-03 15:50:41 +01:00
Miran Grča
6f632e096c Merge pull request #1903 from notmlow/patch-5
Fixed a typo under cassette menu.
2021-12-03 15:49:04 +01:00
mlow
09dd15782a Fixed a typo under cassette menu.
Fixed a typo under the cassette menu. The typo is Image Exsistane while the correct spelling is Image Existante.
2021-12-03 09:37:19 -05:00
mlow
51cfb056c9 Fix a mistake in the French translation (#1902)
Fixed a typo under the Vue menu section. The typo is Echelle facteurr while the correct spelling is Echelle facteur.
2021-12-03 15:30:23 +01:00
mlow
0a0d477458 Fix a mistake in French translation (#1901)
Properly translated the Help menu tab to Aide instead of ?.
2021-12-03 15:27:03 +01:00
Joakim L. Gilje
d4e9686cd9 couple of simplifications
* in paint: we can draw the m_image directly, no need to convert it
* in blit: static auto imagebits = m_image.bits(); should not be static
* in blit: we can bulk copy the entire image, no need to iterate horizontal lines
2021-12-03 15:12:23 +01:00
ts-korhonen
62440f2f15 Fix RtMidi linking errors 2021-12-03 16:01:32 +02:00
Joakim L. Gilje
df5d4e6cb6 Merge pull request #10 from Cacodemon345/patch-24
Fix linker errors on macOS
2021-12-03 15:00:33 +01:00
ts-korhonen
98072fc53f Merge branch 'qt' of https://github.com/jgilje/86Box into qt 2021-12-03 15:59:10 +02:00
Cacodemon345
0a10cd10d6 Fix linking for real 2021-12-03 19:43:10 +06:00
Cacodemon345
22be61c09a Avoid setting RtMidi flags 2021-12-03 18:28:05 +06:00
Joakim L. Gilje
e31a0349c5 reenable mouse tracking, no mouse movement in x11 without 2021-12-03 12:58:30 +01:00
Joakim L. Gilje
4c98de9bcd don't need the reqUpdate_() slot, update is already a slot. lock the image data with a mutex 2021-12-03 12:57:56 +01:00
Cacodemon345
9a6c67f367 Fix linker errors on macOS 2021-12-03 16:42:31 +06:00
Joakim L. Gilje
363f582a81 code dump - mostly done implementing media menus 2021-12-03 11:38:00 +01:00
OBattler
d28c9af753 Bumped up the version to 3.1. 2021-12-03 00:47:23 +01:00
OBattler
0d0459f972 The ES1371 no longer blocks reads of the power management registers. 2021-12-03 00:45:50 +01:00
OBattler
39f40d45ea The ES1371 now correctly clears all interrupts when it is reset. 2021-12-03 00:39:35 +01:00
OBattler
d3efb6998b ES1371 MIDI UART transmit interrupt enable bit is now actually honored. 2021-12-03 00:37:30 +01:00
ts-korhonen
788abbfeb8 Merge branch 'qt' of https://github.com/jgilje/86Box into qt 2021-12-02 22:44:13 +02:00
Joakim L. Gilje
9823ff4488 Merge pull request #8 from Cacodemon345/qt
Make external MIDI options actually appear in Settings
2021-12-02 21:27:01 +01:00
Cacodemon345
07ee5f80d8 Merge branch 'qt' of https://github.com/jgilje/86box into qt 2021-12-03 02:12:42 +06:00
Cacodemon345
e021b3460a Make external MIDI options actually appear in Settings 2021-12-03 02:12:35 +06:00
Joakim L. Gilje
17ea2c2ff4 Merge pull request #7 from Cacodemon345/qt
Implement MIDI I/O support using RtMidi
2021-12-02 20:43:39 +01:00
Cacodemon345
f7aec4cfcf Implement MIDI I/O support using RtMidi 2021-12-03 01:25:09 +06:00