Started by ACarlotti, May 06, 2018, 12:08:01 PM
0 Members and 1 Guest are viewing this topic.
Quote from: jamespetts on April 16, 2022, 05:47:09 PMfound that this reintroduces the scroll problem,
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?
QuoteHaving tested again, the latest version of this appears not to have the scroll problem any longer, so I have incorporated this.
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?
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.
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
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.
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.
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.
Quote from: (N)Ranran (Hibernating) on November 18, 2022, 01:16:57 PMPR#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.
Quote from: jamespetts on January 03, 2023, 10:40:12 PMThank you very much for this, and apologies for the delay in responding. Can I ask whether this has been tested for Ex-15 branch compatibility?
Quote from: (N)Ranran (Hibernating) on January 03, 2023, 11:17:50 PMThis change has already been merged into the new branch for ex15 and has been tested.
Quote from: neroden on April 28, 2023, 04:35:26 PMDoes someone have a summary of the current state of incorporation of changes from standard?Is the documentation/cherry-picked-commits.txt file relevant to this question?
QuoteA. Carlotti definitely got everything up to #7429
Quote from: neroden on May 02, 2023, 02:35:41 AMwith Phystam working up to 7753 or 8125
Quote from: ACarlotti on January 09, 2019, 11:04:07 PMThere's are several instances where, for no reason I can tell, you didn't incorporate a change accurately, resulting in a completely unnecessary difference from the standard codebase. There are some changes that you didn't transfer for some reason.
Quote from: ACarlotti on January 10, 2019, 07:36:14 AMI've pushed changes up to the beginning of January (including some bits that Phystam missed). Getting much further than that will take a little while because there are a lot of big commits in there.
Quote from: neroden on October 15, 2023, 04:56:18 AMBut how do I tell what SVN commit number matches to what Git commit? Is there an easy way to do this?
$ git log -n1 master | grep git-svn-id | grep -Poe "(?<=@)[0-9]+"10984
Quote from: neroden on October 15, 2023, 04:56:18 AMSo, I may have a chance this winter to work on cleaning this up and properly incorporating the commits from 7429 to 10444, which should be done before the source reorganization.The problem I have is this. I want to do this work properly using Git (specifically, actually using "git merge" and "git cherry-pick"). But how do I tell what SVN commit number matches to what Git commit? Is there an easy way to do this?