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.

Sign up for GitHub

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

Jump to bottom

Backport master into release/13 #10420

Merged
merged 29 commits into from
Jan 28, 2023
Merged

Backport master into release/13 #10420

merged 29 commits into from
Jan 28, 2023

Conversation

michicc
Copy link
Member

@michicc michicc commented Jan 27, 2023 •
edited

Description

Backport of all closed Pull Requests labeled as 'backport requested' into release/13.

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR touches english.txt or translations? Check the guidelines
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

@michicc
Copy link
Member Author

michicc commented Jan 27, 2023

Now would be the time to check if anything is missing or should not be on this list.

@rubidium42
Copy link
Contributor

I haven't seen anything obviously wrong with the changes in this PR. But there might be some PRs to consider:
Maybe #10365, i.e. don't show 'max speed' as speed limit for brigdes but that has changed/added a few strings so I'm not sure translations are ready yet. On the other hand those strings usually do not actually need a translation.
Maybe #10360?
#10364 as that's just an improvement to the English string and might be blocking other languages improvements to that string to be taken by the translation-update-copy-script.

@michicc michicc added the preview This PR is receiving preview builds label Jan 28, 2023
@DorpsGek DorpsGek temporarily deployed to preview-pr-10420 January 28, 2023 10:50 Inactive
@michicc
Copy link
Member Author

michicc commented Jan 28, 2023

Agree on #10365 and #10364 as it makes life easier later with the string changes. And for #10360, why not? Tagged them and will re-run the backport script later.

There's also #10355 that is tagged but not approved/merged.

glx22 and others added 25 commits January 28, 2023 14:58
@glx22 @michicc
Fix OpenTTD#10304, fe30f66: [Scripts] Don't start GS in intro (OpenTT…
d890751 
…D#10305)
@rubidium42 @michicc
Fix: do not allow more palette colours than there are indices for the…
732380d 
… colours

Or: do not pass unchecked size from BMP file into memory allocation
@rubidium42 @michicc
Fix: prevent corrupted GRF files to allocate stupid amounts of memory
7da2270
@PeterN @michicc
Fix: Don't assume engclass 2 should be elrail. (OpenTTD#10315)
122d368 
When disabling/enabling elrail, there is an assumption that `engclass` of 2
means the engine will run on elrail. While this holds for default engines,
NewGRFs can do other things.

To resolve this we store the intended railtype so that toggling elrail will
restore to the correct type.
@rubidium42 @michicc
Fix OpenTTD#10309: [SDL] Uninitialized width and height when turning …
b3ff5dc 
…off full screen
@PeterN @michicc
Fix OpenTTD#10331: Starting new company during load must happen after…
7c97281 
… AI start. (OpenTTD#10332)

This situation occurs when loading a savegame in single-player which only
has AI companies.
@PeterN @michicc
Fix OpenTTD#10335: Set initial scrollbar count for object GUI. (OpenT…
321ce48 
…TD#10336)

This previously happened when the window was resized by itself which was fixed by OpenTTD#10196. Explicitly set the count instead.
@2TallTyler @michicc
Fix OpenTTD#10333, c53f29d: Only show industry prospecting errors to …
1a3f7f0 
…local company (OpenTTD#10338)
@PeterN @michicc
Fix: Link variants to parents when finalising engines. (OpenTTD#10346)
b1d9f21 
This ensures that definition-order of engines within the NewGRF does not matter.
@2TallTyler @michicc
Fix: Various Wide River issues (OpenTTD#10348)
701461b
@JGRennison @michicc
Fix OpenTTD#10032: Capacities of articulated vehicles in build window
22800b8 
See also: OpenTTD#9954
@rubidium42 @michicc
Fix OpenTTD#10057: FallbackParagraphLayout fails to properly wrap
93a35df 
... during the first word after a new run has been started.
@rubidium42 @michicc
Fix OpenTTD#10177: company list password padlock showed after switchi…
9779ffe 
…ng to single player
@rubidium42 @michicc
Fix OpenTTD#9865: removing files with the console always failed
ec0ba26
@2TallTyler @michicc
Fix OpenTTD#10363: CargoDist setting helptext shouldn't suggest symme…
bbfdf10 
…tric distribution for diamonds in subtropic (OpenTTD#10364)

* Fix OpenTTD#10363: CargoDist setting helptext shouldn't suggest symmetric distribution for diamonds in subtropic

* Fix: Always capitalize the first word of a sentence, even if a quoted setting name
@rubidium42 @michicc
Fix OpenTTD#10368, Fix 994bf19: server restarting game caused clients…
1822d60 
… to hit assertion

Upon closing the EndGameWindow, triggered from UnInitWindowSystem, the
HighScoreWindow would be opened and _z_windows would not be empty.
@PeterN @michicc
Fix: Switch to OWNER_TOWN prevented OWNER_DEITY test during industry …
c911f14 
…prospecting. (OpenTTD#10360)
@FLHerne @michicc
Fix OpenTTD#10362: NewGRF bridges without speed limits.
5f774c8 
For bridges, a max speed of 0xFFFF (i.e. no effective limit)
 is no longer displayed as a limit in the UI.

A max speed of 0 is also considered unlimited, for similarity to the
 roadtype and railtype interface.
@SamuXarick @michicc
Fix 3c047b1: AIGroup.GetProfitLastYear could get values different tha…
f5ebddc 
…n those displayed in GUI (OpenTTD#10227)

* Change: Store "all time" and "since minimum age" last year profits on groups

* Fix: Update last year profit for groups when copying vehicle statistics on autoreplace

* Codechange: Refactor profit last year

* Change: Rename some group related items for clarity

* Change: Reorder the fields in GroupStatistics

That way less memory gets wasted.
@rubidium42 @michicc
Fix OpenTTD#10377, Fix 94167df: bad sorting of rail vehicles when pri…
668204d 
…mary variant is missing
@2TallTyler @michicc
Fix OpenTTD#10395: When loading old saves, don't forcibly bar level c…
df9fc9f 
…rossings (OpenTTD#10400)
@PeterN @michicc
Fix OpenTTD#10220: Don't select unselectable engine as default. (Open…
1f76629 
…TTD#10404)
@merni-ns @michicc
Change OpenTTD#10255: Reduce basic thickness of linkgraph GUI lines (O…
ef41013 
…penTTD#10410)

From 3px to 2px (multiplied by UI scale).
@rubidium42 @michicc
Fix: no ScriptEvent sub class should export constructors to scripts
bd6094a
@rubidium42 @michicc
Fix: scripts cannot call constructors of ScriptEvents, so remove from…
16fa74f 
… the documentation
@DorpsGek DorpsGek temporarily deployed to preview-pr-10420 January 28, 2023 14:00 Inactive
@michicc michicc merged commit aa4cd10 into OpenTTD:release/13 Jan 28, 2023
@michicc michicc deleted the release-backport branch January 28, 2023 16:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rubidium42 rubidium42 rubidium42 approved these changes

Assignees
No one assigned
Labels
preview This PR is receiving preview builds
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@michicc @rubidium42 @DorpsGek @glx22 @PeterN @2TallTyler @JGRennison @FLHerne @SamuXarick @merni-ns