claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,891 Commits 1 Branch 0 Tags
71ba610366ac7affdfe25d84db32d40987c3f6fd
Commit Graph

418 Commits

Author SHA1 Message Date
RichardG867
71ba610366 Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30 
# Conflicts:
#	.ci/build.sh
#	.ci/dependencies_msys.txt
#	src/sound/snd_audiopci.c
 2022-03-16 00:39:53 -03:00
David Hrdlička
7c20d7c5bb Fix RtMidi on Makefile builds 2022-03-11 21:19:59 +01:00
RichardG867
b07570696f Initial implementation of C-Media CMI8x38 2022-02-25 19:22:45 -03:00
Jasmine Iwanek
f18da85438 A few lconsistency changes form M&K branch 2022-02-20 19:11:58 -05:00
OBattler
8ac721d395 Fixed linking with Makefile.mingw. 2022-02-20 01:41:31 +01:00
David Hrdlička
0f3c2232ad Add XAudio2 support to the legacy Makefile 2022-02-20 00:48:39 +01:00
Alexander Babikov
a378e1a300 Move some options around to maintain alphabetical order 2022-02-14 05:11:08 +05:00
Alexander Babikov
4a752c05a5 Move the Tandy PSG ISA clones to the Dev branch 2022-02-14 05:10:50 +05:00
Alexander Babikov
1a7a93010d Remove the obsolete logging and defunct VRAM dumping options from the Win32 UI 2022-02-07 18:09:21 +05:00
ts-korhonen
10647b832f qt: fix win_discord.o error in makefile build 2022-02-06 13:41:34 +02:00
Jasmine Iwanek
f19510fd31 Merge branch '86Box:master' into ps1-audio 2022-01-29 17:11:20 -05:00
Jasmine Iwanek
abce83ad34 Initial Boca Research BocaRAM/AT support 2022-01-26 23:24:19 -05:00
Jasmine Iwanek
d8761e869a Merge branch 'master' into audio 2022-01-26 19:59:37 -05:00
Jasmine Iwanek
ae985779c8 Build isamem dev stuff 2022-01-26 19:07:34 -05:00
Jasmine Iwanek
ffc89a99eb Merge branch 'master' into audio 2022-01-15 19:38:56 -05:00
David Hrdlička
9abdb1e048 Add the toolbar code to the MinGW makefile 2022-01-09 19:58:06 +01:00
Jasmine Iwanek
aaf535b404 Split out IBM PS/1 Audio Card from machine 2022-01-08 20:15:56 -05:00
TC1995
688748adbe Added QEMU's fifo8 code. 
Added the NCR 53c90 SCSI MCA card and reworked the AMD PCscsi/Tekram DC390 code to use a better port.
 2021-12-18 14:44:14 +01:00
David Hrdlička
7381ab6928 Minor changes to threading 
- Renamed `cpp11_thread.cpp` to `thread.cpp`
- Removed features that are only supported by Win32 threads (`thread_wait` with timeout and mutex with spinlock)
- Fixed formatting in `thread.cpp`
 2021-12-17 19:59:25 +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
David Hrdlička
7df9e2a454 Add a compile option to choose between thread implementations 2021-12-17 06:59:53 +01: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
3eaa6153b5 Switched MIDI to RtMidi. 2021-12-03 20:12:44 +01:00
OBattler
295f750884 Moved the OpenGL 3.3 renderer and Discord integration out of the Dev branch. 2021-11-29 15:42:50 +01:00
David Hrdlička
a1df1c23ed Rename Program Settings to Preferences 2021-11-20 23:34:23 +01:00
TC1995
e29dafa17a Changes list 5: 
Added the AT&T 2xc498 Precision RAMDAC.
Added 1MB configurations to the Cirrus Logic GD5434 as well as re-organized the memory size options of the other Cirrus cards.
Separated the et4000w32/i blitter from the standard et4000w32p blitter and properly implemented the X/Y Count route.
Added several Diamond Cirrus cards.
Added Number Nine S3 cards (868 and 968-based).
Fixed the WD90c30 1MB modes.
Re-organized the video card names.
 2021-11-18 23:58:04 +01:00
