claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,800 Commits 1 Branch 0 Tags
df0e12bcccea968c83b766a046741682d55a47b6
Commit Graph

313 Commits

Author SHA1 Message Date
Miran Grča
451217c96b Changed strcpy_s to strncpy. 2021-11-29 17:48: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
Jasmine Iwanek
9c9fa70961 Bit I missed in the last one 2021-11-23 15:51:31 -05:00
Jasmine Iwanek
33691ba5e6 Default memory to 64k 
Corrects silly config mistake on 5150 when you run 86box without options
 2021-11-23 15:47:22 -05:00
RichardG867
447269eb39 Machine table and ROM fixes and cleanups 2021-11-21 13:17:30 -03:00
Laci bá
0aa6e9c8a6 Finish the changeable iconset 2021-11-16 19:38:31 +01:00
RichardG867
dccd162758 Add SL-63A1 config migration 2021-11-14 14:31:01 -03: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
Laci bá
7651f4be6d Merge branch 'translation_hu-HU' of https://github.com/laciba96/86Box into translation_hu-HU 2021-11-13 23:56:38 +01:00
Laci bá
b321679bde Final cleanup 2021-11-13 23:56:35 +01:00
Laci bá
0ba4718fb7 Save config language entry as string instead of hex16 
And remove some unnecessary stuff.
 2021-11-13 23:52:49 +01:00
Miran Grča
11a106b734 Merge pull request #1802 from jriwanek-forks/patch3 
Trivial fixes and cleanups for serial & parallel
 2021-11-13 23:43:28 +01:00
Jasmine Iwanek
3e70c7e98a Trivial fixes and cleanups for serial & parallel 2021-11-13 17:33:43 -05:00
Laci bá
0764d92b67 Merge branch '86Box:master' into translation_hu-HU 2021-11-13 23:04:05 +01:00
OBattler
3730117a37 Conflict resolution. 2021-11-13 22:49:19 +01:00
Laci bá
87cbbdf992 Implement language local config saving 2021-11-13 21:37:27 +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
RichardG867
d65cfe1f50 Machine fixes, renames and such 2021-11-10 19:03:13 -03:00
OBattler
f30577255f Merge remote-tracking branch 'origin/master' into feature/machine_and_kb 2021-10-06 02:27:19 +02:00
OBattler
46807540ed Rewritten renderer blitting, fixes flickering when inversion or grayscale is used. 2021-10-06 02:26:30 +02:00
OBattler
d924589d88 Merge remote-tracking branch 'origin/master' into feature/machine_and_kb 2021-09-21 12:15:43 +02:00
OBattler
59533b4457 The default value for dpi_scale is now 1. 2021-09-21 12:14:50 +02:00
OBattler
273e1a4cbe Merge remote-tracking branch 'origin/master' into feature/machine_and_kb 2021-09-19 14:47:15 +02:00
OBattler
a491b3a35c Reverted the meaning of video_fullscreen_first to what it used to be. 2021-09-18 21:33:13 +02:00
OBattler
e42fdbfcdd Merge remote-tracking branch 'origin/master' into feature/machine_and_kb 2021-09-18 15:25:37 +02:00
OBattler
0f69aa7ff7 Some fixes, fixes PCjr when the emulator is started in full screen, fixes #1702. 2021-09-18 15:24:00 +02:00
Miran Grča
b0ec4e1ece Merge pull request #1652 from 86Box/master 
Brought the branch up to par with master.
 2021-09-03 16:41:24 +02:00
OBattler
84f4b8cac7 Added a bunch of parameters (including one to specify custom ROM path), fixed a warnings, removed excess commented out code from video/vid_voodoo.c, and made Makefile.mingw quiet again. 2021-09-02 20:15:46 +02:00
Miran Grča
a505a6a910 Merge pull request #1640 from 86Box/master 
Brought the branch up to par with master.
 2021-09-01 15:03:15 +02:00
Cacodemon345
5cdfcb099c Fix reading config files with UTF-8 BOM signature 2021-08-29 23:50:21 +06:00
Miran Grča
b35a89fe64 Merge pull request #1599 from 86Box/master 
A small config.c fix and the Acrosser AR-B1479 now uses the Winbond W…
 2021-08-10 16:20:45 +02:00
OBattler
0b1000ec19 A small config.c fix and the Acrosser AR-B1479 now uses the Winbond W29C020 Flash chip. 2021-08-10 16:19:37 +02:00
Miran Grča
77a5cf6891 Merge pull request #1581 from 86Box/master 
Bring the branch up to par with master.
 2021-08-04 09:15:08 +02:00
RichardG867
9d953623e5 Merge branch 'master' of https://github.com/86Box/86Box into feature/savquest 2021-08-03 21:45:54 -03:00
Miran Grča
8ca1328c7e Merge pull request #1571 from 86Box/master 
Bring the branch up to par with master.
 2021-08-02 06:58:22 +02:00
OBattler
d1991ac763 Added the ability to hide the status bar, closes #1530. 2021-07-30 04:01:46 +02:00
RichardG867
4c307fd945 Merge branch 'master' of https://github.com/86Box/86Box into feature/savquest 2021-07-29 20:00:30 -03:00
OBattler
949dea3524 Added IBM PCjr cartridge support. 2021-07-29 20:34:55 +02:00
RichardG867
733af3b2fb Remove extraneous comment 2021-07-29 00:50:21 -03:00
OBattler
45b3e13450 Cassette improvements and fixes. 2021-07-28 00:58:19 +02:00
OBattler
827065c0bc Ported the cassette emulation from PCE, closes #835. 2021-07-27 06:12:09 +02:00
OBattler
2d376b4584 The legacy SCSI configuration option is now always removed on config save, fixes #1561 . 2021-07-26 05:07:13 +02:00
RichardG867
2fdda7bd47 Migrate enhanced Am486 to a standard naming convention 2021-07-25 22:46:51 -03:00
OBattler
c47e766bc4 The migration of the legacy SCSI controller is now perfectly seamless, thanks, Ryuzaki! 2021-07-23 01:20:14 +02:00
OBattler
729b6d5069 Added support for up to four SCSI controllers, closes #343. 2021-07-22 20:13:44 +02:00
OBattler
9adf0fdcc4 Added the ability for keyboard to require capture, in order for 86Box keyboard input to operate like VMWare, closes #829. 2021-07-19 02:27:22 +02:00
OBattler
faee9c85ed A newly created configuration is now instantly marked as changed - fixes the status bar in such circumstances. 2021-07-19 02:07:47 +02:00
OBattler
4f6df76f10 Revert "Revert "Merge branch 'feature/machine_and_kb' into master"" 
This reverts commit f2cd3756dd.
 2021-07-04 17:40:39 +02:00
Daniel Gurney
f2cd3756dd Revert "Merge branch 'feature/machine_and_kb' into master" 
This reverts commit 6604a29d7e, reversing
changes made to 1d7fca0abd.
 2021-07-04 18:22:52 +03:00