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

6582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
OBattler
c3c1b3eba1 Applied the mainline PCem S3 fix. 2017-05-18 23:21:56 +02:00
OBattler
c669a05662 Fixed Host MIDI Out Device ID saving; 
Did the UI-related preparations for adding removable hard disks.
 2017-05-18 21:51:11 +02:00
OBattler
d7676794d2 The code in win-midi.c no longer messes with the host MIDI device ID, should fix the bug where it did not get saved correctly; 
All the temporary variables in win_settings.c are now static.
 2017-05-18 21:22:15 +02:00
OBattler
69292b62ae More such WindowLong fixes in win.c; 
Fixed CD-ROM Bus setting in Settings.
 2017-05-18 21:15:37 +02:00
OBattler
8d1ef28e86 Changed GetWindowLong and SetWindowLong to GetWindowLongPtr and SetWindowLongPtr, this should allow the emulator to compile for Win64 again. 2017-05-18 21:07:45 +02:00
Melissa Goad
1b15d1416e Merge branch 'master' into experimental 2017-05-18 13:17:44 -05:00
waltje
a4a69f71eb The, uhh, missing stufff......... 2017-05-18 14:07:53 -04:00
waltje
c5bb5db754 Merge pull request #116 from MoochMcGee/master 
Fix a bunch of Voodoo warnings
 2017-05-18 02:10:47 -04:00
waltje
09ca09775c Cleanup of the configuration code, and source tree layout. 2017-05-18 01:58:51 -04:00
Melissa Goad
3568cc7afb Merge branch 'master' into experimental 2017-05-17 23:25:04 -05:00
Melissa Goad
52bf938a60 Fix a bunch of Voodoo warnings 2017-05-17 23:14:07 -05:00
Melissa Goad
65f0d265bf Merge branch 'master' of https://github.com/OBattler/86Box into experimental 2017-05-17 22:54:25 -05:00
OBattler
0d95385e50 More fixes regarding window coordinate saving. 2017-05-18 00:58:35 +02:00
OBattler
3392a0cb34 Window coordinates are now read from the correct configuration file variable. 2017-05-18 00:39:59 +02:00
OBattler
69ec4f2193 Fixed IDE CD-ROM detection, fixes ATAPI PIO and DMA CD-ROM's. 2017-05-18 00:16:04 +02:00
OBattler
a2aa29ced0 Revert "Split off the Network configuration from Other peripherals in the Settings dialog and made PCap device configurable;" 
This reverts commit 1b83ee8fd3.
 2017-05-17 22:07:20 +02:00
OBattler
1b83ee8fd3 Split off the Network configuration from Other peripherals in the Settings dialog and made PCap device configurable; 
Overhauled the configuration files so that the global variables are now subdivided into sections;
Fixed CD-ROM MODE SENSE page 0x2A which was being incorrectly reported as not implemented, fixes among other things Rayman 1 and Spellcross: The Last Battle (both now see the CD-ROM and play CD Audio fine).
 2017-05-17 21:57:12 +02:00
OBattler
dbbc22c4bb Merge branch 'master' of https://github.com/OBattler/86Box 2017-05-17 21:56:54 +02:00
OBattler
1a9a55c35e Split off the Network configuration from Other peripherals in the Settings dialog and made PCap device configurable; 
Overhauled the configuration files so that the global variables are now subdivided into sections;
Fixed CD-ROM MODE SENSE page 0x2A which was being incorrectly reported as not implemented, fixes among other things Rayman 1 and Spellcross: The Last Battle (both now see the CD-ROM and play CD Audio fine).
 2017-05-17 21:56:31 +02:00
Melissa Goad
fc09f42e76 Merge branch 'master' of https://github.com/OBattler/86Box into experimental 2017-05-16 20:55:21 -05:00
OBattler
67ba14698e Merge pull request #114 from ThingUroboros/patch-1 
win.c
 2017-05-15 23:39:26 +02:00
ThingUroboros
663dc642c7 win.c 
Condition for fullscreen keyboard shortcut (CTRL+ALT+PAGEUP)
 2017-05-15 23:32:08 +02:00
OBattler
34c08faf46 Fixed IDE hard disk array indexes wherever they were read from the wrong variable, fixes IDE hard disks when their configuration order does not match their IDE bus order. 2017-05-15 03:21:40 +02:00
OBattler
ba20130644 Fixed a bug with floppy icons on the status bar; 
Fixed a bug with CD-ROM menu items.
 2017-05-15 01:55:25 +02:00
