Times are UTC Toggle Colours
00:06:32 *** crem3 has joined #openttd 00:06:32 *** crem2 has quit IRC 00:29:10 *** glx has quit IRC 00:59:24 *** Flygon has joined #openttd 01:24:28 *** Supercheese has quit IRC 01:43:05 *** haudrauf has quit IRC 02:07:31 *** Samu_ has quit IRC 02:09:56 *** HerzogDeXtEr has quit IRC 02:27:24 *** wodencafe has quit IRC 02:33:04 *** haudrauf has joined #openttd 02:41:30 *** haudrauf has quit IRC 02:42:31 *** haudrauf has joined #openttd 03:23:21 <DorpsGek_II> [OpenTTD/OpenTTD] thexa4 opened pull request #6905: Fix #6622: Fixes empty company name in news when gamescript constructs a town https://github.com/OpenTTD/OpenTTD/pull/6905 03:34:20 *** wodencafe has joined #openttd 03:48:05 *** haudrauf has quit IRC 03:51:58 *** haudrauf has joined #openttd 04:18:37 *** snail_UES_ has joined #openttd 06:00:41 <DorpsGek_II> [OpenTTD/OpenTTD] Hemaolle opened pull request #6906: Fix #6742: Only possible to build station next to competitor by using CTRL+click https://github.com/OpenTTD/OpenTTD/pull/6906 06:40:46 *** sla_ro|master has joined #openttd 06:47:13 *** nielsm has joined #openttd 06:52:34 <DorpsGek_II> [OpenTTD/OpenTTD] LordAro commented on pull request #6906: Fix #6742: Only possible to build station next to competitor by using CTRL+click https://github.com/OpenTTD/OpenTTD/pull/6906#issuecomment-421711206 06:54:08 <DorpsGek_II> [OpenTTD/OpenTTD] LordAro commented on pull request #6906: Fix #6742: Only possible to build station next to competitor by using CTRL+click https://github.com/OpenTTD/OpenTTD/pull/6906#issuecomment-421711405 07:01:46 *** tokai has joined #openttd 07:01:46 *** ChanServ sets mode: +v tokai 07:08:25 *** tokai|noir has quit IRC 07:09:09 *** Progman has joined #openttd 07:12:27 <DorpsGek_II> [OpenTTD/OpenTTD] George-VB opened issue #6907: Cargo capacity should be recalculated on TRIGGER_VEHICLE_NEW_LOAD https://github.com/OpenTTD/OpenTTD/issues/6907 07:16:49 <DorpsGek_II> [OpenTTD/OpenTTD] George-VB commented on issue #6907: Cargo capacity should be recalculated on TRIGGER_VEHICLE_NEW_LOAD https://github.com/OpenTTD/OpenTTD/issues/6907#issuecomment-421714164 07:17:13 *** andythenorth has joined #openttd 07:19:07 *** srhnsn has joined #openttd 07:24:18 <andythenorth> moin 07:29:45 *** gelignite has joined #openttd 07:41:05 *** Gja has joined #openttd 07:42:22 *** Gja has quit IRC 07:45:24 <DorpsGek_II> [OpenTTD/OpenTTD] George-VB opened issue #6908: Request: Persistent storage for vehicles https://github.com/OpenTTD/OpenTTD/issues/6908 07:47:44 <DorpsGek_II> [OpenTTD/OpenTTD] George-VB commented on issue #6908: Request: Persistent storage for vehicles https://github.com/OpenTTD/OpenTTD/issues/6908#issuecomment-421718140 08:10:18 <andythenorth> oof I have introduced an odd bug to Iron Horse 08:10:29 <andythenorth> some vehicles have their props zeroed 08:10:53 <andythenorth> and the cargo refit list has '(undefined string)' appended to the end of it 08:11:53 <DorpsGek_II> [OpenTTD/OpenTTD] sj26 opened pull request #6909: Add BACKSPACE as a mappable hotkey https://github.com/OpenTTD/OpenTTD/pull/6909 08:13:24 <DorpsGek_II> [OpenTTD/OpenTTD] Hemaolle commented on pull request #6906: Fix #6742: Only possible to build station next to competitor by using CTRL+click https://github.com/OpenTTD/OpenTTD/pull/6906#issuecomment-421721309 08:14:11 <DorpsGek_II> [OpenTTD/OpenTTD] George-VB commented on issue #6907: Cargo capacity should be recalculated on TRIGGER_VEHICLE_NEW_LOAD https://github.com/OpenTTD/OpenTTD/issues/6907#issuecomment-421721393 08:14:34 <DorpsGek_II> [OpenTTD/OpenTTD] Hemaolle commented on pull request #6906: Fix #6742: Only possible to build station next to competitor by using CTRL+click https://github.com/OpenTTD/OpenTTD/pull/6906#issuecomment-421721441 08:14:38 <DorpsGek_II> [OpenTTD/OpenTTD] andythenorth commented on pull request #6909: Add BACKSPACE as a mappable hotkey https://github.com/OpenTTD/OpenTTD/pull/6909#issuecomment-421721448 08:15:35 <DorpsGek_II> [OpenTTD/OpenTTD] sj26 updated pull request #6909: Add BACKSPACE as a mappable hotkey https://github.com/OpenTTD/OpenTTD/pull/6909 08:16:29 <DorpsGek_II> [OpenTTD/OpenTTD] sj26 commented on pull request #6909: Add BACKSPACE as a mappable hotkey https://github.com/OpenTTD/OpenTTD/pull/6909#issuecomment-421721662 08:17:57 <LordAro> where did all that come from 08:19:23 <andythenorth> clearly 08:19:31 <andythenorth> it's the start of academic year or something 08:19:33 <andythenorth> or end of holidays 08:20:07 <DorpsGek_II> [OpenTTD/OpenTTD] LordAro commented on pull request #6906: Fix #6742: Only possible to build station next to competitor by using CTRL+click https://github.com/OpenTTD/OpenTTD/pull/6906#issuecomment-421722104 08:20:47 *** snail_UES_ has quit IRC 08:21:19 <andythenorth> oof 08:21:24 <andythenorth> hello bisect my old friend :( 08:21:30 <andythenorth> I've come to find the bug again 08:25:20 <LordAro> :D 08:29:24 <DorpsGek_II> [OpenTTD/OpenTTD] Hemaolle commented on pull request #6906: Fix #6742: Only possible to build station next to competitor by using CTRL+click https://github.com/OpenTTD/OpenTTD/pull/6906#issuecomment-421723345 08:30:40 <DorpsGek_II> [OpenTTD/OpenTTD] LordAro commented on pull request #6906: Fix #6742: Only possible to build station next to competitor by using CTRL+click https://github.com/OpenTTD/OpenTTD/pull/6906#issuecomment-421723531 08:31:59 <andythenorth> :D 08:41:57 <andythenorth> found the broken rev, but not the cause :P 08:42:19 *** sla_ro|master has quit IRC 08:49:00 <andythenorth> oof 08:49:14 <andythenorth> I thought nml switches could rely on only having a default result these days :P 08:49:17 <andythenorth> apparently not 08:49:20 <andythenorth> fails silently 08:57:39 *** kurt1 has quit IRC 09:06:23 <DorpsGek_II> [OpenTTD/OpenTTD] Hemaolle updated pull request #6906: Fix #6742: Only possible to build station next to competitor by using CTRL+click https://github.com/OpenTTD/OpenTTD/pull/6906 09:07:11 *** andythenorth has quit IRC 09:07:18 <LordAro> i wonder about the usefulness of the "needs review" label 09:07:31 <LordAro> given github already reports review status 09:09:00 <DorpsGek_II> [OpenTTD/OpenTTD] Hemaolle updated pull request #6906: Fix #6742: Only possible to build station next to competitor by using CTRL+click https://github.com/OpenTTD/OpenTTD/pull/6906 09:11:26 <DorpsGek_II> [OpenTTD/OpenTTD] Hemaolle updated pull request #6906: Fix #6742: Only possible to build station next to competitor by using CTRL+click https://github.com/OpenTTD/OpenTTD/pull/6906 09:13:02 <DorpsGek_II> [OpenTTD/OpenTTD] Hemaolle updated pull request #6906: Fix #6742: Only possible to build station next to competitor by using CTRL+click https://github.com/OpenTTD/OpenTTD/pull/6906 09:13:36 *** Stimrol has quit IRC 09:15:26 <DorpsGek_II> [OpenTTD/OpenTTD] Hemaolle commented on pull request #6906: Fix #6742: Only possible to build station next to competitor by using CTRL+click https://github.com/OpenTTD/OpenTTD/pull/6906#issuecomment-421729478 09:20:34 *** Stimrol has joined #openttd 09:22:30 *** Wolf01 has joined #openttd 09:23:02 <Wolf01> o/ 09:32:32 <DorpsGek_II> [OpenTTD/DorpsGek-irc] LordAro opened issue #6: No message for reviews https://github.com/OpenTTD/DorpsGek-irc/issues/6 09:36:27 <DorpsGek_II> [OpenTTD/OpenTTD] sj26 merged pull request #6909: Add BACKSPACE as a mappable hotkey https://github.com/OpenTTD/OpenTTD/pull/6909 09:36:27 <DorpsGek_II> [OpenTTD/OpenTTD] michicc pushed 1 commits to master: 09:36:27 <DorpsGek_II> - Add: BACKSPACE can be mapped as a hotkey (by sj26) 09:36:28 <DorpsGek_II> https://github.com/OpenTTD/OpenTTD/commit/1a73c3983863 09:42:54 <DorpsGek_II> [OpenTTD/DorpsGek-irc] LordAro opened issue #7: PRQ merge messages are duplicated https://github.com/OpenTTD/DorpsGek-irc/issues/7 10:00:26 *** Wacko1976 has joined #openttd 10:09:50 *** gelignite has quit IRC 10:46:21 *** HerzogDeXtEr has joined #openttd 11:00:07 *** gelignite has joined #openttd 11:06:16 *** sla_ro|master has joined #openttd 11:17:37 *** Samu has joined #openttd 11:46:22 *** frosch123 has joined #openttd 12:01:47 <Samu> why is restart from savegames not starting as it started before the savegame? 12:02:39 <Samu> gonna be hard to reproduce a bug 12:09:45 <DorpsGek_II> [OpenTTD/OpenTTD] Hemaolle updated pull request #6906: Fix #6742: Only possible to build station next to competitor by using CTRL+click https://github.com/OpenTTD/OpenTTD/pull/6906 12:26:51 <Samu> something happening with AI settings I can't quite explain 12:27:12 <Samu> station spreading was supposed to be enabled. at least it was last night 12:27:25 <Samu> today, when i loaded the save, it is disabled 12:27:45 <DorpsGek_II> [OpenTTD/OpenTTD] Hemaolle commented on pull request #6906: Fix #6742: Only possible to build station next to competitor by using CTRL+click https://github.com/OpenTTD/OpenTTD/pull/6906#issuecomment-421757166 12:29:46 *** andythenorth has joined #openttd 12:34:24 <andythenorth> well 12:38:22 <DorpsGek_II> [OpenTTD/OpenTTD] sj26 commented on pull request #6909: Add BACKSPACE as a mappable hotkey https://github.com/OpenTTD/OpenTTD/pull/6909#issuecomment-421758505 12:49:16 <andythenorth> so 12:49:26 <andythenorth> can I rebuild FIRS on the basis of 16 cargos in / 16 out? 12:49:29 <andythenorth> o_O 12:50:01 <Wolf01> Why not? 12:50:21 <planetmaker> yeah, why not? 12:51:57 <Wolf01> The port will only benefit from that 12:52:34 <Wolf01> Also the bulk terminal 12:55:57 <andythenorth> it's really a question about pull requests 12:56:27 <andythenorth> https://github.com/OpenTTD/OpenTTD/pull/6867 12:56:41 <andythenorth> also NRT died again Wolf01 https://github.com/OpenTTD/OpenTTD/pull/6811 12:56:49 <andythenorth> I'm not sure I can be arsed to fix it any more 12:56:58 <Wolf01> :( 12:57:15 <andythenorth> I only have x amount of time for ottd stuff 12:57:28 <andythenorth> I can get more done with more satisfaction just doing newgrf 12:57:55 <andythenorth> spending time on core patches (a) I'm not very good at it (b) it's sometimes a waste of time 12:57:56 *** Rifan has joined #openttd 12:58:12 <Rifan> hi there 12:58:14 <andythenorth> NRT is stupid 12:58:23 <andythenorth> it's been reviewed now by both Peter and TB 12:58:28 <andythenorth> and still there's no way to get it accepted 12:58:34 <andythenorth> it's like the most broken dev process ever 12:58:42 <Wolf01> That should be my work, but I've enough with development @work 12:59:22 *** k-man has joined #openttd 12:59:30 <andythenorth> well I'm done with it :) 12:59:43 <andythenorth> ottd can clearly make progress, look at all the other accepted PRs 12:59:53 <andythenorth> but this one is a zombie 13:08:24 <Wolf01> The irony is that there's really interest by grf authors 13:09:23 <andythenorth> another irony is that it's the one patch JGR won't integrate :P 13:09:27 <andythenorth> but that's neither here nor there 13:09:55 * andythenorth back to drawing wagons 13:13:02 *** synchris has joined #openttd 13:20:11 *** gelignite has joined #openttd 13:36:42 *** Wacko1976 has quit IRC 14:02:44 *** srhnsn has quit IRC 14:04:40 *** sla_ro|master has quit IRC 14:29:54 *** sim-al2 has quit IRC 14:39:02 *** rocky113844 has joined #openttd 14:42:14 <Samu> review my patch requests 14:42:17 <Samu> ploz 14:42:33 <Samu> pull* 14:47:52 <LordAro> needs an actual dev 15:07:53 *** Oroburos has joined #openttd 15:12:57 <Samu> inflation ruins estimators, dodododo 15:13:09 <Samu> there's not much I can do about it 15:13:14 <planetmaker> :) 15:14:36 *** Rifan has quit IRC 15:15:45 <Samu> @calc 1928+170 15:15:45 <DorpsGek> Samu: 2098 15:15:59 <Samu> the year inflation stops 15:27:31 <Samu> i'm uploading v3 already 15:27:40 <Samu> brb 15:29:04 <Samu> done 15:33:10 *** Oroburos has quit IRC 15:34:11 <Samu> is it barely surviving with high costs, inflation, 4% interest rate, 100k loan 15:34:40 <Samu> didn't use infrastructure maintenance costs though 15:51:37 <Samu> the refit problem is making me mad :( 15:55:11 <Samu> https://imgur.com/Dm6DTux 15:55:37 <Samu> fails to build the aircraft, because I cannot estimate refit costs with inflation 15:55:49 <Samu> I cannot even guess a value 15:57:30 <Samu> I'm disappointed :( 16:01:00 *** Oroburos has joined #openttd 16:02:10 <DorpsGek_II> [OpenTTD/DorpsGek-irc] glx22 commented on issue #7: PRQ merge messages are duplicated https://github.com/OpenTTD/DorpsGek-irc/issues/7#issuecomment-421787752 16:02:47 *** Oroburos has quit IRC 16:03:10 *** Oroburos has joined #openttd 16:03:58 *** Oroburos has joined #openttd 16:18:36 *** haudrauf has quit IRC 16:18:36 *** Arveen has quit IRC 16:18:36 *** Mahjong1 has quit IRC 16:18:36 *** milek7_ has quit IRC 16:18:36 *** Westie has quit IRC 16:18:36 *** masse has quit IRC 16:18:36 *** Alkel_U3 has quit IRC 16:18:36 *** IgnoredAmbience has quit IRC 16:18:36 *** alluke has quit IRC 16:18:36 *** Exec has quit IRC 16:18:36 *** tneo has quit IRC 16:18:36 *** DorpsGek_II has quit IRC 16:18:36 *** ^Spike^ has quit IRC 16:18:36 *** Oroburos has quit IRC 16:18:36 *** gelignite has quit IRC 16:18:36 *** HerzogDeXtEr has quit IRC 16:18:36 *** Wolf01 has quit IRC 16:18:36 *** Stimrol has quit IRC 16:18:36 *** FLHerne has quit IRC 16:18:36 *** Sacro has quit IRC 16:18:36 *** guru3 has quit IRC 16:18:36 *** juzza1 has quit IRC 16:18:36 *** Mavy has quit IRC 16:18:36 *** SmatZ has quit IRC 16:18:36 *** ZirconiumX has quit IRC 16:18:36 *** KenjiE20 has quit IRC 16:18:36 *** Osai has quit IRC 16:18:36 *** michi_cc has quit IRC 16:18:36 *** LordAro has quit IRC 16:18:36 *** Xaroth has quit IRC 16:18:36 *** Hirundo has quit IRC 16:18:36 *** gnu_jj_ has quit IRC 16:18:36 *** Mek has quit IRC 16:18:36 *** Markk has quit IRC 16:18:36 *** berndj has quit IRC 16:18:36 *** tyteen4a03 has quit IRC 16:18:36 *** andythenorth has quit IRC 16:18:36 *** frosch123 has quit IRC 16:18:36 *** Progman has quit IRC 16:18:36 *** tokai has quit IRC 16:18:36 *** nielsm has quit IRC 16:18:36 *** Sheogorath has quit IRC 16:18:37 *** KouDy has quit IRC 16:18:37 *** OsteHovel has quit IRC 16:18:37 *** SpComb^ has quit IRC 16:18:37 *** TrueBrain has quit IRC 16:18:37 *** APTX_ has quit IRC 16:18:37 *** Hobbyboy has quit IRC 16:18:37 *** argoneus has quit IRC 16:18:37 *** techmagus has quit IRC 16:18:37 *** Ammler has quit IRC 16:18:37 *** avdg has quit IRC 16:18:37 *** Yotson has quit IRC 16:18:37 *** eirc has quit IRC 16:18:37 *** Lejving_ has quit IRC 16:18:37 *** V453000 has quit IRC 16:18:37 *** synchris has quit IRC 16:18:37 *** Flygon has quit IRC 16:18:37 *** APTX has quit IRC 16:18:37 *** Smedles has quit IRC 16:18:37 *** Samu has quit IRC 16:18:37 *** rocky1138 has quit IRC 16:18:37 *** quiznilo has quit IRC 16:18:37 *** HeyCitizen has quit IRC 16:18:37 *** TinoDidriksen has quit IRC 16:18:37 *** Maarten has quit IRC 16:18:37 *** ttech2 has quit IRC 16:18:37 *** urdh has quit IRC 16:18:37 *** greeter has quit IRC 16:18:37 *** rocky113844 has quit IRC 16:18:37 *** k-man has quit IRC 16:18:37 *** ST2 has quit IRC 16:18:37 *** Gustavo6046 has quit IRC 16:18:37 *** acklen has quit IRC 16:18:37 *** Extrems has quit IRC 16:18:37 *** lethosor has quit IRC 16:18:37 *** mindlesstux has quit IRC 16:18:37 *** Antheus has quit IRC 16:18:37 *** ccfreak2k has quit IRC 16:18:37 *** hph^ has quit IRC 16:18:37 *** wodencafe has quit IRC 16:18:37 *** Vadtec has quit IRC 16:18:37 *** cHawk has quit IRC 16:18:37 *** reldred has quit IRC 16:18:38 *** colde has quit IRC 16:18:38 *** innocenat has quit IRC 16:18:38 *** Tharbakim has quit IRC 16:18:38 *** murr4y has quit IRC 16:18:43 *** Oroburos has joined #openttd 16:18:43 *** rocky113844 has joined #openttd 16:18:43 *** gelignite has joined #openttd 16:18:43 *** synchris has joined #openttd 16:18:43 *** k-man has joined #openttd 16:18:43 *** andythenorth has joined #openttd 16:18:43 *** frosch123 has joined #openttd 16:18:43 *** Samu has joined #openttd 16:18:43 *** HerzogDeXtEr has joined #openttd 16:18:43 *** Wolf01 has joined #openttd 16:18:43 *** Stimrol has joined #openttd 16:18:43 *** Progman has joined #openttd 16:18:43 *** tokai has joined #openttd 16:18:43 *** nielsm has joined #openttd 16:18:43 *** haudrauf has joined #openttd 16:18:43 *** wodencafe has joined #openttd 16:18:43 *** Flygon has joined #openttd 16:18:43 *** urdh has joined #openttd 16:18:43 *** Arveen has joined #openttd 16:18:43 *** Mahjong1 has joined #openttd 16:18:43 *** Gustavo6046 has joined #openttd 16:18:43 *** Sheogorath has joined #openttd 16:18:43 *** murr4y has joined #openttd 16:18:43 *** milek7_ has joined #openttd 16:18:43 *** Westie has joined #openttd 16:18:43 *** masse has joined #openttd 16:18:43 *** Alkel_U3 has joined #openttd 16:18:43 *** DorpsGek_II has joined #openttd 16:18:43 *** tneo has joined #openttd 16:18:43 *** ^Spike^ has joined #openttd 16:18:43 *** IgnoredAmbience has joined #openttd 16:18:43 *** alluke has joined #openttd 16:18:43 *** Exec has joined #openttd 16:18:43 *** KouDy has joined #openttd 16:18:43 *** APTX has joined #openttd 16:18:43 *** Smedles has joined #openttd 16:18:43 *** FLHerne has joined #openttd 16:18:43 *** Sacro has joined #openttd 16:18:43 *** OsteHovel has joined #openttd 16:18:43 *** SpComb^ has joined #openttd 16:18:43 *** TrueBrain has joined #openttd 16:18:43 *** APTX_ has joined #openttd 16:18:43 *** Hobbyboy has joined #openttd 16:18:43 *** TinoDidriksen has joined #openttd 16:18:44 *** Maarten has joined #openttd 16:18:44 *** ttech2 has joined #openttd 16:18:44 *** rocky1138 has joined #openttd 16:18:44 *** charon.oftc.net sets mode: +v tokai 16:18:44 *** quiznilo has joined #openttd 16:18:44 *** HeyCitizen has joined #openttd 16:18:44 *** argoneus has joined #openttd 16:18:44 *** berndj has joined #openttd 16:18:44 *** michi_cc has joined #openttd 16:18:44 *** Markk has joined #openttd 16:18:44 *** LordAro has joined #openttd 16:18:44 *** tyteen4a03 has joined #openttd 16:18:44 *** Mavy has joined #openttd 16:18:44 *** KenjiE20 has joined #openttd 16:18:44 *** gnu_jj_ has joined #openttd 16:18:44 *** guru3 has joined #openttd 16:18:44 *** Mek has joined #openttd 16:18:44 *** ZirconiumX has joined #openttd 16:18:44 *** Xaroth has joined #openttd 16:18:44 *** juzza1 has joined #openttd 16:18:44 *** SmatZ has joined #openttd 16:18:44 *** Hirundo has joined #openttd 16:18:44 *** Osai has joined #openttd 16:18:44 *** Tharbakim has joined #openttd 16:18:44 *** eirc has joined #openttd 16:18:44 *** Yotson has joined #openttd 16:18:44 *** Lejving_ has joined #openttd 16:18:44 *** cHawk has joined #openttd 16:18:44 *** V453000 has joined #openttd 16:18:44 *** Ammler has joined #openttd 16:18:44 *** avdg has joined #openttd 16:18:44 *** Antheus has joined #openttd 16:18:44 *** greeter has joined #openttd 16:18:44 *** hph^ has joined #openttd 16:18:44 *** Extrems has joined #openttd 16:18:44 *** ST2 has joined #openttd 16:18:44 *** lethosor has joined #openttd 16:18:44 *** techmagus has joined #openttd 16:18:44 *** mindlesstux has joined #openttd 16:18:44 *** acklen has joined #openttd 16:18:44 *** ccfreak2k has joined #openttd 16:18:44 *** Vadtec has joined #openttd 16:18:44 *** colde has joined #openttd 16:18:44 *** reldred has joined #openttd 16:18:44 *** innocenat has joined #openttd 16:18:44 *** charon.oftc.net sets mode: +v michi_cc 16:28:22 <DorpsGek_II> [OpenTTD/OpenTTD] jmakovicka opened pull request #6910: Codechange: Improve (un)zoom performance https://github.com/OpenTTD/OpenTTD/pull/6910 16:36:15 <DorpsGek_II> [OpenTTD/OpenTTD] jmakovicka updated pull request #6910: Codechange: Improve (un)zoom performance https://github.com/OpenTTD/OpenTTD/pull/6910 16:38:14 <DorpsGek_II> [OpenTTD/OpenTTD] jmakovicka updated pull request #6910: Codechange: Improve (un)zoom performance https://github.com/OpenTTD/OpenTTD/pull/6910 16:39:46 *** Flygon has quit IRC 16:41:39 <DorpsGek_II> [OpenTTD/OpenTTD] jottyfan commented on issue #6894: destroy but keep land https://github.com/OpenTTD/OpenTTD/issues/6894#issuecomment-421793462 16:50:42 <DorpsGek_II> [OpenTTD/DorpsGek-irc] LordAro commented on issue #7: PRQ merge messages are duplicated https://github.com/OpenTTD/DorpsGek-irc/issues/7#issuecomment-421794848 16:51:48 <DorpsGek_II> [OpenTTD/OpenTTD] andythenorth commented on issue #6894: destroy but keep land https://github.com/OpenTTD/OpenTTD/issues/6894#issuecomment-421795024 17:10:15 <DorpsGek_II> [OpenTTD/OpenTTD] LordAro commented on issue #6894: destroy but keep land https://github.com/OpenTTD/OpenTTD/issues/6894#issuecomment-421797660 17:10:49 <LordAro> that sse4 sorting prq needs someone who knows what they're doing 17:12:02 <Samu> what is this test supposed to do https://github.com/OpenTTD/OpenTTD/blob/d839526365e66b0846366807e2e697358819751c/bin/ai/regression/tst_regression/result.txt 17:30:41 *** Wacko1976 has joined #openttd 17:32:24 <peter1138> LordAro, well the sse4 part is just moved from elsewhere. 17:37:36 <LordAro> well, true 17:38:02 <LordAro> but still requires someone who actually knows what they're doing 17:38:27 <LordAro> Samu: it uses an ai to check that the game is doing what it's supposed to 17:38:41 <LordAro> or, a regression test 18:12:55 *** sla_ro|master has joined #openttd 18:20:50 *** rocky113844 has quit IRC 18:32:53 *** gelignite has quit IRC 18:40:49 <Samu> already working on v4, because I'm a terrible coder 18:41:14 <Samu> i should stop uploading everytime i make a change 18:49:07 *** triolus has joined #openttd 18:50:02 <Samu> https://github.com/SamuXarick/OpenTTD This branch is 1 commit behind OpenTTD:master. 18:50:10 <Samu> uh... how come 18:50:51 <Samu> how do I make it keep up automatically? 18:59:40 *** Supercheese has joined #openttd 19:00:55 *** glx has joined #openttd 19:00:55 *** ChanServ sets mode: +v glx 19:06:40 <Samu> what is this behind/ahead stuff... why is this so complicated 19:06:52 *** snail_UES_ has joined #openttd 19:19:18 <nielsm> Samu: in git? "behind" means the remote has some changes you don't have integrated in your version of the branch, and "ahead" means you have some changes in your version of the branch that the remote doesn't have 19:20:25 <nielsm> so when you're ahead and behind at the same time, any pull operation on the branch will require a merge or rebase, and a push operation will fail unless you force (which deletes the changes the remote is ahead with) 19:21:50 <nielsm> if you did an interactive rebase and squashed some commits, of a branch you already pushed to your own remote on github, you will end up in the "ahead and behind" situation 19:23:00 <nielsm> in the specific situation of doing an interactive rebase/squash on a private github branch that you have a pull request for on OpenTTD main project, the correct thing to do is to force-push your changes to your branch on github 19:30:03 *** synchris has quit IRC 19:37:53 *** alluke has quit IRC 19:50:46 *** sla_ro|master has quit IRC 20:17:43 <Samu> my head! 20:18:35 *** sim-al2 has joined #openttd 20:22:55 <LordAro> Samu: so when you made a patch file with svn, you were one "commit" ahead of trunk. if trunk updated at any point, your patch (or the point at which your patch was taken from) would also be "behind" 20:25:29 <Samu> in svn there was just a udpate to latest revision 20:25:35 <Samu> much easier 20:25:49 <Samu> i'm not sure what to do here 20:25:51 <Samu> in git 20:25:55 <LordAro> it's similar, but not the same in git 20:27:34 <LordAro> Samu: https://try.github.io start at the top 20:27:36 <Samu> all i see is merge 20:27:42 <Samu> dont see any push 20:27:45 <Samu> button or 20:27:56 <LordAro> there probably isn't a button for it 20:28:14 <LordAro> depending what you're looking at 20:29:50 <Wolf01> 'night 20:29:52 *** Wolf01 has quit IRC 20:35:35 <Samu> ah 20:35:45 <Samu> merge upstream/master into master? 20:35:52 <Samu> push origin 20:35:55 <Samu> is this it? 20:37:33 <Samu> whatever, i clicked push origin 20:37:42 <Samu> probably did the right thing, let's see 20:38:34 <LordAro> likely created a merge commit, which will confuse things in future 20:39:38 <Samu> https://github.com/SamuXarick/OpenTTD 20:39:45 <Samu> This branch is even with OpenTTD:master. 20:39:49 <Samu> seems good to me 20:40:26 <Samu> https://github.com/SamuXarick/OpenTTD/tree/CONFIG_RANDOM-fix 20:40:29 <Samu> bah 20:40:35 <Samu> this thing isn't smart at all 20:44:26 <Samu> if I merge the behind, will I lose the ahead? 20:44:43 <Samu> erm i don't even know if the question makes sense 20:51:01 <LordAro> Samu: yeah, in this case it's worked out because there was no "ahead" 20:51:51 <LordAro> in the case of there being an "ahead", it will (by default) create a merge commit that shoves the 2 separate commit trees together 20:52:16 <LordAro> which will cause issues with the CI if you try to PR it 20:53:26 *** snail_UES_ has quit IRC 20:56:05 <Samu> what is CI? 20:57:01 <LordAro> content integration 20:57:17 <LordAro> it's the thing that shouts at you when you screw up a pull request :p 20:57:18 <nielsm> continuous integration 20:57:29 <LordAro> er, yes, that 20:58:21 <LordAro> (it checks commit messages, indentation and compilation) 20:58:45 <Samu> https://imgur.com/NPKy2Im this is what github desktop is showing me 20:59:36 *** Supercheese has quit IRC 20:59:58 *** Supercheese has joined #openttd 21:00:08 <Samu> i dont see rebases or squats or anything like that anywhere :( 21:00:32 <LordAro> squash 21:00:38 <LordAro> squats is something else :p 21:00:50 <LordAro> but yeah, looks like github desktop can't do it 21:01:01 *** andythenorth has left #openttd 21:01:19 <Samu> i see branch > update from default branch 21:01:55 <LordAro> that pulls down any updates to your branch (if you've altered it on another computer) 21:01:55 <Samu> meh, now I get 0 behinds and 2 aheads 21:02:04 <Samu> very funny stuff 21:02:08 <LordAro> or maybe it merges it, i don't know 21:02:13 <LordAro> you use VS, right? 21:02:30 <LordAro> their git integration is a bit better, maybe you should try that instead? 21:02:36 <Samu> VS? 21:02:41 <LordAro> visual studio 21:02:48 <Samu> ah, i only use it to edit code 21:03:05 <LordAro> hmm 21:03:18 <LordAro> actual visual studio, or visual studio code? 21:03:23 <LordAro> they're very different 21:03:42 <LordAro> (though they probably both have decent git integrations) 21:04:24 <Samu> Merge branch 'master' into GetMonthlyMaintenanceCost, so this was what happened when i "update from default branch" 21:04:33 <Samu> sec, screenshoting 21:05:10 <Samu> https://imgur.com/0nX4Tq6 21:05:11 <LordAro> yeah, it created a merge conflict 21:05:19 <LordAro> merge commit* 21:06:03 <LordAro> in very simple terms, it merged both your commit (patch) and the remote commit (patch) together 21:06:17 <LordAro> bur seriously, go read various things on the link i posted earlier 21:07:56 *** sushibear has joined #openttd 21:08:08 <Samu> looks like that's what i wanted it to do, unless it's gonna cause me troubles in the future :o 21:08:39 <Samu> but having 2 aheads is weird 21:08:56 <Samu> i was expecting 1 ahead, only my patch 21:10:05 <Samu> wow seriously, the revert feature is stupid, now i get 3 aheads 21:10:16 <LordAro> ha 21:10:29 <LordAro> revert is different, not stupid 21:10:44 <LordAro> yeah, you're going to learn to use rebase 21:10:59 <LordAro> however you achieve it (cli, vs, whatever) 21:11:06 <LordAro> but not gh desktop, apparently 21:13:08 *** frosch123 has quit IRC 21:15:16 <Samu> here's a better solution 21:15:22 <Samu> send to recycle bin 21:15:29 <Samu> clone repository again 21:16:13 <Samu> because I'm dumb, or the program is utterly stupid 21:16:39 <Samu> probably beause I'm dumb 21:17:45 <Samu> yeah, no more 3 aheads, problem solved :) 21:20:34 <Samu> back to where it started, 1 behind, 1 ahead 21:20:41 <Samu> i prefer to leave it that way 21:20:58 <LordAro> yeah... 21:21:06 <LordAro> git's user interface isn't the best thing in the world 21:21:21 <LordAro> but throwing it away just because you don't understand it isn't the best course of action 21:24:36 <LordAro> Samu: seiously though https://try.github.io 21:36:17 <Samu> https://learngitbranching.js.org/?demo this is bad 21:36:31 <Samu> im not using command line stuff 21:36:39 <LordAro> tough 21:37:59 <LordAro> regardless of whether you use it or not, it's important you understand what it's doing 21:38:05 <LordAro> instead of your usual flailing 21:48:10 <Samu> 92 years till max inflation 21:51:22 *** Oroburos has quit IRC 21:53:52 <Samu> I really have to avoid using GetClosestTown 21:53:57 <Samu> darn stalls 22:10:22 *** Progman has quit IRC 22:14:14 *** urdh has quit IRC 22:17:30 *** rocky113844 has joined #openttd 22:18:16 *** urdh has joined #openttd 22:24:39 <Samu> what is causing stalls? :( 22:24:59 <Samu> i'm bad at this :( 22:35:17 <Samu> https://imgur.com/6z7kUDW 22:35:25 <Samu> not very informative 22:35:46 <Samu> peter1138: halp 22:36:03 <Samu> you're the framerate guy? 22:36:22 <nielsm> I'm the one who wrote the framerate display 22:36:28 <Samu> oh, hi 22:36:50 <Samu> doesn't seem to pinpoint where the cause of the spikes is coming from 22:36:58 <nielsm> it doesn't really have anything for AI or GS right now 22:37:15 <Samu> i know it's from somewhere managing road vehicles 22:37:23 <nielsm> but since they don't show up in any of the vehicle or world processing ticks you can assume it's either AI or GS 22:37:35 <Samu> yes, but which function 22:37:54 <Samu> GetClosestTown can't be, as I dont use that one during road vehicle management 22:38:02 <Samu> only during construction 22:38:55 <nielsm> pathfinding maybe 22:39:43 <Samu> not pathfinding, it's only managing the routes, something like checking if the route needs more vehicles, selling old vehicles, upgrading to new model, upgrading bridges 22:40:07 <Samu> hmm 22:40:21 <LordAro> profiling your own AI is up to you 22:40:24 <LordAro> the game can't do it for you 22:40:32 <LordAro> (well it could, but it doesn't) 22:41:13 <LordAro> also, learn to ask better questions 22:41:32 <LordAro> highlighting people at 23:30 with "halp" isn't very considerate 22:41:36 <LordAro> or useful 22:41:42 <Samu> heh, sorry 22:43:52 <Samu> profiling, that means, disabling parts? 22:43:58 <Samu> see where it's originating from 22:44:06 <Samu> I can do that during management 22:44:35 <LordAro> not necessarily disabling parts 22:44:39 <LordAro> but measuring parts 22:46:40 <nielsm> gn 22:53:10 *** Wacko1976 has quit IRC 22:54:44 *** nielsm has quit IRC 22:59:20 <Samu> i found the culprit! 22:59:23 <Samu> routeManager.m_townRouteArray[i].sellVehiclesInDepot(); 23:01:50 <Samu> or maybe I didn't 23:01:55 <Samu> let me disable this one too 23:08:15 <Samu> it wasn't it 23:08:16 <Samu> :( 23:11:08 <Samu> aha, now I got it for real 23:11:10 <Samu> if(MAX_TOWN_VEHICLES < routeManager.getRoadVehicleCount()) { 23:13:26 *** sushibear has quit IRC 23:15:15 <Samu> problem solved 23:20:14 <Samu> https://imgur.com/C0vMAJu 23:20:22 <Samu> no more huge stalls 23:31:25 *** snail_UES_ has joined #openttd