80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity
6,727 Commits 1 Branch 0 Tags
3b1613614227c43e624d6299dcf724113ae91e3d
Commit Graph

5766 Commits

Author SHA1 Message Date
Joakim L. Gilje
07c9da30de configuration fixes 
* moved CONFIG_MIDI and CONFIG_MIDI_IN to own blocks when constructing
  comboboxes in deviceconfig
* use Models::AddEntry in deviceconfig
* sub-handling of CONFIG_HEX16 and CONFIG_HEX20 in CONFIG_SELECTION
  block when constructing, and use corresponding config_setter
* make sure SCSI controller- and ISAMEM-deviceconfig calls up
  deviceconfig with an instance number
* midi input and midi output was mixed when constructing soundsettings
  when loading prev. settings
 2021-12-06 10:29:53 +01:00
Joakim L. Gilje
2788793d07 Merge github.com:86box/86Box into qt 2021-12-06 10:03:04 +01:00
Joakim L. Gilje
c5b6ccb948 continued PR#12 into software renderer as well 2021-12-05 21:23:09 +01:00
Joakim L. Gilje
637f81998b fixed disabled/enabled for cassette, cartridge and floppy submenus 2021-12-05 21:22:32 +01:00
Joakim L. Gilje
af512c98cc PR #12 merged manually (Take video_filter_method into account when rendering, by @Cacodemon345) 2021-12-05 20:56:07 +01:00
Joakim L. Gilje
b9714a0914 PR #13 merged manually (EGLFS support by @Cacodemon345) 2021-12-05 20:51:59 +01:00
Joakim L. Gilje
4dd837cccf Merge pull request #15 from Cacodemon345/esckeyfix 
Make Escape key work
 2021-12-05 20:47:26 +01:00
Miran Grča
652cbb5b1f Merge pull request #1915 from ts-korhonen/master 
Fix null termination issue in opengl shader version replacement
 2021-12-05 18:53:45 +01:00
Miran Grča
2f8ab8ca52 Merge pull request #1914 from laciba96/post-card-ui-fix 
Fix that POST card's message is disappearing when language/iconset change occurs
 2021-12-05 18:53:30 +01:00
ts-korhonen
983872f33b Fix null termination issue in previous shader version fix 2021-12-05 19:22:46 +02:00
OBattler
a1597557bf Merge branch 'master' of https://github.com/86Box/86Box 2021-12-05 16:49:47 +01:00
OBattler
28e70abbf3 Commented out excess W83787F logging. 2021-12-05 16:49:35 +01:00
Laci bá
41ba4ee86b Fix that POST card's message is disappearing when language/iconset change occurs 2021-12-05 11:48:31 +01:00
Cacodemon345
3a52d62283 Make Escape key work 2021-12-05 16:01:04 +06:00
Cacodemon345
f2e6d79de4 Fix building with Wayland 2021-12-05 12:02:57 +06:00
ts-korhonen
6278f69cc1 Merge branch 'qt' of https://github.com/jgilje/86Box into qt 2021-12-05 03:03:52 +02:00
ts-korhonen
5af55a9cf8 opengl: fix for shaders with version directive 
If a shaderfile contains a version directive, use that instead of default.
 2021-12-05 02:05:52 +02:00
Joakim L. Gilje
a74afc3f1e added software renderer. split common functions prev. 
in gleswidget to renderstack (a QStackWidget), which in
turn calls an actual renderer. added ability to target GLES
directly, but this is maybe uneeded.
 2021-12-04 21:33:04 +01:00
ts-korhonen
40abfc1b5e Lower required OpenGL version from 3.3 -> 3.0 2021-12-04 21:26:55 +02:00
OldMadMan
9679ec1955 Update simplified Chinese text (#1909) 
Correct a few typos, adjust individual sentences
 2021-12-04 18:36:17 +01:00
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
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
4338560466 Properly find rtmidi on the CMake build 2021-12-03 21:51:31 +01:00
Cacodemon345
5c2682ff8c Fix transparency/whiteness glitches on Wayland/macOS 2021-12-04 02:14:06 +06:00
OBattler
54551fc6c4 RtMidi fixes. 2021-12-03 20:20:02 +01:00
OBattler
3eaa6153b5 Switched MIDI to RtMidi. 2021-12-03 20:12:44 +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
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