Commit Graph

6367 Commits

Author SHA1 Message Date
Miran Grča
01de33f9ac Merge pull request #1848 from dob205/master
Cleaning up some things in the macOS code and improving bundle information
2021-11-19 19:03:56 +01:00
RichardG867
73281006b1 Jenkins: Add new method of extracting the current HEAD commit 2021-11-19 14:26:43 -03:00
dob205
6bcc8c6ca0 Cleaning up things 2021-11-19 18:04:30 +01:00
dob205
5357cea1bc Showing the build number in the user viewable bundle version 2021-11-19 17:42:48 +01:00
dob205
6f9d4e5bb3 slight fixes for that file
Makes the macOS bundle display the proper copyright and version numbers
2021-11-19 17:40:28 +01:00
dob205
5f303ba4c7 Cleaning up some things k 2021-11-19 17:38:42 +01:00
Miran Grča
5ee200eabd Merge pull request #1847 from jvernet/master
MacOsX Compilation fixed
2021-11-19 17:14:07 +01:00
Miran Grča
ee71d2bf26 Merge pull request #1846 from dob205/master
Further improvements to the German and Croatian translation
2021-11-19 17:13:57 +01:00
Miran Grča
d24fbaf060 Merge pull request #1845 from Cacodemon345/patch-22
Fix macOS linking
2021-11-19 17:13:47 +01:00
jvernet
d044e0ad72 Merge branch '86Box-master' 2021-11-19 17:01:28 +01:00
jvernet
0c3999d972 Merge branch 'master' of https://github.com/86Box/86Box into 86Box-master 2021-11-19 17:00:59 +01:00
jvernet
77b1f8a71e MacOsX Compilation 2021-11-19 16:57:38 +01:00
jvernet
46af2a7a8f MacOSX Default ROM PATH 2021-11-19 16:42:43 +01:00
Cacodemon345
e50afd9b6b Fix macOS linking 2021-11-19 20:42:03 +06:00
dob205
b88a515c96 Updates to German
Makes the configure button look better
2021-11-19 15:40:50 +01:00
dob205
5bd78a760f Updating the German translation again
Improves some potentially awkward phrases in German
2021-11-19 15:36:57 +01:00
dob205
e488d674d8 Merge branch '86Box:master' into master 2021-11-19 15:32:16 +01:00
OBattler
3cdcf010f2 Fixed the Commodore 386X-25 on-board CL-GD 5402 ROM path. 2021-11-19 15:26:32 +01:00
dob205
d6bc83e0aa Merge branch '86Box:master' into master 2021-11-19 15:22:15 +01:00
dob205
22c633950e Updating the Croatian translation
Updating the Croatian translation with some improved phrasing
2021-11-19 15:22:08 +01:00
OBattler
26c6fd13c8 Merge branch 'master' of https://github.com/86Box/86Box 2021-11-19 15:08:36 +01:00
OBattler
d5086701c2 Moved the call to win_load_icon_set(), should fix the bug of no icon in the Settings dialog in the Settings-only mode, closes #1844. 2021-11-19 15:08:22 +01:00
dob205
6b0f66cd5c Updating the German translation
This should fix some awkward strings inside the German translation.
2021-11-19 13:53:34 +01:00
Miran Grča
81ef8e708b Merge pull request #1843 from dob205/master
Adding proper support for storing the 86Box ROMs on macOS inside app bundles
2021-11-19 13:48:39 +01:00
dob205
469a9d0b7a Adds the macOSXglue.m into the compilation process
Enables to get the macOSXglue up and running while compiling 86Box on macOS, also executes some functions related to macOS now not on Windows and Linux anymore
2021-11-19 13:44:53 +01:00
dob205
8820a60e01 Loading macOSXglue.m and macOSXglue.h
Enables to store the ROMs in "Application Support" on macOS, can be extended later into storage of global configuration files
2021-11-19 13:40:35 +01:00
jvernet
74bb11b930 Update CMakeLists.txt 2021-11-19 13:05:33 +01:00
jvernet
13371d03bd macOSX Rom path detecttion 2021-11-19 12:41:31 +01:00
Miran Grča
1a25a5a32b Merge pull request #1840 from jvernet/master
Update fr-FR.rc
2021-11-19 12:32:55 +01:00
jvernet
43039331fc Update fr-FR.rc 2021-11-19 12:22:36 +01:00
RichardG867
065366b35b Jenkins: Fix build number passing in pipeline 2021-11-18 20:32:23 -03:00
RichardG867
ba6e0f1d7f Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30 2021-11-18 20:28:59 -03:00
RichardG867
93e4e94c7c Jenkins: Commit new Jenkinsfile 2021-11-18 20:28:46 -03:00
Miran Grča
c01a832896 Merge pull request #1838 from 86Box/tc1995
Changes list 5:
2021-11-19 00:17:05 +01:00
TC1995
e29dafa17a Changes list 5:
Added the AT&T 2xc498 Precision RAMDAC.
Added 1MB configurations to the Cirrus Logic GD5434 as well as re-organized the memory size options of the other Cirrus cards.
Separated the et4000w32/i blitter from the standard et4000w32p blitter and properly implemented the X/Y Count route.
Added several Diamond Cirrus cards.
Added Number Nine S3 cards (868 and 968-based).
Fixed the WD90c30 1MB modes.
Re-organized the video card names.
2021-11-18 23:58:04 +01:00
RichardG867
d5efe6cab5 win_dynld: Add GetLastError() to GetProcAddress as well 2021-11-18 19:47:57 -03:00
RichardG867
cae0ed730b win_dynld: Add GetLastError() to failure log 2021-11-18 19:46:23 -03:00
Miran Grča
5d6dbc8f0d Merge pull request #1837 from 86Box/tc1995
Changes list 4:
2021-11-18 23:36:32 +01:00
OBattler
86a74f03d0 Fixed some mistakes in the French translation. 2021-11-18 23:30:48 +01:00
TC1995
89233d0fbb Changes list 4:
Fixed Diamond Stealth 3D 4000 specific drivers' hang.
2021-11-18 23:27:31 +01:00
Miran Grča
592bf12e99 Merge pull request #1836 from altiereslima/master
Update pt-BR.rc
2021-11-18 23:27:27 +01:00
Miran Grča
65239e981c Merge pull request #1835 from 86Box/tc1995
Changes list 3:
2021-11-18 23:27:16 +01:00
OBattler
183f6231c1 Finished and enabled the French translation (JVERNET please look at this to make sure I did it correctly!). 2021-11-18 23:26:33 +01:00
TC1995
6e13d1ff74 Merge branch 'master' of github.com:86Box/86Box into tc1995 2021-11-18 23:24:30 +01:00
RichardG867
e86ba44b7d Minor build script improvements 2021-11-18 19:22:19 -03:00
RichardG867
b0d37fc63a Remove target from gitignore as it's no longer used 2021-11-18 19:17:47 -03:00
altiereslima
02ca11ba1e Update pt-BR.rc 2021-11-18 19:04:58 -03:00
OBattler
a7f7820940 Fixed translation for icon sets. 2021-11-18 22:21:43 +01:00
TC1995
9517af39b4 Merge branch 'master' of github.com:86Box/86Box into tc1995 2021-11-18 22:19:43 +01:00
TC1995
2eb16b4cd7 Changes list 3:
Reverted one major change of the ATI 28800 cards that caused glitches.
2021-11-18 22:16:18 +01:00