Laci bá
03a7247630 Apply requested changes 
- Remove icon functions from plat.h.
- Fix some indentation problems.
- Remove unused parameter from win_stbar.c
- Rename win_lang.c to win_progsett.c
- Remove stub functions from unix.c
- Move win_load_icon_set() to ui_init()
- Replace the translated texts to English, and let the translators translate them
- Fix the control IDs in dialogs.rc.
- Use the requested solution in win_icon.c for setting the array variables.
 2021-11-17 19:02:19 +01:00
Laci bá
98316e228f Merge branch '86Box:master' into changeable_icon_set 2021-11-16 17:37:59 +01:00
OBattler
5674fe188f VECT486VL vestiges. 2021-11-16 00:02:05 +01:00
OBattler
98794cfe76 Removed vestiges of the Hedaka. 2021-11-16 00:00:58 +01:00
OBattler
47d742b65e Removed the last vestiges of IBM PS/2 model 70 type 4. 2021-11-15 23:58:12 +01:00
Laci bá
88d22e950d Merge branch '86Box:master' into changeable_icon_set 2021-11-14 21:38:20 +01:00
Laci bá
a16e39bb62 Initial commit for changeable icon set 2021-11-14 19:50:05 +01:00
RichardG867
0de137daf7 Merge branch 'master' of https://github.com/86Box/86Box into cleanup30 
# Conflicts:
#	src/include/86box/machine.h
#	src/machine/m_at_socket7.c
#	src/machine/machine_table.c
#	src/video/vid_tgui9440.c
#	src/win/win.c
 2021-11-14 13:45:37 -03:00
Laci bá
6f0da19369 Merge branch 'master' into translation_hu-HU 2021-11-14 00:03:36 +01:00
OBattler
11431213ed Also reverted all the video changes. 2021-11-13 23:25:07 +01:00
Laci bá
b4f5ff7ad1 Separate language dialog, and minor language fixes 2021-11-12 22:41:01 +01:00
RichardG867
724accd167 Add AGP GART implementation 2021-11-10 21:14:54 -03:00
OBattler
77d73ed3c2 Finished the Intel 450KX, changes to the memory and SMRAM API's, removed the ASUS P/I-P6RP4 from the Dev branch, added the CMD646 PCI IDE controller, and fixed some bugs on the CMD640. 2021-10-26 01:54:35 +02:00
RichardG867
5d0b068ec0 Remove SiS 5598 machines and code as agreed upon 2021-10-16 20:22:12 -03:00
OBattler
1c2d1e702b Assorted changes and bugfixes and added the two IMS 8848 machines. 2021-10-09 17:37:09 +02:00
OBattler
5231ab4e44 Merge remote-tracking branch 'origin/master' into feature/machine_and_kb 2021-09-26 22:52:33 +02:00
TC1995
3bfcfc01a3 S3 ViRGE changes: 
Added a timer to improve perfomance of the 3D engine.
Made the Trio3D/2X available for all.
Reserved bit 2 of CR33 is now always set to make sure Win95's Trio3d/2X drivers work along with a workaround for the memory size.
Added preliminary DMA bus master capabilities.
 2021-09-26 21:13:47 +02:00
OBattler
b5f7e9bec3 Conflict resolution. 2021-09-25 14:24:29 +02:00
David Hrdlička
73cac00119 Remove pthreads on Win32 from build files 2021-09-23 23:03:33 +02:00
OBattler
b0367133d6 And back. 2021-09-14 22:36:21 +02:00
Miran Grča
be2005dea4 Merge pull request #1690 from 86Box/master 
Bring the branch up to par with master.
 2021-09-14 22:34:42 +02:00
OBattler
dbdf07aa96 Two files to resolve conflicts. 2021-09-14 22:33:39 +02:00
OBattler
3c2ac29c68 Switched threads to pthread for all platforms (on Windows, you can compile with Win32 threads using PTHREAD=n). 2021-09-14 21:58:15 +02:00