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

Prepare for 1.10.2 release #8135

Merged
merged 40 commits into from Jun 1, 2020
Merged

Prepare for 1.10.2 release #8135

merged 40 commits into from Jun 1, 2020

Conversation

LordAro
Copy link
Member

@LordAro LordAro commented May 10, 2020

Quite a few changes in the end, but don't think we need an RC?

SamuXarick and others added 20 commits May 10, 2020
… and thus caused desyncs.

Use DC_AUTOREPLACE for actions that shall be reversibe, in this case:
- Do not rearrange free wagons in test-run.
- Do not discard OrderBackups.
The latter was not triggered by actual auto-replace, since it does not set a 'user'.
… Windows version (OpenTTD#8114)

* Fix OpenTTD#8102: Update Windows installer strings to reference versions newer than 7

* Fix 2c53390: Version strings incorrectly capitalised
Variable-length values would write threshold values with a byte too many.
System Exclusive messages would cause write to fail since the end byte was treated as part of next message.
frosch123
frosch123 previously approved these changes May 10, 2020
@LordAro
Copy link
Member Author

@LordAro LordAro commented May 10, 2020

NB waiting to see if @ldpl gets any further with desync debugging

@LordAro LordAro dismissed frosch123’s stale review May 18, 2020

Dismiss so it doesn't get merged by accident

glx22 and others added 7 commits May 18, 2020
The presence of sdl2-config is used go determine whether to look for
sdl2 first, or just sdl1. However, when sdl2-config is *not* present,
`which` returns an empty string. Due to lack of quoting, this produces
`[ -x ]`, rather than `[ -x "" ]` and it turns out the former actually
has a succesful exit status for some reason.

This was not a problem when just running configure, because it would
then just fail to detect sdl2 and fall back to sdl1. However, when
passing `--with-sdl` (without specifying a version), this would only
attempt to detect sdl2, even when sdl2-config was not present, but sdl1
is.

Adding quotes makes the check work as intended.
@nielsmh
Copy link
Contributor

@nielsmh nielsmh commented May 19, 2020

I really want a fix for #8066 into 1.10.2, we keep getting reports of it and it feels bad to tell people to play 1.10.0-RC1.

@LordAro
Copy link
Member Author

@LordAro LordAro commented May 19, 2020

I agree, but I'd rather not wait any longer. The amount of desyncs that @ldpl keeps finding isn't good...

@andythenorth
Copy link
Contributor

@andythenorth andythenorth commented May 20, 2020

If we have fixes for bugs in prod, we should ship those fixes early and often :)

"Releases are cheap"? :)

@LordAro LordAro force-pushed the 1102-release branch 3 times, most recently from 88b1ead to 99f2b27 Compare Jun 1, 2020
Yexo and others added 13 commits Jun 1, 2020
Previously the internal content list was invalidated and sorted for
every new item added. Now the sorting is delayed until the GUI is
drawn, which means we only sort once per GUI tick.

Since the amount of incoming items per GUI tick is not controlled by
the GUI but rather by network speed, we were previously doing a lot
of duplicate work per tick, causing the mouse cursor to lag while
the list was initialized.
Initialization code for GRFFile::roadtype_map was copied from
railtype_map. But while RailType is a byte-sized enum and could thus
be initialized via memset, RoadType doesn't have a defined size.
Yexo
Yexo approved these changes Jun 1, 2020
@LordAro LordAro merged commit 430ce20 into OpenTTD:release/1.10 Jun 1, 2020
8 checks passed
@LordAro LordAro deleted the 1102-release branch Jun 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants