IRC logs for #openttd on OFTC at 2025-09-28
⏴ go to previous day
01:22:26 *** gelignite is now known as Guest27811
01:22:29 *** gelignite has joined #openttd
01:29:46 *** Guest27811 has quit IRC (Ping timeout: 480 seconds)
02:16:35 *** Wormnest has quit IRC (Quit: Leaving)
02:37:07 *** gnu_jj_ has joined #openttd
02:40:26 *** gnu_jj has quit IRC (Ping timeout: 480 seconds)
03:07:41 *** dh1 has quit IRC (Quit: My Mac has gone to sleep. ZZZzzz…)
03:36:36 *** Zathras_11 has joined #openttd
03:40:11 *** Zathras has quit IRC (Ping timeout: 480 seconds)
03:49:31 *** WormnestAndroid has quit IRC (Remote host closed the connection)
03:49:35 *** WormnestAndroid has joined #openttd
04:37:59 <DorpsGek> - Update: Translations from eints (by translators)
04:52:46 *** dh1 has quit IRC (Quit: My Mac has gone to sleep. ZZZzzz…)
05:15:15 *** dh1 has quit IRC (Remote host closed the connection)
06:05:09 *** dh1 has quit IRC (Quit: My Mac has gone to sleep. ZZZzzz…)
06:10:55 * andythenorth[d] deleting liveries to make them fit better here
06:11:03 <andythenorth[d]> deleting -> consolidating
06:19:52 *** dh1 has quit IRC (Ping timeout: 480 seconds)
06:40:09 <andythenorth[d]> maybe I should do something about badge sprites
06:42:56 *** dh1 has quit IRC (Ping timeout: 480 seconds)
07:00:46 *** dh1 has quit IRC (Ping timeout: 480 seconds)
07:23:46 *** dh1 has quit IRC (Ping timeout: 480 seconds)
07:43:41 *** dh1 has quit IRC (Ping timeout: 480 seconds)
08:09:38 <andythenorth[d]> Hmm…are my badge sprites still aligned wrong?
08:10:51 <peter1138> Yes. You literally only have to leave sprite offsets at 0,0.
08:13:09 <peter1138> Commented out code :o
08:16:25 <Rubidium> and for once it's actually commented out code and not someone using a semicolon in a sentence :D
08:21:32 <andythenorth[d]> Hmm looks like offsets are 0,0 so the issue is placement in the file
08:28:23 <peter1138> Generate 1x, 2x and 4x badges from SVG, did you say?
08:34:25 <andythenorth[d]> I could SVG my badge shape eh
08:38:04 <peter1138> Hmm, should I add on dynamic font loading, or keep it separate.
08:41:40 <rito12_51026> Will it also allow use of multiple fonts?
08:42:09 * rito12_51026 Why rebasing is so time consuming?
08:47:24 <Rubidium> rebasing isn't necessarily time consuming. If whatever your branch has is not impacted by the changes in master since you branched/last rebased, then it's done in milliseconds
08:50:11 <Rubidium> the problem arises when your branch and master since your last rebase both have changes. Then you need to manually tell/figure out what version to take. That usually means combining both changes in some manner, which means understanding why you made the change and why the change was made in master
08:50:37 <peter1138> Especially fun when you are doing it with someone elses code that you don't fully understand.
08:50:55 <reldred> hmm, I think with my next pay I'm definitely getting myself an e-scooter
08:51:19 <peter1138> Not legal here, sadly.
08:51:42 <reldred> yeah, I get why some cities hate them, a lot of riders are absolute pests
08:51:49 <Rubidium> now... the bigger your branch, the more of those conflicts you are going to get and the more time you're spending in conflict resolution. And to make matters worse, if later commits in your branch build upon that code, you have to do conflict resolution for that later commits as well.
08:52:00 <peter1138> It's not cities, laws are country-wide :)
08:52:03 <reldred> mind you i've had more issues with traditional cyclists than escooter riders here
08:52:49 <Rubidium> so... basically rebasing is something O(n^3)-ish
08:52:53 <reldred> but this is a city that's otherwise quite hostile to cyclists which probably explains why the few and the brave also have a stick up their arse.
08:53:13 <rito12_51026> peter1138: It really is fun
08:54:11 <Rubidium> peter1138: as far as I can tell owning an e-scooter isn't illegal in the UK. It's just using it in public places that is
08:55:27 <reldred> here you can use them anywhere marked for cyclists, and any pedestrian areas not marked as strictly no cycles/scooters, but around pedestrians you have to do under 20kmh, except none of them have a speedo so that's basically just a license for the cops to beat snot out of anyone being a jackass.
08:55:51 <kuhnovic> In NL the first street legal e-scooter was released. It might be legal in the UK too, not sure.
08:56:12 <peter1138> There are e-scooters for hire in my town, but it's 20p/minute. Which of course leads to people going at max speed everywhere.
08:56:34 <reldred> yeah they're quite expensive here, cost me 40 something dolars for just over an hour
08:57:30 <reldred> i will get a proper e-mtb at some point as i do want to get back into trails riding, but just for nipping around the city the scooter is fun
08:57:30 <kuhnovic> In Oslo they banned them because of the amount of people faceplanting with them while drunk.
08:57:38 <reldred> and riding around the botanic gardens
08:57:54 <kuhnovic> I guess tram tracks, hills and alcohol isn't such a great combination
08:58:00 <dwfreed> We have Lime scooters here; I don't know what the time-based rates are, though. Used to have really cost-effective day passes, but they got rid of those
08:58:43 <reldred> Yeah it’s lime and neuron and a few other operators here
08:58:59 <reldred> Lime is partnered with uber so that’s probably why it’s so expensive
08:59:33 <reldred> But it’s a fun way to commute to the office on the few times I have to go in
09:00:01 <reldred> But I do wanna buy my own soonish
09:04:03 *** gelignite has joined #openttd
09:11:42 *** dh1 has quit IRC (Quit: My Mac has gone to sleep. ZZZzzz…)
09:13:38 <peter1138> Yeah, if they're legal to ride your own that's a much better bet.
09:14:32 <peter1138> Plenty people do ride illegally of course, until they're stopped and it's confiscated and crushed.
09:31:47 <reldred> Yeah the operators came into Australia originally when they were illegal, did the usual uber route of begging forgiveness rather than asking permission, they got licenses to operate but private ownership was still illegal in most cities, now it’s legal in most.
09:33:42 *** dh1 has quit IRC (Ping timeout: 480 seconds)
09:49:07 *** lobstaroooo has joined #openttd
09:49:46 *** dh1 has quit IRC (Ping timeout: 480 seconds)
09:56:49 <peter1138> Right, what badges were missing?
10:00:31 <Rubidium> the 1.75x zoom ones?
10:04:46 *** dh1 has quit IRC (Ping timeout: 480 seconds)
10:27:20 <andythenorth[d]> Stunningly useless comments there 🙃
10:41:46 *** dh1 has quit IRC (Ping timeout: 480 seconds)
10:41:55 <peter1138> Rubidium, my fractional sprites patch does also support non-powers-of-two sprites in GRF files, but... :)
10:43:33 <peter1138> And with SVG sprite support, that can be automatic, but sadly SVG doesn't really allow much detail.
10:50:51 *** dh1 has quit IRC (Ping timeout: 480 seconds)
10:59:45 <peter1138> Should collapseable trees (groups and variants) state be remembered in savegames?
11:00:22 <reldred> meh, probably not worth the effort
11:01:23 <peter1138> That's why it's not done. Without special effort it wouldn't working multiplayer.
11:13:21 *** dh1 has quit IRC (Ping timeout: 480 seconds)
11:21:48 <andythenorth[d]> could collapseable trees have 'ctrl-click to expand all' though?
11:30:05 <peter1138> I have a patch for that.
11:31:08 <peter1138> Rebased through 330 commits and 1300 to go??? Are you rebasing incrementally for each commit to master!?
11:34:42 <michi_cc> Personally for these large jumps I usually don't actually rebase, but cherry-pick the old commits. Much easier to keep track that way I find.
11:38:03 <peter1138> Hmm, I want to simplify Rect's CentreTo. In all cases so that we only need to centre vertically, so needing to pass the current width is a pain.
11:38:16 <peter1138> I can add new methods, or just change the existing one.
11:38:41 *** dh1 has quit IRC (Ping timeout: 480 seconds)
11:42:37 <peter1138> Hmm, they won't be used, until they're used, so clean up it is.
11:42:41 <locosage> oh, I was wondering what's the good way to not merge everything at once just yesterday
11:43:31 <peter1138> Plenty of ways, e.g. create a new branch and rebase just that.
11:48:06 <locosage> if I understand it right with rebase my commits are going to stay on top and I want them chronologically
11:50:01 <peter1138> Yeah, if you don't want your commits to be rebased then don't rebase :)
11:50:59 <andythenorth[d]> cherrypick is an easy tool to understand
11:51:28 <andythenorth[d]> I've done 100+ commit reworks, via both cherrypick and rebase
11:51:41 <andythenorth[d]> cherrypick has less uncertainty IMHO
11:55:49 <locosage> do you cherry pick them one-by-one or in batches?
11:56:35 <andythenorth[d]> I do one by one usually
11:57:23 <andythenorth[d]> if you're batching significantly, it's closer to using rebase 🤷
11:57:42 <locosage> yeah, but I'll need some tool then
11:57:51 <locosage> no way I'm picking thousands of commits manually
11:59:06 *** dh1 has quit IRC (Ping timeout: 480 seconds)
11:59:24 <locosage> I'm surprised git seem to have no built-in way to do that actually
12:00:01 <locosage> just cherry-pick until the conflict
12:00:35 <_jgr_> That is pretty much what git rebase is
12:00:50 <peter1138> Without knowing what you're trying to achieve, I'm not sure rebase or cherry-pick chronologically is intended to achieve.
12:01:31 <locosage> I just don't fell like having my 10 year old commits on top of recent changes I'm merging is the good way
12:02:03 <_jgr_> What is wrong with just having merge commit(s)?
12:02:10 <peter1138> If you don't want your commits on top, then I would have thought that merging is the correct way to go.
12:03:11 <peter1138> I assume _jgr_ has prior experience :D
12:03:14 <locosage> yeah, I never said I want rebase ;p I'm just looking for a good way to not merge commits one-by-one
12:04:30 <locosage> since with plain merge I'm dealing with changes from hundreds of commits without any context
12:05:10 <peter1138> The context is in the branch you're merging from, no?
12:05:36 <_jgr_> I generally merge upstream commits a handful at a time (1 to 20, depending)
12:06:00 <_jgr_> Then I've got some non-standard tooling for merging/re-ordering these merges together
12:08:05 <locosage> I'm merging openttd release branches/tags so not much context there :p
12:11:14 <locosage> and merging upstream constantly will make it unplayable on release servers
12:11:22 <locosage> guess I'll just have to make some tooling too
12:12:21 <peter1138> Wait, what compatibility is your client up to at the moment?
12:12:58 <locosage> I try to keep up with betas or wdym?
12:13:20 <peter1138> I mean specifically.
12:13:38 <locosage> I have two branches atm, 14.1 and beta3
12:14:14 <peter1138> Okay, so if they are up to date with 14.1 and beta3 then there shouldn't be any more merges to do, until the next release.
12:14:43 <locosage> well, yeah, but I'm thinking of how to do it better next time
12:15:00 <locosage> because I don't like the way I'm doing it rn
12:16:27 <locosage> btw, cursor was immensely helpful figuring out the error with settings macro mess
12:16:53 <locosage> since nothing gcc gives is actually helpful
12:32:38 <peter1138> Well, if you want to replace the macro system with something nicer...
12:36:46 *** dh1 has quit IRC (Ping timeout: 480 seconds)
12:40:54 <locosage> if I do that it's highly likely be bikeshedded to death in the review 😜
13:06:11 <andythenorth[d]> you know, sometimes I think the AI slop might be preferable 😛
13:06:24 <andythenorth[d]> more easily ignored
13:17:31 *** dh1 has quit IRC (Ping timeout: 480 seconds)
13:31:11 <talltyler> Ah, I love old internet, "Add foe" is so much cooler than "Ignore" 😛
13:57:41 *** dh1 has quit IRC (Ping timeout: 480 seconds)
14:21:17 *** WormnestAndroid has quit IRC (Remote host closed the connection)
14:21:17 *** gelignite has quit IRC (Read error: Connection reset by peer)
14:21:19 *** WormnestAndroid has joined #openttd
14:27:44 *** gelignite has joined #openttd
15:26:58 *** Wormnest has joined #openttd
15:37:41 *** dh1 has quit IRC (Ping timeout: 480 seconds)
15:46:16 <locosage> hm, if I use cherry-pick it will change commit hashes, wonder if that's gonna cause problems later
15:51:09 <locosage> maybe I can do merge after rebase to "pin" new commits in history...
15:58:21 *** dh1 has quit IRC (Ping timeout: 480 seconds)
16:08:53 <peter1138> Of course it will, it's a different commit.
16:13:15 <andythenorth[d]> this is more information, than question
16:14:06 <peter1138> andythenorth[d], have you figured out branches and merges yet?
16:14:28 <andythenorth[d]> have I though?
16:14:45 <andythenorth[d]> we have a work-based workflow that's just yolo branch merge
16:15:07 <andythenorth[d]> and something in the git config that enables or bans merge commits (can't remember which)
16:15:39 <andythenorth[d]> I don't write work code any more, about which I am very pleased
16:16:08 <jessicathegunlady> freed from the code mines
16:16:53 <andythenorth[d]> the robots do it probably
17:12:01 <andythenorth[d]> mostly livery badges though
17:27:26 *** dh1 has quit IRC (Ping timeout: 480 seconds)
17:46:26 *** mwmoriarty has quit IRC (Quit: User went offline on Discord a while ago)
17:47:26 *** dh1 has quit IRC (Ping timeout: 480 seconds)
18:03:50 *** lobster has quit IRC (Read error: Connection reset by peer)
18:04:27 *** lobster has joined #openttd
19:04:56 *** dh1 has quit IRC (Ping timeout: 480 seconds)
19:13:31 <peter1138> I failed to take advantage of my local's less than £4 a pint week. Unless I go there now. Hmm...
19:14:05 <andythenorth[d]> is it a Wetherspoons?
19:15:00 <jfkuayue> I always cannot figure out the way wetherspoons work
19:15:33 <peter1138> No, I cannot stand Wetherspoons.
19:15:33 <jfkuayue> Pubs have their own name and also a wetherspoons name
19:16:00 <jfkuayue> But it is not “Delta, a SkyTeam airline”
19:16:17 <peter1138> Of course not, it's a pub.
19:17:23 <andythenorth[d]> and a it has a name
19:18:09 <andythenorth[d]> named instances
19:18:32 <andythenorth[d]> what's confusing?
19:18:35 <andythenorth[d]> genuine question
19:18:41 <andythenorth[d]> there are many pub chains
19:18:49 <andythenorth[d]> the chain has a name, the pub has a name
19:23:51 *** dh1 has quit IRC (Ping timeout: 480 seconds)
19:24:13 <jfkuayue> Some pubs are in a building seemingly too old for a chain
19:25:23 <jfkuayue> Okay I found the reason, they are converting old building into pubs
19:26:48 <peter1138> Wait... are you confused by the idea of a chain taking over a place that already existed?
19:27:25 <jfkuayue> I become less confused
19:27:50 <jfkuayue> But I’m still confused by why those pubs have “inn” as their names
19:27:58 <kuhnovic> A £4 pint might help
19:28:14 <peter1138> Some pubs are inns, and some inns are pubs.
19:28:15 <jfkuayue> Drunk, unable to get home, sleep there?
19:33:53 <andythenorth[d]> which is a restaurant
19:36:27 <andythenorth[d]> so I should crop these badges tighter vertically?
19:36:31 <andythenorth[d]> or SVG them 😛
19:43:52 *** dh1 has quit IRC (Ping timeout: 480 seconds)
20:05:26 *** dh1 has quit IRC (Ping timeout: 480 seconds)
21:06:06 *** tokai|noir has joined #openttd
21:06:06 *** ChanServ sets mode: +v tokai|noir
21:13:04 *** tokai has quit IRC (Ping timeout: 480 seconds)
21:30:41 *** keikoz has quit IRC (Ping timeout: 480 seconds)
21:30:51 *** Wolf01 has quit IRC (Quit: Once again the world is quick to bury me.)
21:37:45 <peter1138> 5 files changed, 148 insertions(+), 91 deletions(-)
21:37:56 <peter1138> Well, that's a de-duplication failure :(
23:27:12 *** Smedles has quit IRC (Read error: Connection reset by peer)
23:28:02 *** Smedles has joined #openttd
23:50:19 *** Flygon has quit IRC (Remote host closed the connection)
continue to next day ⏵
