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 marked PRs to 1.9 #7397

Merged
merged 18 commits into from Mar 24, 2019
Merged

Backport marked PRs to 1.9 #7397

merged 18 commits into from Mar 24, 2019

Conversation

@TrueBrain
Copy link
Member

TrueBrain commented Mar 23, 2019

This backports the PRs marked as "to backport" that had no conflicts while cherry-picking.

#7325
#7338
#7360
#7364
#7367
#7382
#7385
#7389 (one conflict in finnish.txt; resolved)
#7392
#7395
#7375
#7383
#7402

Also includes translations backport from master. Any ids that differ between master and 1.9 are ignored in this backport. Only the lines that have no change in context are backported.

PeterN and others added 17 commits Mar 4, 2019
Added special characters to mostly Slovak towns, a few Spanish, and one Turkish.
…lid cargo type.

It is only an error if the invalid result is actually used. This will be silently ignored at the moment.
It is still an error if a duplicate cargo type is returned.
_current_company is not currently logged anywhere in the crashlog.
_local_company is logged, despite being much less useful than
_current_company.
This change logs _current_company alongside _local_company.
…MAX. (#7382)

Company performance rating calculation does not take into account the companies' money when those exceeds INT_MAX.
… display or flickered.

Measurement tooltip was auto-closed as the hover/right-click test for tooltips was not
satisfied in this case. This is fixed by keeping the tooltip visible and instead explicitly
closing the tooltip when the PlaceObject is cancelled/completed.
This avoids windows from needing to know or care about tooltip delay settings.
This is fixed by handling the new Window::OnTooltip() event instead of OnHover()
…ft when invalidating hangar orders that happen to share IDs.

This was caused because hangars are referred to by station ID, which is not unique with respect to depot IDs.
So instead of integrating our own, we only copy our precompiled
binaries into the right folder.
GetAircraftFlightLevel<Aircraft> is only used in static functions
inside aircraft_cmd.cpp. With GCC, Clang and MSVC this is not an
issue, but on ICC fails linking, because it doesn't find this
version of this template. Possibly these two pieces of information
are linked.
Explicit defining the function fixes the issue.
@nielsmh nielsmh added this to the 1.9.0 milestone Mar 24, 2019
@PeterN
PeterN approved these changes Mar 24, 2019
@TrueBrain TrueBrain merged commit 174b0da into OpenTTD:release/1.9 Mar 24, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20190324.11 succeeded
Details
OpenTTD CI (Linux commit-checker) Linux commit-checker succeeded
Details
OpenTTD CI (Linux linux-amd64-clang-3.8) Linux linux-amd64-clang-3.8 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
@TrueBrain TrueBrain deleted the TrueBrain:backport_1.9 branch Mar 24, 2019
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

8 participants
You can’t perform that action at this time.