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

Merge into upstream #1

Open
mjsir911 opened this issue May 17, 2019 · 3 comments
Open

Merge into upstream #1

mjsir911 opened this issue May 17, 2019 · 3 comments

Comments

@mjsir911
Copy link

Any plans to merge this into the main openttd repo? that would be pretty cool.

Thanks for all that you do!
@rsn8887
Copy link
Owner

rsn8887 commented Jul 3, 2019

Yes I tried to rebase upstream and make a PR, but they decided to remove libtimidity support in the upstream repo around March 2019, just after I forked. Libtimidity is needed for music on Switch. This causes a whole lot of merge errors.

I will try again soon.

@kevinfields777
Copy link

OpenTTD 1.11.0 just launched, might be a good time to jump back in and give it another shot. LOTS of updates and changes to make it faster.

@kevinfields777
Copy link

And FYI, OpenTTD 13 is going to be launching soon.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@rsn8887 @mjsir911 @kevinfields777