The International Simutrans Forum

 

Author Topic: Incorporating changes from Standard  (Read 32213 times)

0 Members and 1 Guest are viewing this topic.

Offline Ranran

  • Devotee
  • *
  • Posts: 1701
  • 今日は兎汁よー
  • Languages: ja
Re: Incorporating changes from Standard
« Reply #385 on: June 29, 2021, 10:38:36 AM »
I have broken down the merge from the standard branch into multiple parts. I think the basic behavior has already been checked in the previous compiled patch.
Incorporate them in order and check the behivior especially in the network game.
If a problem occurs, it will be easier to identify than before. Also some suspicious commits have been skipped. It may be checked at the end. Or it is left to someone who is familiar with it.

It is divided according to the content to some extent. The following branches are currently completed: Please incorporate them in numerical order.


Pull request #402  :done:
https://github.com/Ranran-the-JuicyPork/simutrans-extended/tree/std-r9637
The main focus is on minor GUI modifications such as adjusting the font color of the theme. The revision number is incremented to 41.

Pull request #405  :done:
https://github.com/Ranran-the-JuicyPork/simutrans-extended/tree/std-r9650
The focus is on standard's changes up to r9713. There is no change to gameplay other than the convoy list supporting saving.

Pull request #407  :done:
https://github.com/Ranran-the-JuicyPork/simutrans-extended/commits/std-r9714-new-sort-button
Changes centered around the new sort button. The corresponding GUI such as the list dialog is updated.

Pull request #410  :done:
https://github.com/Ranran-the-JuicyPork/simutrans-extended/commits/std-r9757
Standard code changes and GUI minor modifications.

Pull request #411  :done:
https://github.com/Ranran-the-JuicyPork/simutrans-extended/tree/std-r9796-toolbar-position
The focus is on changes related to standard's toolbar position patch.
The revision number is incremented to 42.

Pull request #412  :done:
std-r9808-
The list dialog is saved. A text search is added to some list dialogs.

Pull request #414   :done:
std-r9851
Commits from r9851 to r9918. This is the last of this series of patches. It has progressed to July 2021.


These branches are not completely contiguous, so merging only the last branch will result in missing commits. You need to merge them one by one in order.
The rest will be added as soon as they are ready for merging.
« Last Edit: August 03, 2021, 10:54:50 PM by Ranran »

Offline freddyhayward

  • Devotee
  • *
  • Posts: 692
  • Languages: EN
Re: Incorporating changes from Standard
« Reply #386 on: July 01, 2021, 06:23:36 AM »
I have now done a little further testing and incorporated this into the master branch - this will be available from to-morrow's nightly build.
What sorts of testing did you conduct? I was busy that week and didn't have time to test it.

Offline Ranran

  • Devotee
  • *
  • Posts: 1701
  • 今日は兎汁よー
  • Languages: ja
