Commit Graph

6455 Commits

Author SHA1 Message Date
OBattler
97bbbb1090 Removed an excess pclog(). 2021-11-18 18:28:40 +01:00
jvernet
1d815f5b5b Add MacoSX Glue 2021-11-18 18:04:56 +01:00
jvernet
0079b812be Merge branch '86Box-master' 2021-11-18 18:02:45 +01:00
jvernet
80f4232713 Merge branch 'master' of https://github.com/86Box/86Box into 86Box-master 2021-11-18 18:02:19 +01:00
OBattler
e027f52e57 Slight correction for the About dialog. 2021-11-18 17:56:23 +01:00
OBattler
96807e860b Added the Japanese translation. 2021-11-18 17:52:49 +01:00
OBattler
eab075aa14 Fixed the case of the MT32 and CM32-L ROM file. 2021-11-18 10:34:05 +01:00
JVernet
fc4a5adad6 Merge branch '86Box:master' into master 2021-11-18 10:33:15 +01:00
OBattler
afe6bb08b0 Updated the keyboard controller identification for the AMI Excalibur PCI-II. 2021-11-18 00:40:48 +01:00
RichardG867
155104467e Fix build script wildcards 2021-11-17 20:22:30 -03:00
Miran Grča
5e56e5be2b Merge pull request #1827 from jriwanek-forks/patch5
PS/2 mouse fixes and misc
2021-11-18 00:18:09 +01:00
Jasmine Iwanek
eed84b307d Fix some typos 2021-11-17 17:56:31 -05:00
Jasmine Iwanek
53cb0de504 Fix PS/2 on 4dps 2021-11-17 17:54:36 -05:00
Miran Grča
b67d5e9d9f Merge pull request #1826 from altiereslima/master
Update pt-BR.rc
2021-11-17 23:21:59 +01:00
OBattler
458190a599 Merge branch 'master' of https://github.com/86Box/86Box 2021-11-17 23:20:28 +01:00
OBattler
30680c46ed Removed the obsolete m_at_socket4_5.c. 2021-11-17 23:20:16 +01:00
altiereslima
d0bfd1a801 Update pt-BR.rc 2021-11-17 19:18:43 -03:00
Miran Grča
482dfb23c3 Merge pull request #1820 from andi8086/master
Unix: Make fullscreen command really toggle
2021-11-17 23:03:07 +01:00
Miran Grča
a5c2fe1e4a Merge pull request #1821 from laciba96/master
Menu reloading fixes for Multilanguage UI
2021-11-17 23:02:56 +01:00
Miran Grča
adcd41cb80 Merge pull request #1825 from ts-korhonen/master
Fix resource string over bounds issues
2021-11-17 23:02:42 +01:00
RichardG867
4e337a3f1f Actually fix the tar deletion issue 2021-11-17 18:45:20 -03:00
RichardG867
09529eaf2f Remove target from gitignore as it was causing problems 2021-11-17 18:16:23 -03:00
RichardG867
f15f2c96e9 Jenkins: Recreate output directory if it was deleted 2021-11-17 18:11:10 -03:00
RichardG867
daa8f6731c More improvements to the build script 2021-11-17 18:01:15 -03:00
Laci bá
9125169e5b Apply requested changes, along with more indentation fixes 2021-11-17 21:53:26 +01:00
Laci bá
2550905baa Merge branch '86Box:master' into changeable_icon_set 2021-11-17 21:48:00 +01:00
Laci bá
78adf3ac9c Merge branch '86Box:master' into master 2021-11-17 21:47:42 +01:00
RichardG867
fbb7cecce0 Add target to build script gitignore 2021-11-17 17:46:17 -03:00
ts-korhonen
9b0a052447 Increase resource string max length 512 > 1024. Allocate with calloc. 2021-11-17 22:45:22 +02:00
JVernet
fe060e40ac Merge branch '86Box:master' into master 2021-11-17 21:35:06 +01:00
jvernet
bfd2fe941e Update fr-FR.rc 2021-11-17 21:28:18 +01:00
Cacodemon345
f6741b172e Fix macOS rom directory (#1823)
* Fix macOS rom directory

* Fix typo
2021-11-17 21:09:40 +01:00
jvernet
63099ea3ff Update CMakeLists.txt 2021-11-17 20:30:50 +01:00
jvernet
e53d3ca059 Merge remote-tracking branch 'upstream/master' 2021-11-17 20:29:44 +01:00
Laci bá
2f464edd65 Another try to fix the VS2019 builds 2021-11-17 19:35:29 +01:00
Laci bá
988a22ebf4 Add missing texts to fi-FI translation too 2021-11-17 19:23:55 +01:00
Laci bá
d9e6fc0db0 Update dialogs.rc 2021-11-17 19:16:38 +01:00
RichardG867
767b09129c Fix build script 2021-11-17 15:09:21 -03:00
Laci bá
cc59925be6 Make this branch up-to-date 2021-11-17 19:04:37 +01:00
Laci bá
81700ee043 Merge branch 'changeable_icon_set' of https://github.com/laciba96/86Box into changeable_icon_set 2021-11-17 19:02:22 +01:00
Laci bá
03a7247630 Apply requested changes
- Remove icon functions from plat.h.
- Fix some indentation problems.
- Remove unused parameter from win_stbar.c
- Rename win_lang.c to win_progsett.c
- Remove stub functions from unix.c
- Move win_load_icon_set() to ui_init()
- Replace the translated texts to English, and let the translators translate them
- Fix the control IDs in dialogs.rc.
- Use the requested solution in win_icon.c for setting the array variables.
2021-11-17 19:02:19 +01:00
RichardG867
3c95135d59 Adapt build script to the new new Jenkins pipeline 2021-11-17 14:43:48 -03:00
Laci bá
c362cf3654 Merge branch '86Box:master' into changeable_icon_set 2021-11-17 18:32:21 +01:00
Laci bá
faa1750c92 Menu reloading fixes for Multilanguage UI 2021-11-17 18:28:00 +01:00
OBattler
b14e04b926 Mae the dialog font and font size redefinable and fixed ROMs path on Mac. 2021-11-17 17:05:05 +01:00
Andreas J. Reichel
f935d9b105 Unix: Make fullscreen command really toggle
Help says that fullscreen TOGGLES fullscreen. Fix this.

Signed-off-by: Andreas J. Reichel <andreas@reichel.bayern>
2021-11-17 14:35:22 +01:00
David Hrdlička
032fc51416 Add zh-CN to the main resource script 2021-11-17 07:14:25 +01:00
ts-korhonen
b0bd0339d3 Added Finnish (fi-FI) translation 2021-11-17 07:09:07 +01:00
startmenu
0b0f44be6f Add Simplified Chinese (zh-CN) translation (#1819)
* Simplified Chinese translation

* Update zh-CN.rc

* Update zh-CN.rc

* Update zh-CN.rc
2021-11-17 07:07:07 +01:00
Laci bá
7853f9f922 Small safety fix 2021-11-16 22:02:17 +01:00