-
-
Notifications
You must be signed in to change notification settings - Fork 958
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
+898
−593
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… plane crashes setting. (OpenTTD#7325)
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. (OpenTTD#7382) Company performance rating calculation does not take into account the companies' money when those exceeds INT_MAX.
…did not 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.
…ick. This is fixed by handling the new Window::OnTooltip() event instead of OnHover()
…-aircraft 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.
PeterN
approved these changes
Mar 24, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.