Re: Incorporating changes from Standard
« Reply #387 on: July 12, 2021, 09:48:16 AM »
I made a pull request (#410) for next incorporating from standard branch, but to make it easier to figure out what's wrong, do it only after the server is stable. On the other hand, PR#409 can be an important fix.

Offline jamespetts

  • Simutrans-Extended project coordinator
  • Administrator
  • *
  • Posts: 20949
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Re: Incorporating changes from Standard
« Reply #388 on: July 18, 2021, 10:56:49 AM »
Thank you for this. I have incorporated both pull requests - I suspect that the server stability issues are unrelated to this, but related to a matter reported elsewhere.

Offline Ranran

  • Devotee
  • *
  • Posts: 1701
  • 今日は兎汁よー
  • Languages: ja
Re: Incorporating changes from Standard
« Reply #389 on: August 03, 2021, 10:51:48 PM »
Pull request #416 subdivides the bloated simvehicle.
However, the separation of vehicle_base_t (r9450) has postponed because it was not easy for me because of the difference from standard... (´・ω・`)

Offline jamespetts

  • Simutrans-Extended project coordinator
  • Administrator
  • *
  • Posts: 20949
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Re: Incorporating changes from Standard
« Reply #390 on: August 03, 2021, 11:15:35 PM »
Pull request #416 subdivides the bloated simvehicle.
However, the separation of vehicle_base_t (r9450) has postponed because it was not easy for me because of the difference from standard... (´・ω・`)

Thank you for your work on this. Can I check before I merge this whether this causes any major compatibility problems with the vehicle-management-new branch? Such a major refactor could be problematic in this respect. Although I have not had a chance to work on this branch in quite some time, this is still something that needs to be done at some point.

Offline Ranran

  • Devotee
  • *
  • Posts: 1701
  • 今日は兎汁よー
  • Languages: ja
Re: Incorporating changes from Standard
« Reply #391 on: August 03, 2021, 11:36:49 PM »
Can I check before I merge this whether this causes any major compatibility problems with the vehicle-management-new branch?
I think it probably matches the content of this thread,
from there earlier this year there is my branch with many modifications to the schedule UI.
I don't think this branch will cause any major problems as it has been successful in resolving conflicts with master until it recently had problems major merging from standards. (At least until the end of May. )
But since redo the merging, I need to check it again from there.

The r9450 branch just moved the contents of the simvehicle.cc/.h by way type. Therefore, the contents of the function have not changed.

EDIT:
When the separation was complete, I modified some formats compared to the standard code. (This is intended to reduce the possibility of conflicts when merging from standards.) But I don't think that will affect the merging of 15.0 branches so much. Probably the conflicts that occur are equivalent for all previous commits.
« Last Edit: August 04, 2021, 03:58:12 AM by Ranran »

Offline jamespetts

  • Simutrans-Extended project coordinator
  • Administrator
  • *
  • Posts: 20949
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Re: Incorporating changes from Standard
« Reply #392 on: August 04, 2021, 10:10:06 AM »
Thank you for your reply. The concern is not so much whether the function has changed but, if things that have been altered significantly in the 15.x branches have been broken up into different files, automatic merging will fail, and there will be an extremely large amount of very difficult work involved in manually re-merging all of the changes. Can I check whether you have tested merging in the vehicle-management-new branch to see whether this can be done without much difficulty?

Offline Ranran

  • Devotee
  • *
  • Posts: 1701
  • 今日は兎汁よー
  • Languages: ja
Re: Incorporating changes from Standard
« Reply #393 on: August 04, 2021, 10:48:22 PM »
https://github.com/Ranran-the-JuicyPork/simutrans-extended/tree/ex15-dismantled-simvehicle
I succeeded in merging the dismantled simvehicle branch to the 15.x branch that I was updating the GUI.
The difference between them was small.

Offline jamespetts

  • Simutrans-Extended project coordinator
  • Administrator
  • *
  • Posts: 20949
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Re: Incorporating changes from Standard
« Reply #394 on: August 06, 2021, 11:16:49 AM »
https://github.com/Ranran-the-JuicyPork/simutrans-extended/tree/ex15-dismantled-simvehicle
I succeeded in merging the dismantled simvehicle branch to the 15.x branch that I was updating the GUI.
The difference between them was small.

Thank you for this: this is most helpful.

I have pulled these changes into a testing branch, which I have pushed, using your branch name of std-r9450-tidyup-simvehicle. However, unfortunately, testing shows a problem with this: a client cannot stay in sync with a network server. I have tested this by launching two instances of this build, one running the current game from the Bridgewater-Brunel server (January 1785) and the other connecting to it as a client using the loopback interface (127.0.0.1). The client loses synchronisation immediately upon connexion to the server.

Offline Ranran

  • Devotee
  • *
  • Posts: 1701
  • 今日は兎汁よー
  • Languages: ja
Re: Incorporating changes from Standard
« Reply #395 on: August 06, 2021, 07:44:18 PM »
I have pulled these changes into a testing branch, which I have pushed, using your branch name of std-r9450-tidyup-simvehicle. However, unfortunately, testing shows a problem with this: a client cannot stay in sync with a network server. I have tested this by launching two instances of this build, one running the current game from the Bridgewater-Brunel server (January 1785) and the other connecting to it as a client using the loopback interface (127.0.0.1). The client loses synchronisation immediately upon connexion to the server.
Thank you for confirmation.
Could you check if it happens even if revert the commit cf15286ac7cc52ef4ec10efca53433e0a8fa7dc8?
I suspect that the checklist_t separation is most related to desync. This has nothing to do with dismantling the simvehicle, but it's in the same branch.

Offline jamespetts

  • Simutrans-Extended project coordinator
  • Administrator
  • *
  • Posts: 20949
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Re: Incorporating changes from Standard
« Reply #396 on: August 08, 2021, 09:57:56 AM »
Thank you for confirmation.
Could you check if it happens even if revert the commit cf15286ac7cc52ef4ec10efca53433e0a8fa7dc8?
I suspect that the checklist_t separation is most related to desync. This has nothing to do with dismantling the simvehicle, but it's in the same branch.

Thank you for this. May I ask whether there is a particular pull request to which this relates? I see that you have issued quite a number recently.

Offline Ranran

  • Devotee
  • *
  • Posts: 1701
  • 今日は兎汁よー
  • Languages: ja
Re: Incorporating changes from Standard
« Reply #397 on: August 08, 2021, 05:30:03 PM »
May I ask whether there is a particular pull request to which this relates?
No, there are no pull requests related to this. But at my branch the commit cf15286 was reverted.

Offline jamespetts

  • Simutrans-Extended project coordinator
  • Administrator
  • *
  • Posts: 20949
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Re: Incorporating changes from Standard
« Reply #398 on: August 08, 2021, 08:50:27 PM »
No, there are no pull requests related to this. But at my branch the commit cf15286 was reverted.


Thank you. Unfortunately, attempting to merge this results in compile errors as this code is not compatible with some of the other UI changes that I have merged in to-day. Would you be able to update this to work with the latest master? Thank you.

Offline Ranran

  • Devotee
  • *
  • Posts: 1701
  • 今日は兎汁よー
  • Languages: ja
Re: Incorporating changes from Standard
« Reply #399 on: August 09, 2021, 11:11:01 PM »
Would you be able to update this to work with the latest master?
I think the conflict has been resolved.

Apart from that, pull request #424 has some small fixes. (r9982-9997)

Tab header size is a cramped issue.
Fix overlay display position. This is required for the signal indicator patch.

EDIT:
Add the option button on the banner by roboron

EDIT2:
Fixed city info dialog with strange vertical even expansion and contraction
« Last Edit: August 10, 2021, 05:09:54 AM by Ranran »

Offline jamespetts

  • Simutrans-Extended project coordinator
  • Administrator
  • *
  • Posts: 20949
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Re: Incorporating changes from Standard
« Reply #400 on: August 11, 2021, 06:57:25 PM »
Excellent - now incorporated. Thank you. Testing confirms that this can stay in sync with a server/client pair on the current Bridgewater-Brunel saved game, so the earlier problem has evidently been resolved.

Offline Ranran

  • Devotee
  • *
  • Posts: 1701
  • 今日は兎汁よー
  • Languages: ja
Re: Incorporating changes from Standard
« Reply #401 on: August 18, 2021, 11:35:16 AM »
I couldn't playtest because I was busy watching Evangelion last weekend, but I think this bug and this bug have been fixed. (´・ω・`)
Check pull request #428.

Offline jamespetts

  • Simutrans-Extended project coordinator
  • Administrator
  • *
  • Posts: 20949
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Re: Incorporating changes from Standard
« Reply #402 on: August 21, 2021, 10:05:14 AM »
I couldn't playtest because I was busy watching Evangelion last weekend, but I think this bug and this bug have been fixed. (´・ω・`)
Check pull request #428.



Now incorporated - thank you.

Offline Ranran

  • Devotee
  • *
  • Posts: 1701
  • 今日は兎汁よー
  • Languages: ja
Re: Incorporating changes from Standard
« Reply #403 on: November 06, 2021, 02:54:43 PM »
I found some places where I was passing a color index even though the argument was PIXVAL, so the fix is included in pull request #457.
Also, when I changed the vehicle bar legend in the depot dialog to a new GUI component format drawing, it was wrong, so I fixed it.

Offline Ranran

  • Devotee
  • *
  • Posts: 1701
  • 今日は兎汁よー
  • Languages: ja
Re: Incorporating changes from Standard
« Reply #404 on: November 07, 2021, 03:40:46 PM »
Pull request #458 is a set of small fixes up to r10164.

Offline jamespetts

  • Simutrans-Extended project coordinator
  • Administrator
  • *
  • Posts: 20949
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Re: Incorporating changes from Standard
« Reply #405 on: November 16, 2021, 11:35:50 PM »
Excellent, thank you: now incorporated.

Offline Ranran

  • Devotee
  • *
  • Posts: 1701
  • 今日は兎汁よー
  • Languages: ja
Re: Incorporating changes from Standard
« Reply #406 on: November 24, 2021, 04:21:42 AM »
Pull request #461 is some commits from the standard from r10136 to 10244. The contents are bug fixes and code changes.
This is mostly recent. However, I do not get the commitments (e.g., finger operation) to make it work on Android.

In addition, it was pointed out that Extended does not have Chinese fonts by default and Chinese is not available. Therefore, a Chinese font has been added.
« Last Edit: November 24, 2021, 04:39:38 AM by Ranran »