Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport things for 1.10.3 release #8287

Merged
merged 27 commits into from Aug 9, 2020
Merged

Conversation

@LordAro
Copy link
Member

@LordAro LordAro commented Jul 30, 2020

Everything marked as backport-requested. And also, controversially, a bit of #8241 that fixes the compiler warnings.

ilayaraja97 and others added 26 commits May 16, 2020
A symbol clash breaks building ICU on macOS, and although it isn't
necessary, it might as well be possible.
This fixes a bug that can reproduced with these steps:
* Start openttd in fullscreen mode
* Turn off fullscreen mode
* Try to resize the window. The window can't be resized.
NetworkTCPSocketHandler::SendPacket is not thread safe and may not
be used concurrently from multiple threads without suitable locking
Remove static buffer form of NetworkAddress::GetAddressAsString.
This is used in multiple threads concurrently, and is not thread-safe.

Replace it with a form returning std::string.
conected and aborted flags are used concurrently from multiple threads.
This changes the error when you attempt to convert a road owned by a town to another road, specifying that it's owned by the town rather than simply being incompatible. As the original poster of the issue pointed out, these seemed to be the only occurences of the incompatible road string, so now it's unused, but they would be left untouched in case of future use or since changing it to a different error would do the work of removing it then. If requested, it likely wouldn't be too difficult to remove the string entirely.
This could be caused by an engine being renamed, and the old
name being cached from a previous sort.

See: #7838
This could be caused by a group being renamed, and the old
name being cached from a previous sort.

See: #7838
@LordAro LordAro force-pushed the LordAro:1103-release branch from e4a34b8 to 3359846 Jul 30, 2020
@@ -1,3 +1,23 @@
1.10.3 (2020-08-01)

This comment has been minimized.

@nielsmh

nielsmh Aug 3, 2020
Contributor

Oops we passed the date

@LordAro LordAro force-pushed the LordAro:1103-release branch from 3359846 to 06de095 Aug 9, 2020
@LordAro LordAro merged commit baf5bf2 into OpenTTD:release/1.10 Aug 9, 2020
8 checks passed
8 checks passed
Commit checker
Details
OpenTTD CI Build #20200809.1 succeeded
Details
OpenTTD CI (Linux linux-amd64-clang-3.9) Linux linux-amd64-clang-3.9 succeeded
Details
OpenTTD CI (Linux linux-amd64-gcc-6) Linux linux-amd64-gcc-6 succeeded
Details
OpenTTD CI (Linux linux-i386-gcc-6) Linux linux-i386-gcc-6 succeeded
Details
OpenTTD CI (MacOS) MacOS succeeded
Details
OpenTTD CI (Windows Win32) Windows Win32 succeeded
Details
OpenTTD CI (Windows Win64) Windows Win64 succeeded
Details
@LordAro LordAro deleted the LordAro:1103-release branch Dec 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet