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

Update: Changelog for 1.9.0-RC2 and prepare for release #7406

Merged
merged 5 commits into from Mar 24, 2019

Conversation

@TrueBrain
Copy link
Member

TrueBrain commented Mar 24, 2019

Also backports:

#7405 (merge-conflict in afterload.cpp)

Reverts:

b1e40b6
011257d (functionality has bugs; 1.10 will iron them out)

@TrueBrain TrueBrain force-pushed the TrueBrain:backport_1.9 branch from 5a5dca2 to cf9167f Mar 24, 2019
… preventing industry creation.

As the information is always available from the tree ground type, unconditionally
update the map array for tree tiles.
@TrueBrain TrueBrain force-pushed the TrueBrain:backport_1.9 branch 2 times, most recently from 88010c4 to abd0026 Mar 24, 2019
TrueBrain added 2 commits Mar 24, 2019
…r, or with shift pressed."

This reverts commit b1e40b6.

This is a fix for a patch that will be reverted in the next commit.
This reverts commit 011257d.

This commit was not working properly. Attempts are made to fix it,
but so close to 1.9, it sounds a lot better to revert it from the
1.9 branch, and keep developing it further in 1.10.
@TrueBrain TrueBrain force-pushed the TrueBrain:backport_1.9 branch from abd0026 to 4c71207 Mar 24, 2019
@TrueBrain TrueBrain force-pushed the TrueBrain:backport_1.9 branch from 4c71207 to 1644223 Mar 24, 2019
@TrueBrain TrueBrain force-pushed the TrueBrain:backport_1.9 branch from 1644223 to 755d9d8 Mar 24, 2019
@TrueBrain TrueBrain merged commit 9ae1726 into OpenTTD:release/1.9 Mar 24, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20190324.30 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

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