Merge branch 'openttd'

2023-06-11 22:51:20 +04:00
parent b7a6f2a070 9be99d15c3
commit 85e548efb9
9 changed files with 27 additions and 48 deletions
--- a/.changelog
+++ b/.changelog
@@ -1,36 +1,5 @@
-13.2 (2023-06-10)
+13.3 (2023-06-11)
 ------------------------------------------------------------------------
-Change: [Win32] position window in center of workspace of primary display (#10942)
-Change: Automatically disable hardware acceleration when GPU driver crashed the game last attempt (#10928)
-Change: [Linux] Default scroll mode to non-mouse-lock (#10920)
-Change: Include font style in font name for Freetype (#10879)
-Fix: Don't restore backed up vehicle name if it's no longer unique (#10979)
-Fix #10975: Train name wrongly marked as unique when joining trains (#10976)
-Fix: Crash when not even a single row fits for dropdowns on low resolution screens (#10934)
-Fix: Crash with tooltip on low resolution screens (#10933)
-Fix: Crash when window can't be placed on low resolution screens (#10932)
-Fix #10502: Apply engine refit before attaching free wagons (#10926)
-Fix: Wayland crash on startup due to Pango also using FontConfig (#10916)
-Fix: When syncing width of GUI items, take padding into account (#10915)
-Fix: Make dropdowns self-close when losing focus (#10912)
-Fix: Land info window maximum width was not scaled (#10894)
-Fix: Check max member count in squirrel classes (#10883)
-Fix: Ask FontConfig for the face index when opening fonts (#10878)
-Fix #10831: Level crossing parts left barred after crossing tile removal (#10874)
-Fix: Rail waypoint selection window not closed when parent windows closed (#10873)
-Fix #10846: [Script] Crash on trying to allocate an excessively large array (#10848)
-Fix: [Win32] Text line breaking did not properly handle punctuation characters (#10775)
-Fix: [Emscripten] Crash when saving games (#10758)
-Fix: [Win32] Wrong multi-line text layout due to incorrect whitespace handling (#10752)
-Fix #10741: Rail platforms left partially reserved after train crash (#10751)
-Fix: Shaded engines in purchase list incorrectly shaded (#10736)
-Fix #10735: [NewGRF] {POP_COLOUR} fails if string is drawn with extra flags (#10736)
-Fix #8177: Ships with max speed overflow to near-zero speed (#10695)
-Fix #10289: Don't silently fail when setting timetable start dates (#10690)
-Fix #8302: Improve "Maintenance intervals are in percents" helptext (#10686)
-Fix #10665: "No vehicles are available yet" message did not appear correctly on non-temperate climates (#10673)
-Fix #10630: Don't allow shifting service date earlier than year 0 (#10643)
-Fix #10637, #10638: Incorrect water infrastructure totals when building certain object types (#10639, #10640)
-Fix: Abort loading savegame if road vehicle is on invalid road type (#10622)
+Fix: [Win32] use full monitor resolution for fullscreen (#10985)


--- a/.github/workflows/release-macos.yml
+++ b/.github/workflows/release-macos.yml
@@ -79,7 +79,7 @@ jobs:
        echo "::endgroup::"

    - name: Import code signing certificates
-      uses: Apple-Actions/import-codesign-certs@v1
+      uses: Apple-Actions/import-codesign-certs@v2
      with:
        # The certificates in a PKCS12 file encoded as a base64 string
        p12-file-base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
--- a/.ottdrev
+++ b/.ottdrev
@@ -1 +1 @@
-13.2	20230610	0	d4df692a707dcc428e98b11dfe4c2e51c922d661	1	1	2023
+13.3	20230611	0	d854bb82e51bb5a4bd59a0363f34d22384758aa0	1	1	2023
--- a/.release_date
+++ b/.release_date
@@ -1 +1 @@
-2023-06-10 13:53 UTC
+2023-06-11 16:43 UTC
--- a/.version
+++ b/.version
@@ -1 +1 @@
-13.2
+13.3
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ if(NOT BINARY_NAME)
 endif()

 project(${BINARY_NAME}
-    VERSION 13.1
+    VERSION 13.3
 )

 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+13.3 (2023-06-11)
+------------------------------------------------------------------------
+Fix: [Win32] use full monitor resolution for fullscreen (#10985)
+
+
 13.2 (2023-06-10)
 ------------------------------------------------------------------------
 Change: [Win32] position window in center of workspace of primary display (#10942)
--- a/src/rev.cpp.in
+++ b/src/rev.cpp.in
@@ -35,7 +35,7 @@ bool IsReleasedVersion()
 *
 * <modified> shows a "M", if the binary is made from modified source code.
 */
-const char _openttd_revision[] = "13.2";
+const char _openttd_revision[] = "13.3";

 /**
 * The text version of OpenTTD's build date.
@@ -48,7 +48,7 @@ const char _openttd_build_date[] = __DATE__ " " __TIME__;
 /**
 * The git revision hash of this version.
 */
-const char _openttd_revision_hash[] = "d4df692a707dcc428e98b11dfe4c2e51c922d661";
+const char _openttd_revision_hash[] = "d854bb82e51bb5a4bd59a0363f34d22384758aa0";

 /**
 * The year of this version.
@@ -77,7 +77,7 @@ const byte _openttd_revision_tagged = 1;
 * It should never contain things like "beta", but only the release version
 * we are compatible with.
 */
-const char _openttd_content_version[] = "13.1";
+const char _openttd_content_version[] = "13.3";

 /**
 * The NewGRF revision of OTTD:
@@ -95,4 +95,4 @@ const char _openttd_content_version[] = "13.1";
 * the "patch" part of the version. To make sure "1.11.0" is smaller than "12.0", we
 * have to adjust the major by 16.
 */
-const uint32 _openttd_newgrf_version = (13 + 16) << 24 | 1 << 20 | 1 << 19 | 28004;
+const uint32 _openttd_newgrf_version = (13 + 16) << 24 | 3 << 20 | 1 << 19 | 28004;
--- a/src/video/win32_v.cpp
+++ b/src/video/win32_v.cpp
@@ -212,13 +212,18 @@ bool VideoDriver_Win32Base::MakeWindow(bool full_screen, bool resize)
 		if (this->main_wnd != nullptr) {
 			if (!_window_maximize && resize) SetWindowPos(this->main_wnd, 0, 0, 0, w, h, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER | SWP_NOMOVE);
 		} else {
-			/* Center on the workspace of the primary display. */
-			MONITORINFO mi;
-			mi.cbSize = sizeof(mi);
-			GetMonitorInfo(MonitorFromWindow(0, MONITOR_DEFAULTTOPRIMARY), &mi);
+			int x = 0;
+			int y = 0;

-			int x = (mi.rcWork.right - mi.rcWork.left - w) / 2;
-			int y = (mi.rcWork.bottom - mi.rcWork.top - h) / 2;
+			/* For windowed mode, center on the workspace of the primary display. */
+			if (!this->fullscreen) {
+				MONITORINFO mi;
+				mi.cbSize = sizeof(mi);
+				GetMonitorInfo(MonitorFromWindow(0, MONITOR_DEFAULTTOPRIMARY), &mi);
+
+				x = (mi.rcWork.right - mi.rcWork.left - w) / 2;
+				y = (mi.rcWork.bottom - mi.rcWork.top - h) / 2;
+			}

 			char window_title[64];
 			seprintf(window_title, lastof(window_title), "OpenTTD %s", _openttd_revision);
@@ -1 +1 @@
 .2
 .3