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 master into release/12 #9602

Merged
merged 10 commits into from Oct 3, 2021
Merged

Conversation

@TrueBrain
Copy link
Member

@TrueBrain TrueBrain commented Oct 3, 2021

Description

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

r-a-sattarov and others added 10 commits Oct 3, 2021
…TD#9575)

MCST e2k (Elbrus 2000) architecture has half native / half software support of most Intel/AMD SIMD
e.g. MMX/SSE/SSE2/SSE3/SSSE3/SSE4.1/SSE4.2/AES/AVX/AVX2 & 3DNow!/SSE4a/XOP/FMA4

E2K - this is VLIW/EPIC architecture, like Intel Itanium (IA-64) architecture.
Ref: https://en.wikipedia.org/wiki/Elbrus_2000

Co-authored-by: Alexander Troosh @troosh, Konstantin Ivlev @SSE4 and Dmitry Shcherbakov @crypto-das
…ript registration could prevent further script detections (OpenTTD#9589)

Also the memory allocation triggering the limit was never freed.
And if the exception was thrown in a constructor using placement new, the pre-allocated memory was not freed either.
…ing (OpenTTD#9600)

This gives user visual feedback that the refresh is still pending, and
prevents people from clicking again and again thinking nothing is
happening. This is especially true for connections that fall back to
TURN, as that takes a few seconds to kick in.

Additionally, prevent clicking on the button again while a refresh
is pending. This is only delaying a successful result.
@TrueBrain
Copy link
Member Author

@TrueBrain TrueBrain commented Oct 3, 2021

I am mainly testdriving some automation I wrote for this. Before we release 12.0 one more backport will be done with what-ever PRs / language changes were not picked up yet. So please don't see "this doesn't include all PRs" as a blocker for approving this PR.

Loading

@michicc
Copy link
Member

@michicc michicc commented Oct 3, 2021

Add #9594, too?

Loading

@TrueBrain
Copy link
Member Author

@TrueBrain TrueBrain commented Oct 3, 2021

Let me quote myself, of the reply before yours:

I am mainly testdriving some automation I wrote for this. Before we release 12.0 one more backport will be done with what-ever PRs / language changes were not picked up yet. So please don't see "this doesn't include all PRs" as a blocker for approving this PR.

:D There will be more, really :)

Loading

michicc
michicc approved these changes Oct 3, 2021
@TrueBrain TrueBrain merged commit ca91e76 into OpenTTD:release/12 Oct 3, 2021
15 checks passed
Loading
@TrueBrain TrueBrain deleted the release-backport branch Oct 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants