Back to Home / #openttd / 2018 / 09 / Prev Day | Next Day
#openttd IRC Logs for 2018-09-16

---Logopened Sun Sep 16 00:00:52 2018
00:18-!-snail_UES_ [~snail_UES@cpe-98-14-137-148.nyc.res.rr.com] has joined #openttd
00:18-!-snail_UES_ is "Jacopo Coletto" on #openttd
02:00<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
02:40-!-sla_ro|master [~sla.ro@84.117.88.126] has joined #openttd
02:40-!-sla_ro|master is "slamaster" on #sla #openttd
02:47-!-nielsm [~nielsm@176-23-103-56-cable.dk.customer.tdc.net] has joined #openttd
02:47-!-nielsm is "Niels Martin Hansen" on #openttd #tycoon
02:52<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
02:54<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
03:01-!-tokai [~tokai@00012860.user.oftc.net] has joined #openttd
03:01-!-mode/#openttd [+v tokai] by ChanServ
03:01-!-tokai is "Christian Rosentreter" on +#openttd
03:08-!-tokai|noir [~tokai@00012860.user.oftc.net] has quit [Ping timeout: 480 seconds]
03:09-!-Progman [~progman@p57A2BB06.dip0.t-ipconnect.de] has joined #openttd
03:09-!-Progman is "Peter Henschel" on #openttdcoop.dev #openttdcoop #openttd
03:12<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
03:16<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
03:17-!-andythenorth [~andytheno@cpc87219-aztw31-2-0-cust178.18-1.cable.virginm.net] has joined #openttd
03:17-!-andythenorth is "andythenorth" on #openttd
03:19-!-srhnsn [~srhnsn@2a02:8070:e8b:a500:c46f:4d95:c777:bcc4] has joined #openttd
03:19-!-srhnsn is "-" on #debian-next #osrm #osm-de #openttd
03:24<andythenorth>moin
03:29-!-gelignite [~gelignite@55d4d746.access.ecotel.net] has joined #openttd
03:29-!-gelignite is "gelignite" on #openttd
03:41-!-Gja [~Martin@93-167-84-102-static.dk.customer.tdc.net] has joined #openttd
03:41-!-Gja is "Martin" on #ceph #bcache #openttd
03:42-!-Gja [~Martin@93-167-84-102-static.dk.customer.tdc.net] has quit []
03:45<DorpsGek_II>[OpenTTD/OpenTTD] George-VB opened issue #6908: Request: Persistent storage for vehicles https://github.com/OpenTTD/OpenTTD/issues/6908
03:47<DorpsGek_II>[OpenTTD/OpenTTD] George-VB commented on issue #6908: Request: Persistent storage for vehicles https://github.com/OpenTTD/OpenTTD/issues/6908#issuecomment-421718140
04:10<andythenorth>oof I have introduced an odd bug to Iron Horse
04:10<andythenorth>some vehicles have their props zeroed
04:10<andythenorth>and the cargo refit list has '(undefined string)' appended to the end of it
04:11<DorpsGek_II>[OpenTTD/OpenTTD] sj26 opened pull request #6909: Add BACKSPACE as a mappable hotkey https://github.com/OpenTTD/OpenTTD/pull/6909
04:13<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
04:14<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
04:14<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
04:14<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
04:15<DorpsGek_II>[OpenTTD/OpenTTD] sj26 updated pull request #6909: Add BACKSPACE as a mappable hotkey https://github.com/OpenTTD/OpenTTD/pull/6909
04:16<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
04:17<LordAro>where did all that come from
04:19<andythenorth>clearly
04:19<andythenorth>it's the start of academic year or something
04:19<andythenorth>or end of holidays
04:20<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
04:20-!-snail_UES_ [~snail_UES@cpe-98-14-137-148.nyc.res.rr.com] has quit [Quit: snail_UES_]
04:21<andythenorth>oof
04:21<andythenorth>hello bisect my old friend :(
04:21<andythenorth>I've come to find the bug again
04:25<LordAro>:D
04:29<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
04:30<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
04:31<andythenorth>:D
04:41<andythenorth>found the broken rev, but not the cause :P
04:42-!-sla_ro|master [~sla.ro@84.117.88.126] has quit [Read error: Connection reset by peer]
04:49<andythenorth>oof
04:49<andythenorth>I thought nml switches could rely on only having a default result these days :P
04:49<andythenorth>apparently not
04:49<andythenorth>fails silently
04:57-!-kurt1 [~kurt@4G4AAA2L3.tor-irc.dnsbl.oftc.net] has quit [Remote host closed the connection]
05:06<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
05:07-!-andythenorth [~andytheno@cpc87219-aztw31-2-0-cust178.18-1.cable.virginm.net] has quit [Quit: andythenorth]
05:07<LordAro>i wonder about the usefulness of the "needs review" label
05:07<LordAro>given github already reports review status
05:09<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
05:11<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
05:13<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
05:13-!-Stimrol [~Stimrol@89-160-153-213.du.xdsl.is] has quit [Read error: No route to host]
05:15<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
05:20-!-Stimrol [~Stimrol@89-160-153-213.du.xdsl.is] has joined #openttd
05:20-!-Stimrol is "Stimrol" on #openttd
05:22-!-Wolf01 [~wolf01@0001288e.user.oftc.net] has joined #openttd
05:22-!-Wolf01 is "Wolf01" on #openttd
05:23<Wolf01>o/
05:32<DorpsGek_II>[OpenTTD/DorpsGek-irc] LordAro opened issue #6: No message for reviews https://github.com/OpenTTD/DorpsGek-irc/issues/6
05:36<DorpsGek_II>[OpenTTD/OpenTTD] sj26 merged pull request #6909: Add BACKSPACE as a mappable hotkey https://github.com/OpenTTD/OpenTTD/pull/6909
05:36<DorpsGek_II>[OpenTTD/OpenTTD] michicc pushed 1 commits to master:
05:36<DorpsGek_II> - Add: BACKSPACE can be mapped as a hotkey (by sj26)
05:36<DorpsGek_II>https://github.com/OpenTTD/OpenTTD/commit/1a73c3983863
05:42<DorpsGek_II>[OpenTTD/DorpsGek-irc] LordAro opened issue #7: PRQ merge messages are duplicated https://github.com/OpenTTD/DorpsGek-irc/issues/7
06:00-!-Wacko1976 [~IceChat9@027-161-128-083.dynamic.caiway.nl] has joined #openttd
06:00-!-Wacko1976 is "The Chat Cool People Use" on #openttd #/r/openttd
06:09-!-gelignite [~gelignite@55d4d746.access.ecotel.net] has quit [Ping timeout: 480 seconds]
06:46-!-HerzogDeXtEr [~farci@dslb-188-103-230-209.188.103.pools.vodafone-ip.de] has joined #openttd
06:46-!-HerzogDeXtEr is "purple" on #openttd
07:00-!-gelignite [~gelignite@55d4d746.access.ecotel.net] has joined #openttd
07:00-!-gelignite is "gelignite" on #openttd
07:00-!-gelignite [~gelignite@55d4d746.access.ecotel.net] has quit [Remote host closed the connection]
07:06-!-sla_ro|master [~sla.ro@84.117.88.126] has joined #openttd
07:06-!-sla_ro|master is "slamaster" on #sla #openttd
07:17-!-Samu [~oftc-webi@pa4-84-91-142-34.netvisao.pt] has joined #openttd
07:17-!-Samu is "OFTC WebIRC Client" on #openttd
07:46-!-frosch123 [~frosch@00013ce7.user.oftc.net] has joined #openttd
07:46-!-frosch123 is "frosch" on #openttdcoop.devzone +#openttd.dev #openttd
08:01<Samu>why is restart from savegames not starting as it started before the savegame?
08:02<Samu>gonna be hard to reproduce a bug
08:09<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
08:26<Samu>something happening with AI settings I can't quite explain
08:27<Samu>station spreading was supposed to be enabled. at least it was last night
08:27<Samu>today, when i loaded the save, it is disabled
08:27<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
08:29-!-andythenorth [~andytheno@cpc87219-aztw31-2-0-cust178.18-1.cable.virginm.net] has joined #openttd
08:29-!-andythenorth is "andythenorth" on #openttd
08:34<andythenorth>well
08:38<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
08:49<andythenorth>so
08:49<andythenorth>can I rebuild FIRS on the basis of 16 cargos in / 16 out?
08:49<andythenorth>o_O
08:50<Wolf01>Why not?
08:50<@planetmaker>yeah, why not?
08:51<Wolf01>The port will only benefit from that
08:52<Wolf01>Also the bulk terminal
08:55<andythenorth>it's really a question about pull requests
08:56<andythenorth>https://github.com/OpenTTD/OpenTTD/pull/6867
08:56<andythenorth>also NRT died again Wolf01 https://github.com/OpenTTD/OpenTTD/pull/6811
08:56<andythenorth>I'm not sure I can be arsed to fix it any more
08:56<Wolf01>:(
08:57<andythenorth>I only have x amount of time for ottd stuff
08:57<andythenorth>I can get more done with more satisfaction just doing newgrf
08:57<andythenorth>spending time on core patches (a) I'm not very good at it (b) it's sometimes a waste of time
08:57-!-Rifan [~oftc-webi@202.80.217.26] has joined #openttd
08:57-!-Rifan is "OFTC WebIRC Client" on #openttd
08:58<Rifan>hi there
08:58<andythenorth>NRT is stupid
08:58<andythenorth>it's been reviewed now by both Peter and TB
08:58<andythenorth>and still there's no way to get it accepted
08:58<andythenorth>it's like the most broken dev process ever
08:58<Wolf01>That should be my work, but I've enough with development @work
08:59-!-k-man [~jason@00026c88.user.oftc.net] has joined #openttd
08:59-!-k-man is "Jason Lewis http://emacstragic.net" on #openttd #debian #virt #debian-installer #debian-au
08:59<andythenorth>well I'm done with it :)
08:59<andythenorth>ottd can clearly make progress, look at all the other accepted PRs
08:59<andythenorth>but this one is a zombie
09:08<Wolf01>The irony is that there's really interest by grf authors
09:09<andythenorth>another irony is that it's the one patch JGR won't integrate :P
09:09<andythenorth>but that's neither here nor there
09:09*andythenorth back to drawing wagons
09:13-!-synchris [~synchris@139.138.202.72] has joined #openttd
09:13-!-synchris is "Synesios Christou" on #openttd
09:20-!-gelignite [~gelignite@55d4d746.access.ecotel.net] has joined #openttd
09:20-!-gelignite is "gelignite" on #openttd
09:36-!-Wacko1976 [~IceChat9@027-161-128-083.dynamic.caiway.nl] has quit [Ping timeout: 480 seconds]
10:02-!-srhnsn [~srhnsn@2a02:8070:e8b:a500:c46f:4d95:c777:bcc4] has quit []
10:04-!-sla_ro|master [~sla.ro@84.117.88.126] has quit []
10:29-!-sim-al2 [~sim-al2@c-75-65-196-171.hsd1.tn.comcast.net] has quit [Ping timeout: 480 seconds]
10:39-!-rocky113844 [~rocky1138@104.158.175.150] has joined #openttd
10:39-!-rocky113844 is "Your Mom" on #openttd
10:42<Samu>review my patch requests
10:42<Samu>ploz
10:42<Samu>pull*
10:47<LordAro>needs an actual dev
11:07-!-Oroburos [~Notthatim@cpc72333-sotn15-2-0-cust299.15-1.cable.virginm.net] has joined #openttd
11:07-!-Oroburos is "realname" on #openttd #privacytools.io
11:12<Samu>inflation ruins estimators, dodododo
11:13<Samu>there's not much I can do about it
11:13<@planetmaker>:)
11:14-!-Rifan [~oftc-webi@202.80.217.26] has quit [Quit: Page closed]
11:15<Samu>@calc 1928+170
11:15<@DorpsGek>Samu: 2098
11:15<Samu>the year inflation stops
11:27<Samu>i'm uploading v3 already
11:27<Samu>brb
11:29<Samu>done
11:33-!-Oroburos [~Notthatim@cpc72333-sotn15-2-0-cust299.15-1.cable.virginm.net] has quit [Quit: Leaving]
11:34<Samu>is it barely surviving with high costs, inflation, 4% interest rate, 100k loan
11:34<Samu>didn't use infrastructure maintenance costs though
11:51<Samu>the refit problem is making me mad :(
11:55<Samu>https://imgur.com/Dm6DTux
11:55<Samu>fails to build the aircraft, because I cannot estimate refit costs with inflation
11:55<Samu>I cannot even guess a value
11:57<Samu>I'm disappointed :(
12:01-!-Oroburos [~Notthatim@cpc72333-sotn15-2-0-cust299.15-1.cable.virginm.net] has joined #openttd
12:01-!-Oroburos is "realname" on #redditprivacy #privacytools.io #openttd
12:02<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
12:02-!-Oroburos [~Notthatim@cpc72333-sotn15-2-0-cust299.15-1.cable.virginm.net] has quit []
12:03-!-Oroburos [~Notthatim@cpc72333-sotn15-2-0-cust299.15-1.cable.virginm.net] has joined #openttd
12:03-!-Oroburos is "realname" on #redditprivacy #privacytools.io #openttd
12:03-!-Oroburos [~Notthatim@cpc72333-sotn15-2-0-cust299.15-1.cable.virginm.net] has quit []
12:03-!-Oroburos is "realname" on #redditprivacy #privacytools.io #openttd
12:03-!-Oroburos [~Notthatim@cpc72333-sotn15-2-0-cust299.15-1.cable.virginm.net] has joined #openttd
12:18-!-Netsplit helix.oftc.net <-> magnet.oftc.net quits: Yotson, Antheus, Exec, Mavy, greeter, Alkel_U3, Hirundo, tneo, haudrauf, lethosor, (+78 more, use /NETSPLIT to show all of them)
12:18-!-Netsplit over, joins: Oroburos, rocky113844, gelignite, synchris, k-man, andythenorth, frosch123, Samu, HerzogDeXtEr, Wolf01 (+78 more)
12:28<DorpsGek_II>[OpenTTD/OpenTTD] jmakovicka opened pull request #6910: Codechange: Improve (un)zoom performance https://github.com/OpenTTD/OpenTTD/pull/6910
12:36<DorpsGek_II>[OpenTTD/OpenTTD] jmakovicka updated pull request #6910: Codechange: Improve (un)zoom performance https://github.com/OpenTTD/OpenTTD/pull/6910
12:38<DorpsGek_II>[OpenTTD/OpenTTD] jmakovicka updated pull request #6910: Codechange: Improve (un)zoom performance https://github.com/OpenTTD/OpenTTD/pull/6910
12:39-!-Flygon [~Flygon@124-148-188-30.dyn.iinet.net.au] has quit [Read error: Connection reset by peer]
12:41<DorpsGek_II>[OpenTTD/OpenTTD] jottyfan commented on issue #6894: destroy but keep land https://github.com/OpenTTD/OpenTTD/issues/6894#issuecomment-421793462
12:50<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
12:51<DorpsGek_II>[OpenTTD/OpenTTD] andythenorth commented on issue #6894: destroy but keep land https://github.com/OpenTTD/OpenTTD/issues/6894#issuecomment-421795024
13:10<DorpsGek_II>[OpenTTD/OpenTTD] LordAro commented on issue #6894: destroy but keep land https://github.com/OpenTTD/OpenTTD/issues/6894#issuecomment-421797660
13:10<LordAro>that sse4 sorting prq needs someone who knows what they're doing
13:12<Samu>what is this test supposed to do https://github.com/OpenTTD/OpenTTD/blob/d839526365e66b0846366807e2e697358819751c/bin/ai/regression/tst_regression/result.txt
13:30-!-Wacko1976 [~IceChat9@027-161-128-083.dynamic.caiway.nl] has joined #openttd
13:30-!-Wacko1976 is "The Chat Cool People Use" on #openttd #/r/openttd
13:32<@peter1138>LordAro, well the sse4 part is just moved from elsewhere.
13:37<LordAro>well, true
13:38<LordAro>but still requires someone who actually knows what they're doing
13:38<LordAro>Samu: it uses an ai to check that the game is doing what it's supposed to
13:38<LordAro>or, a regression test
14:12-!-sla_ro|master [~sla.ro@84.117.88.126] has joined #openttd
14:12-!-sla_ro|master is "slamaster" on #sla #openttd
14:20-!-rocky113844 [~rocky1138@104.158.175.150] has quit [Ping timeout: 480 seconds]
14:32-!-gelignite [~gelignite@55d4d746.access.ecotel.net] has quit [Quit: Match found!]
14:40<Samu>already working on v4, because I'm a terrible coder
14:41<Samu>i should stop uploading everytime i make a change
14:49-!-triolus [~bobolopki@97-115-34-72.ptld.qwest.net] has joined #openttd
14:49-!-triolus is "realname" on #openttd #debian
14:50<Samu>https://github.com/SamuXarick/OpenTTD This branch is 1 commit behind OpenTTD:master.
14:50<Samu>uh... how come
14:50<Samu>how do I make it keep up automatically?
14:59-!-Supercheese [~Superchee@cpe-98-146-230-183.natnow.res.rr.com] has joined #openttd
14:59-!-Supercheese is "Supercheese" on #openttd
15:00-!-glx [kvirc@000128ec.user.oftc.net] has joined #openttd
15:00-!-mode/#openttd [+v glx] by ChanServ
15:00-!-glx is "Loïc GUILLOUX" on #opendune #openttd.noai #openttd.notice +#openttd
15:06<Samu>what is this behind/ahead stuff... why is this so complicated
15:06-!-snail_UES_ [~snail_UES@cpe-98-14-137-148.nyc.res.rr.com] has joined #openttd
15:06-!-snail_UES_ is "Jacopo Coletto" on #openttd
15:19<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
15:20<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)
15:21<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
15:23<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
15:30-!-synchris [~synchris@139.138.202.72] has quit [Quit: yeeha!]
15:37-!-alluke [~54fafabe@188.cimarosa.openttdcoop.org] has quit [Quit: Page closed]
15:50-!-sla_ro|master [~sla.ro@84.117.88.126] has quit []
16:17<Samu>my head!
16:18-!-sim-al2 [~sim-al2@c-75-65-196-171.hsd1.tn.comcast.net] has joined #openttd
16:18-!-sim-al2 is "sim-al2" on #openttd
16:22<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"
16:25<Samu>in svn there was just a udpate to latest revision
16:25<Samu>much easier
16:25<Samu>i'm not sure what to do here
16:25<Samu>in git
16:25<LordAro>it's similar, but not the same in git
16:27<LordAro>Samu: https://try.github.io start at the top
16:27<Samu>all i see is merge
16:27<Samu>dont see any push
16:27<Samu>button or
16:27<LordAro>there probably isn't a button for it
16:28<LordAro>depending what you're looking at
16:29<Wolf01>'night
16:29-!-Wolf01 [~wolf01@0001288e.user.oftc.net] has quit [Quit: Once again the world is quick to bury me.]
16:35<Samu>ah
16:35<Samu>merge upstream/master into master?
16:35<Samu>push origin
16:35<Samu>is this it?
16:37<Samu>whatever, i clicked push origin
16:37<Samu>probably did the right thing, let's see
16:38<LordAro>likely created a merge commit, which will confuse things in future
16:39<Samu>https://github.com/SamuXarick/OpenTTD
16:39<Samu>This branch is even with OpenTTD:master.
16:39<Samu>seems good to me
16:40<Samu>https://github.com/SamuXarick/OpenTTD/tree/CONFIG_RANDOM-fix
16:40<Samu>bah
16:40<Samu>this thing isn't smart at all
16:44<Samu>if I merge the behind, will I lose the ahead?
16:44<Samu>erm i don't even know if the question makes sense
16:51<LordAro>Samu: yeah, in this case it's worked out because there was no "ahead"
16: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
16:52<LordAro>which will cause issues with the CI if you try to PR it
16:53-!-snail_UES_ [~snail_UES@cpe-98-14-137-148.nyc.res.rr.com] has quit [Quit: snail_UES_]
16:56<Samu>what is CI?
16:57<LordAro>content integration
16:57<LordAro>it's the thing that shouts at you when you screw up a pull request :p
16:57<nielsm>continuous integration
16:57<LordAro>er, yes, that
16:58<LordAro>(it checks commit messages, indentation and compilation)
16:58<Samu>https://imgur.com/NPKy2Im this is what github desktop is showing me
16:59-!-Supercheese [~Superchee@cpe-98-146-230-183.natnow.res.rr.com] has quit [Read error: Connection reset by peer]
16:59-!-Supercheese [~Superchee@cpe-98-146-230-183.natnow.res.rr.com] has joined #openttd
16:59-!-Supercheese is "Supercheese" on #openttd
17:00<Samu>i dont see rebases or squats or anything like that anywhere :(
17:00<LordAro>squash
17:00<LordAro>squats is something else :p
17:00<LordAro>but yeah, looks like github desktop can't do it
17:01-!-andythenorth [~andytheno@cpc87219-aztw31-2-0-cust178.18-1.cable.virginm.net] has left #openttd []
17:01<Samu>i see branch > update from default branch
17:01<LordAro>that pulls down any updates to your branch (if you've altered it on another computer)
17:01<Samu>meh, now I get 0 behinds and 2 aheads
17:02<Samu>very funny stuff
17:02<LordAro>or maybe it merges it, i don't know
17:02<LordAro>you use VS, right?
17:02<LordAro>their git integration is a bit better, maybe you should try that instead?
17:02<Samu>VS?
17:02<LordAro>visual studio
17:02<Samu>ah, i only use it to edit code
17:03<LordAro>hmm
17:03<LordAro>actual visual studio, or visual studio code?
17:03<LordAro>they're very different
17:03<LordAro>(though they probably both have decent git integrations)
17:04<Samu>Merge branch 'master' into GetMonthlyMaintenanceCost, so this was what happened when i "update from default branch"
17:04<Samu>sec, screenshoting
17:05<Samu>https://imgur.com/0nX4Tq6
17:05<LordAro>yeah, it created a merge conflict
17:05<LordAro>merge commit*
17:06<LordAro>in very simple terms, it merged both your commit (patch) and the remote commit (patch) together
17:06<LordAro>bur seriously, go read various things on the link i posted earlier
17:07-!-sushibear [~SushiBear@176-204-50-84.dyn.estpak.ee] has joined #openttd
17:07-!-sushibear is "SushiBear" on #openttd #OpenBSD #python
17:08<Samu>looks like that's what i wanted it to do, unless it's gonna cause me troubles in the future :o
17:08<Samu>but having 2 aheads is weird
17:08<Samu>i was expecting 1 ahead, only my patch
17:10<Samu>wow seriously, the revert feature is stupid, now i get 3 aheads
17:10<LordAro>ha
17:10<LordAro>revert is different, not stupid
17:10<LordAro>yeah, you're going to learn to use rebase
17:10<LordAro>however you achieve it (cli, vs, whatever)
17:11<LordAro>but not gh desktop, apparently
17:13-!-frosch123 [~frosch@00013ce7.user.oftc.net] has quit [Quit: be yourself, except: if you have the opportunity to be a unicorn, then be a unicorn]
17:15<Samu>here's a better solution
17:15<Samu>send to recycle bin
17:15<Samu>clone repository again
17:16<Samu>because I'm dumb, or the program is utterly stupid
17:16<Samu>probably beause I'm dumb
17:17<Samu>yeah, no more 3 aheads, problem solved :)
17:20<Samu>back to where it started, 1 behind, 1 ahead
17:20<Samu>i prefer to leave it that way
17:20<LordAro>yeah...
17:21<LordAro>git's user interface isn't the best thing in the world
17:21<LordAro>but throwing it away just because you don't understand it isn't the best course of action
17:24<LordAro>Samu: seiously though https://try.github.io
17:36<Samu>https://learngitbranching.js.org/?demo this is bad
17:36<Samu>im not using command line stuff
17:36<LordAro>tough
17:37<LordAro>regardless of whether you use it or not, it's important you understand what it's doing
17:38<LordAro>instead of your usual flailing
17:48<Samu>92 years till max inflation
17:51-!-Oroburos [~Notthatim@cpc72333-sotn15-2-0-cust299.15-1.cable.virginm.net] has quit [Ping timeout: 480 seconds]
17:53<Samu>I really have to avoid using GetClosestTown
17:53<Samu>darn stalls
18:10-!-Progman [~progman@p57A2BB06.dip0.t-ipconnect.de] has quit [Remote host closed the connection]
18:14-!-urdh [~urdh@00013d7a.user.oftc.net] has quit [Ping timeout: 480 seconds]
18:17-!-rocky113844 [~rocky1138@104.158.175.150] has joined #openttd
18:17-!-rocky113844 is "Your Mom" on #openttd
18:18-!-urdh [~urdh@00013d7a.user.oftc.net] has joined #openttd
18:18-!-urdh is "Simon Sigurdhsson" on #oftc #openttd #moocows
18:24<Samu>what is causing stalls? :(
18:24<Samu>i'm bad at this :(
18:35<Samu>https://imgur.com/6z7kUDW
18:35<Samu>not very informative
18:35<Samu>peter1138: halp
18:36<Samu>you're the framerate guy?
18:36<nielsm>I'm the one who wrote the framerate display
18:36<Samu>oh, hi
18:36<Samu>doesn't seem to pinpoint where the cause of the spikes is coming from
18:36<nielsm>it doesn't really have anything for AI or GS right now
18:37<Samu>i know it's from somewhere managing road vehicles
18:37<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
18:37<Samu>yes, but which function
18:37<Samu>GetClosestTown can't be, as I dont use that one during road vehicle management
18:38<Samu>only during construction
18:38<nielsm>pathfinding maybe
18:39<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
18:40<Samu>hmm
18:40<LordAro>profiling your own AI is up to you
18:40<LordAro>the game can't do it for you
18:40<LordAro>(well it could, but it doesn't)
18:41<LordAro>also, learn to ask better questions
18:41<LordAro>highlighting people at 23:30 with "halp" isn't very considerate
18:41<LordAro>or useful
18:41<Samu>heh, sorry
18:43<Samu>profiling, that means, disabling parts?
18:43<Samu>see where it's originating from
18:44<Samu>I can do that during management
18:44<LordAro>not necessarily disabling parts
18:44<LordAro>but measuring parts
18:46<nielsm>gn
18:53-!-Wacko1976 [~IceChat9@027-161-128-083.dynamic.caiway.nl] has quit [Ping timeout: 480 seconds]
18:54-!-nielsm [~nielsm@176-23-103-56-cable.dk.customer.tdc.net] has quit [Ping timeout: 480 seconds]
18:59<Samu>i found the culprit!
18:59<Samu> routeManager.m_townRouteArray[i].sellVehiclesInDepot();
19:01<Samu>or maybe I didn't
19:01<Samu>let me disable this one too
19:08<Samu>it wasn't it
19:08<Samu>:(
19:11<Samu>aha, now I got it for real
19:11<Samu>if(MAX_TOWN_VEHICLES < routeManager.getRoadVehicleCount()) {
19:13-!-sushibear [~SushiBear@176-204-50-84.dyn.estpak.ee] has quit []
19:15<Samu>problem solved
19:20<Samu>https://imgur.com/C0vMAJu
19:20<Samu>no more huge stalls
19:31-!-snail_UES_ [~snail_UES@cpe-98-14-137-148.nyc.res.rr.com] has joined #openttd
19:31-!-snail_UES_ is "Jacopo Coletto" on #openttd
20:46-!-Samu [~oftc-webi@pa4-84-91-142-34.netvisao.pt] has quit [Quit: Page closed]
20:52-!-HerzogDeXtEr [~farci@dslb-188-103-230-209.188.103.pools.vodafone-ip.de] has quit [Read error: Connection reset by peer]
21:23-!-rocky113844 [~rocky1138@104.158.175.150] has quit [Ping timeout: 480 seconds]
21:29-!-Supercheese [~Superchee@cpe-98-146-230-183.natnow.res.rr.com] has quit [Read error: Connection reset by peer]
21:30-!-Supercheese [~Superchee@cpe-98-146-230-183.natnow.res.rr.com] has joined #openttd
21:30-!-Supercheese is "Supercheese" on #openttd
21:53-!-Flygon [~Flygon@124-148-188-30.dyn.iinet.net.au] has joined #openttd
21:53-!-Flygon is "Flygon" on #openttd
22:39-!-Flygon_ [~Flygon@124-148-188-30.dyn.iinet.net.au] has joined #openttd
22:39-!-Flygon_ is "Flygon" on #openttd
22:46-!-Flygon [~Flygon@124-148-188-30.dyn.iinet.net.au] has quit [Ping timeout: 480 seconds]
23:02-!-glx [kvirc@000128ec.user.oftc.net] has quit [Quit: Bye]
23:29-!-Flygon__ [~Flygon@124-148-188-30.dyn.iinet.net.au] has joined #openttd
23:29-!-Flygon__ is "Flygon" on #openttd
23:37-!-Flygon_ [~Flygon@124-148-188-30.dyn.iinet.net.au] has quit [Ping timeout: 480 seconds]
23:49-!-haudrauf [~haudrauf2@00021656.user.oftc.net] has quit [Ping timeout: 480 seconds]
23:51-!-haudrauf [~haudrauf2@p200300C35F0C8F00CC325530C09DA01D.dip0.t-ipconnect.de] has joined #openttd
23:51-!-haudrauf is "Haudrauf" on #openttd #frickelplatz @#ffod @#ffnord @#ffki @#ffhl @#ffhh @#fffl #cryptoparty @#ccchh @#ccc.do
---Logclosed Mon Sep 17 00:00:53 2018