Commit Graph

9587 Commits

Author SHA1 Message Date
Jasmine Iwanek
381f9d11fc Voodoo 3 3500 TV 2022-11-10 17:03:13 -05:00
Jasmine Iwanek
6f031c34df Voodoo 3 1000 2022-11-10 15:49:20 -05:00
Jasmine Iwanek
ac48f84a23 Cleanups in vid_voodoo_banshee.c 2022-11-10 12:17:24 -05:00
Miran Grča
d9bfafcc07 Merge pull request #2838 from jriwanek-forks/fix
Fix language string offsetting in win32 ui
2022-11-10 06:55:23 +01:00
Jasmine Iwanek
6919451ae4 Fix string offsetting 2022-11-09 23:19:17 -05:00
Miran Grča
92d0fdcc97 Merge pull request #2835 from jriwanek-forks/fix
Fix "None" not showing up for video2 on Win32 UI
2022-11-09 04:42:06 +01:00
Jasmine Iwanek
04e4acf427 Merge remote-tracking branch 'upstream/master' into fix 2022-11-08 22:41:33 -05:00
OBattler
cd6a43165a Fixed some compile-breaking mistakes. 2022-11-09 04:37:44 +01:00
OBattler
f807bb2ccc It is the M240 that has the internal HDC, not the M24. 2022-11-09 04:32:59 +01:00
Miran Grča
aaac0ed92f Merge pull request #2834 from jriwanek-forks/hdd-speed
HDD Speed setting visable in win32 UI
2022-11-09 04:12:30 +01:00
Jasmine Iwanek
19a64344ef Updates 2022-11-08 22:09:59 -05:00
Jasmine Iwanek
b54c8fecff Fix "None" not showing up for video2 2022-11-08 21:59:36 -05:00
OBattler
02dc3aa592 Fixed some AMD PCSCSI bugs. 2022-11-09 03:44:51 +01:00
Jasmine Iwanek
7b1a2b2f42 Merge remote-tracking branch 'upstream/master' into hdd-speed 2022-11-08 15:55:13 -05:00
Jasmine Iwanek
a157d6faca Update languages 2022-11-08 15:21:35 -05:00
Jasmine Iwanek
1e7c3e9fc9 Merge pull request #2829 from kzmidze/patch-3
Update zh-TW.po
2022-11-08 14:14:22 -05:00
Jasmine Iwanek
96802345b2 Merge pull request #2830 from kzmidze/patch-4
Update zh-TW.rc
2022-11-08 14:14:09 -05:00
Jasmine Iwanek
9291b184fe Merge remote-tracking branch 'upstream/master' into hdd-speed 2022-11-08 13:58:05 -05:00
Jasmine Iwanek
14fa9649a8 Merge pull request #2833 from jriwanek-forks/fix
Fix silly mistake
2022-11-08 13:56:56 -05:00
Jasmine Iwanek
e71084d940 Fix silly mistake 2022-11-08 13:56:17 -05:00
Jasmine Iwanek
5ed85447d8 Merge pull request #2832 from jriwanek-forks/german
Update de-DE.rc according to @dob205
2022-11-08 13:51:44 -05:00
Jasmine Iwanek
e5fecb289c Update de-DE.rc 2022-11-08 13:51:20 -05:00
Jasmine Iwanek
0dadb8ad78 Merge pull request #2831 from jriwanek-forks/dualvideo-win32
Initial Dual Video on Win32 (UI Settings Part)
2022-11-08 13:10:49 -05:00
Jasmine Iwanek
2f17689b64 Initial Dual Video on Win32 (UI Settings Part) 2022-11-08 13:04:08 -05:00
Jasmine Iwanek
40d39f1baa HDD Speed setting in win32 2022-11-08 11:43:36 -05:00
Камидзе
06e4c9a5f2 Update zh-TW.rc 2022-11-08 19:04:15 +08:00
Камидзе
9a6b1515a1 Update zh-TW.po 2022-11-08 18:59:59 +08:00
Miran Grča
6848dfc48c Merge pull request #2823 from Cacodemon345/video-volatile-to-atomic
video: Make the rest of the FIFO variables atomic
2022-11-08 07:10:37 +01:00
Jasmine Iwanek
f4fc69925a Merge pull request #2828 from kzmidze/patch-1
Update zh-TW.rc
2022-11-08 00:08:50 -05:00
Камидзе
0da1d7fb83 Update zh-TW.rc 2022-11-08 12:34:52 +08:00
Miran Grča
62f02e6a4a Merge pull request #2827 from jriwanek-forks/langs
Language updates, including zh-TW
2022-11-08 04:11:20 +01:00
Jasmine Iwanek
3a26985e1e Correct Image and Folder to windows design guidelines 2022-11-07 21:48:38 -05:00
Jasmine Iwanek
bed8173996 This time fix the German translation the right way 2022-11-07 21:35:16 -05:00
Jasmine Iwanek
4000127c2b Revert "Fix odd german translation"
This reverts commit 37159b2fb7.
2022-11-07 21:34:06 -05:00
Jasmine Iwanek
37159b2fb7 Fix odd german translation
noun

