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

6771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim L. Gilje
57cbff9ca1 Merge pull request #16 from Cacodemon345/qt 
Remove redundant RtMidi checking
 2021-12-06 20:14:35 +01:00
Joakim L. Gilje
eb70666e63 Merge pull request #17 from Cacodemon345/patch-29 
Fix mouse wheel scrolling
 2021-12-06 20:14:23 +01:00
ts-korhonen
44873ba9b9 Make compatible with qt5-static build 2021-12-06 17:31:25 +02:00
ts-korhonen
d21738a94f Merge branch 'master' of https://github.com/86Box/86Box into qt 2021-12-06 14:13:58 +02:00
ts-korhonen
6a0922f6de Merge branch 'qt' of https://github.com/jgilje/86Box into qt 2021-12-06 13:53:40 +02:00
Miran Grča
8ef7103c04 Merge pull request #1916 from Cacodemon345/patch-28 
Fix wrong copyright information
 2021-12-06 11:47:44 +01:00
Cacodemon345
c376cca71e Fix mouse wheel scrolling 2021-12-06 16:33:25 +06:00
Cacodemon345
23a04c3f55 Fix wrong copyright information 2021-12-06 15:55:05 +06:00
Cacodemon345
350246606e Remove redundant RtMidi checking 2021-12-06 15:52:19 +06:00
Cacodemon345
754c911204 Merge branch 'qt' of https://github.com/jgilje/86box into qt 2021-12-06 15:51:13 +06:00
Joakim L. Gilje
28d1a43af7 fixed up qdatastream usage. use writeRawData() when creating hdd images. specify littleendian when creating floppy images 2021-12-06 10:50:58 +01:00
Joakim L. Gilje
37e29de342 include unordered_map 2021-12-06 10:41:14 +01:00
Cacodemon345
d9cab90b69 Merge branch 'qt' of https://github.com/jgilje/86box into qt 2021-12-06 15:36:01 +06:00
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
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
ts-korhonen
6278f69cc1 Merge branch 'qt' of https://github.com/jgilje/86Box into qt 2021-12-05 03:03:52 +02: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