Commit Graph

6025 Commits

Author SHA1 Message Date
OBattler
11431213ed Also reverted all the video changes. 2021-11-13 23:25:07 +01:00
OBattler
bfb3c0c324 Fixed the intendation mess in cpu/x86seg.c, removed port 61h handling from keyboard/keyboard_at.c, and fixed a function with undeclared type in win/win.c. 2021-11-13 23:15:28 +01:00
OBattler
758d8acb63 Temporarily reverted all keyboard changes. 2021-11-13 22:57:01 +01:00
OBattler
3730117a37 Conflict resolution. 2021-11-13 22:49:19 +01:00
Miran Grča
66a5b0fb11 Merge pull request #1799 from laciba96/master
Adjustments in config to write explicitly the mem_size
2021-11-13 20:54:29 +01:00
Laci bá
d3415b67b8 Merge branch 'master' of https://github.com/laciba96/86Box 2021-11-13 20:06:32 +01:00
Laci bá
6119e3a019 Adjustments in config to write explicitly the mem_size
This will help manager developers to decide the VM's memory size without knowing the actual machine table.
2021-11-13 20:05:48 +01:00
Miran Grča
a4819ea5cb Merge pull request #1798 from Cacodemon345/patch-20
Fix startup crash on macOS when loading floppy images
2021-11-13 00:02:45 +01:00
Cacodemon345
64d4286061 Fix startup crash on macOS when loading floppy images 2021-11-12 01:30:31 +06:00
Miran Grča
ed4a14f0cf Merge pull request #1793 from mariuszkurek/master
Fix build on case-sensitive filesystems
2021-11-10 22:51:32 +01:00
mariuszkurek
38feb548ba Fix build on case-sensitive filesystems 2021-11-10 14:38:16 +01:00
Miran Grča
0449274d52 Merge pull request #1792 from dob205/master
Fixing compiling with normal user permissions on macOS
2021-11-10 11:17:45 +01:00
dob205
94280b6675 Merge branch '86Box:master' into master 2021-11-10 11:13:21 +01:00
dob205
23b01383e0 Fixing compiling with normal user permissions
This should enable compiling things on macOS without resorting to use sudo before cmake --build build --target install.
2021-11-10 11:13:10 +01:00
Miran Grča
992f3b2888 Merge pull request #1789 from laciba96/master
Updates for Discord Rich Presence
2021-11-10 10:52:25 +01:00
Miran Grča
f4d6336b52 Merge pull request #1791 from dob205/master
Enabling the creation of 86Box in macOS app bundle form
2021-11-10 10:52:15 +01:00
dob205
99097d5555 Adjusting the install command
This change should hopefully make the GitHub Actions instance happy for CMake.
2021-11-10 10:40:51 +01:00
dob205
9f78c37f37 Tweaking things to fix potential compile errors
Should hopefully make GitHub Actions happy
2021-11-10 10:26:00 +01:00
dob205
4728483188 Updating the CMakeLists.txt to create macOS app bundles
Changes the CMakeLists.txt to enable the creation of macOS app bundles via cmake --build build --target install including all necessary dylibs for a functioning macOS compile.
2021-11-10 10:01:37 +01:00
dob205
efc2c547a0 Preparing macOS app bundle resources
This commit adds the app icons for the macOS app bundle and a custom template for the Info.plist file
2021-11-10 09:53:47 +01:00
OBattler
c892c521ea More preparation for localization. 2021-11-09 19:57:38 +01:00
OBattler
e2bdeae4cc Bugfixes to prepare for localization. 2021-11-09 19:50:42 +01:00
Laci bá
7900178a87 Fix character casing in asset names 2021-11-08 21:55:55 +01:00
Laci bá
691e3029a8 Updates for Discord Rich Presence
- Change the large image varying with build type based on 86Box.rc
- Upload the necessary assets
2021-11-08 19:10:37 +01:00
Miran Grča
9538b75afa Merge pull request #1770 from jriwanek-forks/patch-2
More systems which have PS/2 mouse
2021-11-07 18:32:17 +01:00
Miran Grča
b8a260e3c4 Merge pull request #1788 from dob205/master
Removes timespec_get() from Unix systems
2021-11-07 18:32:04 +01:00
Miran Grča
8297366857 Changed Discord rich presence ID. 2021-11-07 18:29:49 +01:00
dob205
452e2348da Removes timespec_get() from Unix systems
This change removes timespec_get() from Unix systems and makes it also possible to cross-compile binaries on macOS Big Sur or macOS Monterrey that target macOS Mojave at minimum since Mojave lacks support for timespec_get().
2021-11-07 18:00:18 +01:00
Miran Grča
b4ac1042dd Update README.md 2021-11-07 13:49:25 +01:00
Jasmine Iwanek
b2587c4e05 Merge branch 'master' into patch-2 2021-11-06 18:14:54 -04:00
Miran Grča
eae9b8c634 Merge pull request #1778 from 86Box/tc1995
Video changes (ET4000W32/i):
2021-11-04 17:22:35 +01:00
TC1995
7bf6fc3844 Video changes (ET4000W32/i):
Bit 1 is of 0x3DA (read only) is apparently required to make the OS/2 Tseng ET4000W32/i drivers work fine, fixes hangs upon reaching the GUI with said drivers.
Avoid division by zero in the blitter of the ET4000W32/i under OS/2.

