Commit Graph

8965 Commits

Author SHA1 Message Date
RichardG867
5d79413064 Update readme to match website 2022-10-16 00:55:35 -03:00
RichardG867
b5964d8c93 VISO: Disable logging 2022-10-15 19:16:35 -03:00
RichardG867
f0ee61041c VISO: Small micro-optimization and cleanup 2022-10-15 14:45:49 -03:00
RichardG867
10e9285f61 Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30
# Conflicts:
#	src/cdrom/cdrom_image.c
#	src/cdrom/cdrom_image_backend.c
#	src/include/86box/cdrom.h
#	src/include/86box/cdrom_image_backend.h
#	src/include/86box/resource.h
#	src/qt/qt_mediamenu.cpp
#	src/qt/qt_mediamenu.hpp
#	src/unix/unix.c
#	src/win/win.c
#	src/win/win_devconf.c
#	src/win/win_dialog.c
#	src/win/win_joystick_rawinput.c
#	src/win/win_media_menu.c
#	src/win/win_mouse.c
#	src/win/win_settings.c
#	src/win/win_ui.c
2022-10-15 14:00:00 -03:00
RichardG867
e706fffb34 Run clang-formats for merge 2022-10-15 13:38:10 -03:00
RichardG867
ac68e1f562 clang-format: Import latest rules for merge 2022-10-15 13:37:45 -03:00
Miran Grča
932f2ce574 Merge pull request #2713 from cold-brewed/pause-icon-fix
qt: Fix play / pause icon to reflect current state
2022-10-14 14:28:02 +02:00
Miran Grča
57499898ee Merge pull request #2715 from ts-korhonen/master
Fix Qt 6.4 builds
2022-10-14 14:27:48 +02:00
ts-korhonen
0dabf88baf Fix Qt 6.4 builds.
Cast from char* to QVariant was removed, use const char* instead.
2022-10-14 14:44:36 +03:00
cold-brewed
c289b1c86b qt: Fix play / pause icon to reflect current state 2022-10-09 14:54:40 -04:00
Miran Grča
42a03528fd Merge pull request #2708 from cold-brewed/media-history-fopen
qt: Account for empty path in plat_fopen
2022-10-06 20:49:23 +02:00
cold-brewed
9adf5ab589 qt: Account for empty path in plat_fopen 2022-10-03 09:17:09 -04:00
OBattler
0aae6a993f Fixed the short name of the NEC SV-9000. 2022-10-02 04:02:08 +02:00
Miran Grča
f2a64da8d6 Merge pull request #2702 from Cacodemon345/nec_sv9000
Add NEC SV9000 (Trident TVGA9000B)
2022-10-02 00:15:59 +02:00
Miran Grča
9f26bcffea Merge pull request #2703 from cold-brewed/media-history-floppy
qt: Media history part II: Floppy
2022-10-02 00:15:46 +02:00
cold-brewed
97a99f70e3 qt: Add floppy support to media history manager 2022-10-01 17:39:03 -04:00
Cacodemon345
a6c9af3064 Add NEC SV9000 (Trident TVGA9000B) 2022-10-02 01:38:56 +06:00
OBattler
d8fa6ca2ca Merge branch 'master' of https://github.com/86Box/86Box 2022-09-28 04:01:29 +02:00
OBattler
7a7f87b532 Enabled the LUN check for ATAPI MO, ZIP, and CD-ROM drives. 2022-09-28 04:01:19 +02:00
Miran Grča
ad97d4417b Merge pull request #2692 from lemondrops/master
Fix a crash when saving window dimensions and coordinates
2022-09-23 19:16:34 +02:00
Alexander Babikov
4ab4f247e4 Fix a crash when saving window dimensions and coordinates 2022-09-23 17:44:09 +05:00
Miran Grča
48d3a3c992 Merge pull request #2691 from jriwanek-forks/enable-tndy
Enable TNDY & PSSJ ISA clone
2022-09-22 01:52:04 +02:00
Jasmine Iwanek
ece9f7ec72 Fix some compile warns while I'm at it 2022-09-21 19:27:08 -04:00
Jasmine Iwanek
28ae786d62 PSG/PSSJ out of dev branch 2022-09-21 18:43:15 -04:00
Jasmine Iwanek
09f8388a43 Add alternate addreses to TNDY/PSG clone 2022-09-21 18:43:15 -04:00
Jasmine Iwanek
436e8a20fe Add alternate addresses to PSSJ ISA clone 2022-09-21 18:43:15 -04:00
Jasmine Iwanek
a6d5ff565b Fix bug in PSSJ ISA clone 2022-09-21 18:43:15 -04:00
Miran Grča
642a5566df Merge pull request #2689 from jriwanek-forks/cleanup
Some clang-formatting in src/cpu
2022-09-21 03:45:46 +02:00
Jasmine Iwanek
b4673117fd Some clang-formatting in src/cpu 2022-09-20 01:00:45 -04:00
Miran Grča
b2fb6dbeec Merge pull request #2686 from jriwanek-forks/cleanups
Clang-format cleanups
2022-09-18 23:52:08 +02:00
Jasmine Iwanek
6ead7187a9 clang-format in src/include/mt32emu/ 2022-09-18 17:22:55 -04:00
Jasmine Iwanek
3c76dbbde5 clang-format in src/network/ 2022-09-18 17:22:55 -04:00
Jasmine Iwanek
4685da3fca clang-format in src/mem/ 2022-09-18 17:22:55 -04:00
Jasmine Iwanek
3fddf4d488 clang-format in src/machine/ 2022-09-18 17:22:55 -04:00
Jasmine Iwanek
a225c9433b clang-format in src/video/ 2022-09-18 17:22:55 -04:00
Jasmine Iwanek
acbe718f1e clang-format in src/unix/ 2022-09-18 17:22:55 -04:00
Jasmine Iwanek
d4c4ef6a5d clang-format in src/printer/ 2022-09-18 17:22:55 -04:00
Jasmine Iwanek
97a7459fd4 clang-format in src/scsi/ 2022-09-18 17:22:55 -04:00
Jasmine Iwanek
99893d1175 clang-format in src/sio/ 2022-09-18 17:22:55 -04:00
Jasmine Iwanek
645732b7bf clang-format in src/sound/ 2022-09-18 17:22:55 -04:00
Jasmine Iwanek
740d7af8d6 clang-format in src/win/ 2022-09-18 17:22:55 -04:00
Jasmine Iwanek
ae4f9aedaa clang-format in src/include/86box/ 2022-09-18 17:22:54 -04:00
Jasmine Iwanek
c520a1e864 clang-format in src/game/ 2022-09-18 17:19:22 -04:00
Jasmine Iwanek
58d86a0739 clang-format in src/floppy/ 2022-09-18 17:19:22 -04:00
Jasmine Iwanek
696f6f7e2f clang-format in src/disk/ 2022-09-18 17:19:22 -04:00
Jasmine Iwanek
9a3cabbe85 clang-format in src/device/ 2022-09-18 17:19:21 -04:00
Jasmine Iwanek
3753a9f8b2 clang-format in src/chipset/ 2022-09-18 17:19:21 -04:00
Jasmine Iwanek
d044f8d1f6 clang-format in src/cdrom/ 2022-09-18 17:19:21 -04:00
Jasmine Iwanek
e6dbaefeb1 clang-format in src/ 2022-09-18 17:19:21 -04:00
Jasmine Iwanek
2267153edd Merge pull request #2685 from jriwanek-forks/improvements
Improvements
2022-09-18 16:09:17 -04:00