News:

Simutrans.com Portal
Our Simutrans site. You can find everything about Simutrans from here.

Incorporating changes from Standard

Started by ACarlotti, May 06, 2018, 12:08:01 PM

Previous topic - Next topic

0 Members and 1 Guest are viewing this topic.

jamespetts

Thank you for this. I have tested this, but found that this reintroduces the scroll problem, so have not incorporated this for the present.
Download Simutrans-Extended.

Want to help with development? See here for things to do for coding, and here for information on how to make graphics/objects.

Follow Simutrans-Extended on Facebook.

Ranran(Hibernating)

#456
Quote from: jamespetts on April 16, 2022, 05:47:09 PMfound that this reintroduces the scroll problem,
It's odd that this happens because it's not a revert-like change to something, and there are few changes. I think the cause is quite limited.
I also don't think I understand correctly what the "scroll problem" is. Can you elaborate?
(I searched this thread for "scroll" and found no explanation.)

Note that extended has now halfway merged in standard commits, as reported in another thread, which reduces mouse playability. I apologize for the inconvenience.
(´・ω・`)シミュトランスのアップデート履歴(日本語) (※更新停止中)
bit.ly/3AuKHHP

Ranran(Hibernating)

Pull request #525 adds a remove signal tool and translates some German variable names.

As already explained, I will basically not be doing this work anymore in the future, so anyone can take over this project.
The recently merged commits are listed in documentation / cherry-picked-commits.txt with reference to what OPRP is doing to make it easier to take over. please refer.
(´・ω・`)シミュトランスのアップデート履歴(日本語) (※更新停止中)
bit.ly/3AuKHHP

jamespetts

Apologies for the delay in response - the scroll problem was the problem described in another thread (I cannot immediately recall where) in which, in at least some cases (I could reproduce this on my Linux computer), scrolling a large game with slower performance resulted in very large sudden jumps in position, making it extremely difficult to move around the map or control one's position. This had been a problem for some time, but was fixed about a month ago, with one of your patches, I think. Pull request no. 530 reintroduced this problem.

Can I check whether pull request 530 is cumulative with 525, or whether the intention is that 525 be merged first?

In any event, thank you very much for the work that you have done to date on merging; it is a very large and difficult piece of work, and your dedication to this has greatly improved Simutrans-Extended.
Download Simutrans-Extended.

Want to help with development? See here for things to do for coding, and here for information on how to make graphics/objects.

Follow Simutrans-Extended on Facebook.

jamespetts

Having tested again, the latest version of this appears not to have the scroll problem any longer, so I have incorporated this. I should note, however, that I cannot find any remove signal tool - is this because the tool icon/definition has not yet been added to the configuration files?
Download Simutrans-Extended.

Want to help with development? See here for things to do for coding, and here for information on how to make graphics/objects.

Follow Simutrans-Extended on Facebook.

Ranran(Hibernating)

Quote from: jamespetts on May 01, 2022, 12:50:20 PMCan I check whether pull request 530 is cumulative with 525, or whether the intention is that 525 be merged first?
Those pull requests are independent.


QuoteHaving tested again, the latest version of this appears not to have the scroll problem any longer, so I have incorporated this.
PR#525 has nothing to do with the scroll problem.


QuoteI should note, however, that I cannot find any remove signal tool - is this because the tool icon/definition has not yet been added to the configuration files?
It is the same as the removal tool dedicated to rails and electrifications. So pakset should be prepared with an icon like for example signal with a bulldozer.


Quotescrolling a large game with slower performance resulted in very large sudden jumps in position, making it extremely difficult to move around the map or control one's position. This had been a problem for some time, but was fixed about a month ago, with one of your patches, I think. Pull request no. 530 reintroduced this problem.
I added a commit from standard to pull request #530. It looks like r10618 has improved performance. please confirm.
(´・ω・`)シミュトランスのアップデート履歴(日本語) (※更新停止中)
bit.ly/3AuKHHP

Ranran(Hibernating)

Pull request #570 incorporates minor changes from r10659 to 10719.

- Minor improvements to font setting UI by roboron
- Destruction tools ignore pedestrians. This could save Freddy from suffering.  ;)
- Fixed some UI bugs
- Fixed bug in tunnel graphics when changing terrain
- Fixed an issue where factories would sometimes not register as power plants as intended
(´・ω・`)シミュトランスのアップデート履歴(日本語) (※更新停止中)
bit.ly/3AuKHHP

jamespetts

Quote from: Ranran on September 17, 2022, 04:48:19 AMPull request #570 incorporates minor changes from r10659 to 10719.

- Minor improvements to font setting UI by roboron
- Destruction tools ignore pedestrians. This could save Freddy from suffering.  ;)
- Fixed some UI bugs
- Fixed bug in tunnel graphics when changing terrain
- Fixed an issue where factories would sometimes not register as power plants as intended
Thank you very much for this. Can I check whether this has been tested with the ex-15 branch for merge conflicts? I need to ensure that it merges properly with that branch before I can safely incorporate it into the master branch.
Download Simutrans-Extended.

Want to help with development? See here for things to do for coding, and here for information on how to make graphics/objects.

Follow Simutrans-Extended on Facebook.

Ranran(Hibernating)

The ex15 branch has had issues a few months ago, so I'd prefer to resolve those first before merging.
I can't test it because I've had problems with boot in the past.
(´・ω・`)シミュトランスのアップデート履歴(日本語) (※更新停止中)
bit.ly/3AuKHHP

jamespetts

Quote from: Ranran on October 23, 2022, 05:11:01 PMThe ex15 branch has had issues a few months ago, so I'd prefer to resolve those first before merging.
I can't test it because I've had problems with boot in the past.
Thank you for letting me know. I believe that I have now fixed this - I should be grateful if you could test the compatibility of integration with the ex-15 branch before I incorporate this into the master branch. Thank you.
Download Simutrans-Extended.

Want to help with development? See here for things to do for coding, and here for information on how to make graphics/objects.

Follow Simutrans-Extended on Facebook.

Ranran(Hibernating)

Quote from: jamespetts on October 31, 2022, 12:15:55 AMI should be grateful if you could test the compatibility of integration with the ex-15 branch before I incorporate this into the master branch.
I've confirmed that pull request #570 and #580 work fine with the ex15 branch.
PR#582 is a minor bug fix unrelated to ex15, so I think it's fine.
(´・ω・`)シミュトランスのアップデート履歴(日本語) (※更新停止中)
bit.ly/3AuKHHP

jamespetts

Quote from: Ranran on October 31, 2022, 12:19:15 PMI've confirmed that pull request #570 and #580 work fine with the ex15 branch.
PR#582 is a minor bug fix unrelated to ex15, so I think it's fine.
Excellent, thank you for that. I have now incorporated these. No. 580 did need some adjustment to the load/save versioning, however.
Download Simutrans-Extended.

Want to help with development? See here for things to do for coding, and here for information on how to make graphics/objects.

Follow Simutrans-Extended on Facebook.

Ranran(Hibernating)

PR#592 is a slight integration from standard. I'm taking a break from simutrans for a while, so I'll submit the commits I've completed so far.
(´・ω・`)シミュトランスのアップデート履歴(日本語) (※更新停止中)
bit.ly/3AuKHHP