Video changes (PVGA):
Fixes mode changes of the PVGA1a, including the built-in video card of the Amstrad 2086/3086.
2021-10-31 19:06:16 +01:00
Miran Grča
ec147fb8f9 Merge pull request #1777 from 86Box/tc1995
MIDI changes:
2021-10-31 18:49:05 +01:00
TC1995
9b3b9c86b0 MIDI changes:
Fixed MIDI UART OUT of the ES1371 using NT 4.0's drivers and keeping compatibility with Win9x/2000.
2021-10-31 18:35:04 +01:00
Daniel Gurney
fdc1fe92ed Merge pull request #1775 from laciba96/master
Fix character casing in the managers list
2021-10-30 22:29:16 +03:00
Laci bá
295b6bd211 Fix character casing in the managers list 2021-10-30 21:12:54 +02:00
Miran Grča
2dc220edc6 Merge pull request #1774 from ts-korhonen/master
Add Winbox to recommended managers in readme
2021-10-30 19:49:08 +02:00
ts-korhonen
88bfee8e07 Add Winbox to recommended managers in readme 2021-10-30 20:44:09 +03:00
Jasmine Iwanek
92bfb61dfc More systems which have PS/2 mouse 2021-10-28 15:44:31 -04:00
OBattler
b0fe3d8f0f Removed the Epson Action Tower 3000. 2021-10-26 20:00:01 +02:00
OBattler
b905dc2b7e Merge remote-tracking branch 'origin/master' into feature/machine_and_kb 2021-10-26 03:09:45 +02:00
OBattler
355c26efa8 S3 fixes. 2021-10-26 03:09:20 +02:00
OBattler
bad67c4f4d Merge remote-tracking branch 'origin/master' into feature/machine_and_kb 2021-10-26 01:59:08 +02:00
Miran Grča
10c571c6c6 Merge pull request #1767 from Ompronce/master
Prevent the selection of certain sound cards on machines without ISA or ISA16
2021-10-26 01:58:55 +02: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
Ompronce
6b9802f0d9 Corrected accidental removal of "IDC_CHECK_FLOAT" 2021-10-25 16:26:26 -04:00
Ompronce
ce4814c2a0 Prevent the selection of certain sound cards on machines without ISA or ISA16 2021-10-25 16:19:31 -04:00
Ompronce
666becd27a Prevent the selection of certain sound cards on machines without ISA or ISA16 2021-10-25 16:18:24 -04:00
Miran Grča
a6ac798ee8 Merge pull request #1765 from 86Box/tc1995
Video changes:
2021-10-25 12:35:26 +02:00
TC1995
61273f5c1f Video changes:
Improved the banking of the ATI 28800-5 cards (VGA Charger and VGA Wonder XL).
Improved the skew and horizontal display of some of the ET4000W32P cards as well as the cursor.
Made the Oak OTI 077 and PVGA WD90c30 cards use the Sierra 11487 (actually a clone is used in the real cards).
For the WD90c30, changed the way the hack is involved.
Reverted some changes of the S3 Vision/Trio that originally made glitches, now the glitches are gone and the accelerator renders fine.
Re-organized the Sierra 1148x RAMDAC's and added the 11486 (Mark 1).
MCA SVGA cards use the full 32-bit mapping.
2021-10-24 19:06:05 +02:00