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

6549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cacodemon345
c7170b8253 Merge remote-tracking branch 'upstream/master' into qt 2021-12-06 12:28:00 +06: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
Joakim L. Gilje
1af69513b6 Merge pull request #14 from Cacodemon345/patch-27 
Fix building with Wayland
 2021-12-05 20:45:51 +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
Miran Grča
c208cc4283 Merge pull request #1913 from ts-korhonen/master 
opengl: fix for shaders with version directive
 2021-12-05 01:57:06 +01: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
Miran Grča
8b2bb6eb04 Merge pull request #1911 from ts-korhonen/master 
Lower required OpenGL version from 3.3 -> 3.0
 2021-12-04 20:47:18 +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
RichardG867
05ff0b0921 Build script: Fix pkg-config (for rtmidi) when cross-compiling 2021-12-04 11:35:26 -03:00
Joakim L. Gilje
5870e50022 Merge pull request #11 from Cacodemon345/patch-25 
Fix transparency/whiteness glitches on Wayland/macOS
 2021-12-04 10:33:10 +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
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
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