OBattler
f85a808819 Merge branch 'master' of https://github.com/OBattler/86Box 2017-05-15 01:44:23 +02:00
OBattler
e43b45d2ed Removed an excess position increase in d86f_format_track(), 86F images can now be formatted again. 2017-05-15 01:44:04 +02:00
TC1995
9eb54d9b3e Merge branch 'master' of github.com:OBattler/86Box into tc1995 2017-05-15 00:42:02 +02:00
OBattler
6a3f3727a7 Fixed ISO loading; 
Fixed ESDI and XT MFM hard disk initialization;
The IDE SET_FEATURES command is now actually recognized by the command register write handler.
 2017-05-15 00:35:26 +02:00
TC1995
11b7ede678 Merge branch 'master' of github.com:OBattler/86Box into tc1995 2017-05-14 22:42:05 +02:00
TC1995
0fa41b7b9b Included MCA header and fixed aha1640 write function. 2017-05-14 22:40:53 +02:00
OBattler
84ac082bc4 Fixed the last stray goto abort. 2017-05-14 18:41:58 +02:00
OBattler
8d6ea357d4 Fixed the stray goto abort's in ide_set_features(), it should now compile. 2017-05-14 18:39:58 +02:00
OBattler
266a9690ae Properly reimplemented the IDE SET_FEATURES command, NT 5.00.1743 and Neptune 5.11.5111 now work. 2017-05-14 18:37:32 +02:00
OBattler
6117b6bb1d Added missing braces in win.c's update_status_bar_panes(), should hopefully fix the hard disk icons bug when using XTIDE. 2017-05-14 18:17:34 +02:00
OBattler
0d0d479280 Attempt to fix the status bar icons bug. 2017-05-14 18:10:46 +02:00
TC1995
79a44e4997 Merge branch 'master' of github.com:OBattler/86Box into tc1995 2017-05-14 16:49:47 +02:00
TC1995
bcc505e4b8 Added Adaptec AHA-1640 MCA SCSI adapter for IBM PS/2 Model 50+ only at the moment. 2017-05-14 16:46:15 +02:00
Melissa Goad
9f55609c96 Merge branch 'master' of https://github.com/OBattler/86Box into experimental 2017-05-13 02:07:48 -05:00
waltje
39bb6e1e80 Merge branch 'master' of https://github.com/OBattler/86Box 2017-05-12 22:17:08 -04:00
waltje
428d73e4f7 Added new win-opendir.c and plat-dir.c for Kotori, fixed some minor stuff elsewhere. 2017-05-12 22:16:36 -04:00
OBattler
5ba88cba30 Reduced the MPU-401 reset timer multiplier to 33, should make Harball 3 work on most, if not all, emulated machines; 
The Read TOC command no longer sends more data than requested, and it always returns the correct value in the data field if the request data length is smaller than the actual data length.
 2017-05-13 02:58:36 +02:00
waltje
bce795b632 Fixes to Network layer code. 2017-05-12 17:33:42 -04:00
waltje
f68965eb7f Merge. 2017-05-12 05:16:52 -04:00
waltje
2f9bda8a18 Updated network code, major cleanup. SLiRP and Pcap both tested. UI configuration will need extra work by Kotori. 2017-05-12 05:05:27 -04:00
TC1995
560a2dd629 Merge branch 'master' of github.com:OBattler/86Box into tc1995 2017-05-12 05:24:11 +02:00
TC1995
1f3f8a65f4 Fixed MPU-401 reset callback. Space Quest 3 and Hard Ball 3 (possibly other games too) now work. 2017-05-12 05:19:45 +02:00
OBattler
8d5ca5c57d Fixed the makefile to not include a file that is not there. 2017-05-11 20:15:08 +02:00
waltje
ced75af0c2 More Slirp cleanups. 2017-05-11 03:31:30 -04:00
waltje
deb30e41a0 Some old variables deleted, no longer used. Also, updated pcap_if.rc. 2017-05-11 03:28:33 -04:00
OBattler
18e2110739 Both SCSI controllers now set the next callback to be issued after 1000 * TIMER_USEC instead of 50 * TIMER_USEC if the device is CD-ROM and the command is 0x42 (READ SUBCHANNEL); 
A few CD-ROM IOCTL commands are cached now;
CD Audio over IOCTL works again;
The status bar icons are now only loaded once at emulator start, and subsequently just used on demand.
 2017-05-11 06:34:25 +02:00