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