stroke    Hub, Schlaganfall, Takt, Strich, Schlag, Streich
tact    Takt, Feingefühl
bar    Bar, Leiste, Balken, Latte, Stange, Takt
measure    Maßnahme, Maß, Maßstab, Takt, Maßeinheit, Menge
beat    Schlag, Takt, Runde, Revier, Beatmusik, Treibjagd
phase    Phase, Stufe, Stadium, Abschnitt, Takt, Schub
tactfulness    Feingefühl, Takt
grace    Gnade, Anmut, Grazie, Huld, Tischgebet, Takt

None of these seem correct.
2022-11-07 21:09:22 -05:00
Jasmine Iwanek
fb781ddbea Bring QT Translations in line with Win32 2022-11-07 21:09:22 -05:00
Jasmine Iwanek
6b49dd609e Add zh-TW.rc to win32 & QT 2022-11-07 21:09:21 -05:00
Mariusz Kurek
abf6be48a3 Add missing dependency 2022-11-07 09:12:39 +01:00
Cacodemon345
7e44372b75 vid_s3_virge: Give FIFO R/W indices the stdatomic.h treatment 2022-11-07 13:11:36 +06:00
Cacodemon345
9c775510df video: Make the rest of the FIFO variables atomic 2022-11-07 13:03:19 +06:00
Miran Grča
f35850eed4 Merge pull request #2820 from jriwanek-forks/mkmerge
Merge harmless bits from M&K and also fix compile fail
2022-11-07 01:04:18 +01:00
Jasmine Iwanek
253ca29746 Fix compile error 2022-11-06 18:55:55 -05:00
Jasmine Iwanek
921af7000e Various bits from M&K 2022-11-06 18:54:39 -05:00
Miran Grča
d13faa820e Merge pull request #2819 from jriwanek-forks/warnfixes
More compile warning fixes
2022-11-06 23:57:16 +01:00
OBattler
ced49538d4 Added a pointer cast to cdrom/cdrom_mitsumi.c to fix a warning pointed out by lemondrops. 2022-11-06 23:57:02 +01:00
OBattler
b2c22c9f4a Added Voodoo Banshee/3 YUV -> 16/24/32-bit RGB blits, fixes #2246. 2022-11-06 23:54:36 +01:00
Jasmine Iwanek
6ea143e107 More compile warning fixes 2022-11-06 15:55:16 -05:00
OBattler
f88fbd6fd2 The later SCSI and ATAPI CD-ROM drives correctly identify as having tray loaders and not caddy loaders. 2022-11-06 20:04:10 +01:00
Cacodemon345
e4e1852462 Start of global config infrastructure 2022-11-06 22:35:47 +06:00
OBattler
5a4fcbde6b Merge branch 'master' of https://github.com/86Box/86Box 2022-11-06 17:13:51 +01:00