Log for #openttd on 8th April 2018:
Times are UTC Toggle Colours
01:11:56  *** Thedarkb has joined #openttd
01:13:56  *** Pikka has joined #openttd
01:19:51  <supermop> yo pikka
01:28:03  <Pikka> yoyo supermop
01:28:12  *** HerzogDeXtEr has quit IRC
01:28:54  <supermop> playing the game and not even testing RVs for once
01:31:09  <Pikka> o/
01:40:58  *** Flygon has joined #openttd
01:41:48  *** gelignite_ has joined #openttd
01:49:11  *** gelignite has quit IRC
01:50:45  *** chomwitt has quit IRC
01:50:48  *** Supercheese has quit IRC
02:00:07  *** gelignite_ has quit IRC
02:31:47  *** muffindrake1 has joined #openttd
02:33:39  *** muffindrake has quit IRC
02:43:30  *** Supercheese has joined #openttd
03:17:08  *** glx has quit IRC
05:15:42  *** Alberth has joined #openttd
05:15:42  *** ChanServ sets mode: +o Alberth
05:16:04  <Alberth> o/
05:25:06  *** supermop has quit IRC
05:25:10  *** Wacko1976 has quit IRC
05:46:01  *** Cubey has quit IRC
05:54:25  *** andythenorth has joined #openttd
05:58:56  <andythenorth> o/
06:00:03  <Alberth> moin andy
06:00:29  <Alberth> speedy pax horses eh?
06:01:24  <andythenorth> wild horses
06:01:45  <Alberth> ah, hence the red colour :)
06:06:07  <andythenorth> is Pikka?
06:06:09  <andythenorth> yes is
06:06:21  <Pikka> isn't it
06:06:28  <andythenorth> is your AI outdated? o_O
06:06:39  <Pikka> my local copy isn't
06:06:52  <Pikka> although it doesn't do sams yet
06:06:53  <andythenorth> foums
06:06:58  <Pikka> yes, I saw
06:07:01  <andythenorth> I shouldn't
06:07:04  <andythenorth> anyway
06:07:21  <andythenorth> Horse has just 2 brakevans for the whole game
06:07:33  <Pikka> is it enough?
06:07:54  <andythenorth> probably 2 more than is needed
06:08:03  <andythenorth> how can your AI use them?
06:08:14  <Flygon> But brakevans are cute!
06:08:59  <Alberth> make a train set consisting of just brakevans?
06:08:59  <Pikka> it could make assumptions about brakevans
06:09:10  <Pikka> but it won't :P it only builds short trains anyway, doesn't need them.
06:10:19  <andythenorth> what if brakevan + engine were built with the multi-headed engines trick?
06:10:27  <andythenorth> then there would always be brakevans :P
06:10:32  <Pikka> yes
06:10:36  * andythenorth doesn't think it's good
06:11:04  <Pikka> the worst of all possible features
06:11:10  <Supercheese> breakvans
06:11:12  <andythenorth> terrible
06:11:14  <Supercheese> brokevans
06:11:20  <andythenorth> cabeese
06:11:40  <andythenorth> ok so BAD FEATURE: brake van livery matches engine
06:12:12  <Alberth> :)
06:12:49  <Alberth> brakevan would obviously not work if it has the wrong colour :p
06:16:14  <andythenorth> :P
06:16:20  <andythenorth> it's auto-magic
06:17:46  <andythenorth> it's super-realistic also
06:20:40  *** Supercheese has quit IRC
06:21:31  *** sla_ro|master has joined #openttd
06:24:50  <andythenorth> adding BAD FEATURES is a great way to avoid drawing sprites :P
06:25:18  <Pikka> yes
06:29:20  <andythenorth> probably don't need a brake van on the mail train though eh?
06:29:54  <Pikka> yes
06:30:02  <Pikka> brake vans on everything
06:30:27  <andythenorth> hover brake vans?
06:49:11  <Pikka> yes
06:50:46  <andythenorth> coffee first
06:50:56  <andythenorth> Pikka: how about a GS? o_O
06:51:04  <Pikka> possibly
06:51:05  <andythenorth> now that you know sqrl
06:51:12  <Pikka> but GS that does what?
06:51:26  <andythenorth> either story-based scenario
06:51:29  <andythenorth> or arbitrary goals
06:51:34  <andythenorth> Bee works
06:51:35  <Pikka> yes
06:51:39  <Pikka> I've thought about it
06:51:39  <andythenorth> Silicon Valley works
06:52:01  <Pikka> maybe once industry set etc
06:52:03  <andythenorth>
06:53:05  <andythenorth> probably blah blah blah
06:53:26  * andythenorth back to cabeese
07:00:10  *** sim-al2 is now known as Guest2528
07:00:11  *** sim-al2 has joined #openttd
07:04:06  *** Guest2528 has quit IRC
07:08:19  <andythenorth> how many caboose liveries? o_O
07:10:21  <Alberth> 100 goals story looks much more feasible :p
07:10:28  <andythenorth> yair
07:10:43  <andythenorth> I had the idea of a sub-goal that messes with your money
07:11:15  <andythenorth> or keeps track of 'personal fortune' which you have to extract from the company
07:11:34  <andythenorth> Railroad Tycoon 3 was barely about trains
07:11:48  <andythenorth> it was almost entirely about how to manipulate investors and the share price
07:11:50  <andythenorth> to make personal money
07:12:44  <andythenorth> it was much less evil than it sounds :)
07:14:04  *** Zexaron has joined #openttd
07:18:53  <Alberth> "donate XXX million to charity" would be good way for that, I think
07:19:55  <Alberth> hmm, I guess you're paid with some salary in RT3 then?
07:21:59  <Alberth> option to increase monthly salary by fixed amount, and have the goal of reaching XXX million collected
07:22:57  <Alberth> would work for all the competitive players :)
07:24:20  <andythenorth> in RT3 you buy and sell stock in your own company
07:24:29  <andythenorth> and there are dividends
07:24:37  <andythenorth> so you can funnel money to own account
07:25:30  <andythenorth> and you can short-sell shares in your own company
07:25:38  <andythenorth> which is probably highly illegal IRL :D
07:37:33  * Pikka -> family dindins, bbl
07:37:36  *** Pikka has quit IRC
07:38:46  *** Progman has joined #openttd
07:39:02  <Alberth> hmm, dividends, you could perhaps make it all in a GS if you wanted
07:48:40  <andythenorth> not sure the UI gives enough control
07:48:45  <andythenorth> I think it has a yes/no dialog?
08:00:19  <TrueBrain> bad LordAro .. not rebasing .. now you dont have a Jenkinsfile ! :D
08:09:51  <LordAro> ha
08:11:53  *** Wolf01 has joined #openttd
08:12:34  <Wolf01> o/
08:12:46  <TrueBrain> 145 euro to upgrade to Windows 10 Pro ... wwwuutttthhhh
08:13:12  <Alberth> o/
08:14:04  *** chomwitt has joined #openttd
08:15:20  <Wolf01> Meh, why do I always forget to launch screen before long tasks?
08:16:48  <Alberth> do it always
08:17:22  <Alberth> or fold long tasks in a script and start it there
08:23:38  <andythenorth> hmm
08:24:05  <andythenorth> 4/8 caboose is limited scope for different liveries :P
08:24:14  <andythenorth> even limited for different shapes, as it's symmetrical
08:33:01  *** chomwitt has quit IRC
08:36:37  <Wolf01> Back to git...
08:43:47  <Wolf01> How does the switch of branch work via console?
08:44:42  <andythenorth> git co?
08:44:49  <andythenorth> git branch [name]
08:44:51  <andythenorth> for a new one
08:44:56  <andythenorth> git co [name]
08:45:00  <andythenorth> switches
08:45:17  <andythenorth> 'co' might not work, you might need 'checkout'
08:45:38  <andythenorth> I have some git magic that was added to my system, not by me :P
08:45:49  <Wolf01> Did I already say that git is confusing?
08:46:26  <Wolf01> Luckily VS allows to do most of the things with double click
08:48:01  <Eddi|zuHause> <Wolf01> Meh, why do I always forget to launch screen before long tasks? <-- put screen in your bash profile?
08:48:12  <andythenorth> we use this at work
08:48:31  <andythenorth> it was added to my local config when we switched to git
08:48:41  <andythenorth> and I've never had the frustrations that some people get
08:48:48  <Wolf01> I should already fix screen to not need to be launched with sudo
08:49:07  <Wolf01> s/already/also
08:49:26  <Wolf01> My fingers are writing what they want
08:49:48  <andythenorth> I've also got this in my .bash_profile
08:49:58  <andythenorth> the 'show branch in prompt' is insanely useful
08:50:18  *** Alberth has left #openttd
08:50:33  <Wolf01> Heh, indeed
08:51:25  <Wolf01> Second branch sync-ed with OTTD_Depr
08:52:02  <Wolf01> 90% of the time is pushing :|
08:58:51  <andythenorth> dunno about random caboose cars
08:58:52  <andythenorth>
08:59:00  <andythenorth> seems like they should always look same
09:00:29  <andythenorth> think I delete that code
09:01:16  <andythenorth> bbl
09:01:17  *** andythenorth has quit IRC
09:01:17  <Wolf01> Also delete the pink pixels on the wheels
09:01:21  <Wolf01> Heh
09:05:25  <TrueBrain> my Docker image names are getting a bit long ... openttd/compile-farm:release-linux-deb-gcc-debian-stretch-amd64
09:05:43  <TrueBrain> guess I can drop linux-deb
09:05:45  <TrueBrain> but pfffff
09:12:28  <LordAro> ha
09:20:02  <peter1138> Hmm, pub opening times... "8.30 til Close"
09:20:07  <peter1138> Yeah... so when is Close? o_O
09:20:12  <TrueBrain> 8.29, duh
09:20:24  <TrueBrain> the worst you can do asking a pub owner: when do you close
09:20:27  <TrueBrain> they get really mad if you try :D
09:29:22  <Rubidium> that sounds like quite a short time of being open; after all in the UK in this time of the year I'd expect them to close (the door) pretty quickly after opening (the door)
09:32:13  <Eddi|zuHause> that sounds doable in 8.3 seconds?
09:35:19  <Wolf01> bah 15 minutes to push :|
09:36:29  <LordAro> Wolf01: what
09:36:35  <TrueBrain> what are you trying to push ... :o
09:36:58  <Wolf01> Dunno... my connection seem to work, but it's completely broken
09:37:11  *** sim-al2 has quit IRC
09:37:33  <Eddi|zuHause> @calc 5*60*15/1024
09:37:33  <DorpsGek> Eddi|zuHause: 4.39453125
09:37:39  <Wolf01> 310ms ping and 3Mbps, but even the web pages take 10-15 seconds to start showing anything
09:37:46  <Eddi|zuHause> 4MB at 5kB/s?
09:38:24  <Wolf01> I think the up bandwidth is dead
09:38:36  *** FLHerne has joined #openttd
09:39:15  <Wolf01> BTW, 1 hour after I finished to sync my branches... pushing the last one
09:39:31  <Wolf01> Now, rebase
09:39:50  *** frosch123 has joined #openttd
09:39:58  <LordAro> oh yes, i can remove my deprecated fork now
09:40:13  <Wolf01> Quak
09:40:43  *** Wormnest has joined #openttd
09:47:02  <Wolf01> "Cannot make directory '/var/run/screen': Permission denied" <- how to get rid of this? I already tried with "sudo /etc/init.d/screen-cleanup start" but it comes out after each startup
09:47:24  <Wolf01> (ubuntu)
09:47:52  <LordAro> probably delete the directory
09:48:00  <frosch123> TrueBrain: how was the compile farm triggered for the pr?
09:48:04  <LordAro> and maybe recreate it yourself
09:49:36  <TrueBrain> frosch123: I have a bit hard time processing that question?
09:50:03  <frosch123> arolard opened the pr 10 hours ago, but the farm built it 7 minutes ago
09:50:17  <Wolf01> LordAro: it deletes the directory after every restart
09:50:20  <TrueBrain> yes; you should ask him why he failed :)
09:50:36  <TrueBrain> it was a local issue :D
09:51:01  <LordAro> frosch123: i rebased it
09:51:03  <TrueBrain> (he changed the parent of his commit in those 10 hours .. :D)
09:51:22  <TrueBrain> any PR without a Jenkinsfile is ignore (and cannot be merged, ofc)
09:51:50  <frosch123> ah, jenkinsfile needed
09:52:11  <TrueBrain> and I hope today to finish a CI target that validates you are on master
09:52:51  <Wolf01> heh :|
09:53:02  <TrueBrain> well, GitHub already validates that, I guess
09:53:03  <LordAro> and #6690 got autoclosed :)
09:53:08  <LordAro> thanks frosch123
09:53:28  <LordAro> now i'm actually a contributor to ottd ^^
09:53:35  <TrueBrain> finally! :P
09:53:42  <peter1138> BACKDOORED
09:53:49  <TrueBrain> that was his goal all along
09:54:08  <TrueBrain> and I am creating a clang CI docker :D
09:54:26  <frosch123> yay, now i can finally sit in the sun and just press "rebase+merge" on my phone every now and then
09:55:47  <michi_cc> TrueBrain: When will DorpsGek report merged pull requests? :p
09:56:19  <frosch123> i should setup the repo for the hooks
09:56:23  <frosch123> then you can make a pr for it
09:56:27  <TrueBrain> michi_cc: good idea, but currently no :)
09:57:08  <LordAro> i've seen it done before, i think github do a thing
09:57:13  <LordAro> lemme see if i can find something
09:59:13  <LordAro> TrueBrain:
09:59:52  <LordAro> can't get DorpsGek to do it, but...
10:00:01  <LordAro> well, you could specify nick
10:00:03  <LordAro> maybe you could
10:01:19  <TrueBrain> I added something
10:01:59  <TrueBrain> it joined and left :D
10:02:44  *** Zexaron has quit IRC
10:02:44  <TrueBrain> clang throws a lot ofwarning, pfff
10:02:52  <Wolf01> Uhm, I get a conflict on makefile.libdetection..., was it deleted?
10:06:08  <TrueBrain> okay, their IRC thing is weird
10:06:12  <TrueBrain> it joins the IRC network on any activity
10:07:33  <TrueBrain> so that is possible, but slow and with a bit of noise for channel joining
10:07:39  <TrueBrain> cant be bothered to lookup chanserv credentials :P
10:09:16  *** HerzogDeXtEr has joined #openttd
10:09:43  <Wolf01> I can't understand what it's going on... merging the new branch with the old deprecated master shows no changes, on rebase it conflicts on multiple places
10:09:55  <TrueBrain> did you rebase onto?
10:10:11  <Wolf01> Yes
10:10:30  <TrueBrain> weird
10:10:33  <TrueBrain> cherry-pick!
10:10:36  <TrueBrain> or what frosch123 said!
10:10:47  <Wolf01> But not from cli, cli continues to tell me I have unstaged changes
10:11:25  <Wolf01> But I made the branch and published it, perfectly sinc-ed with master
10:11:31  <Wolf01> *sync
10:11:41  *** gelignite has joined #openttd
10:12:10  <TrueBrain> git status always shows unstaged changes
10:12:34  <Wolf01> Mmmh
10:12:43  <LordAro> Wolf01: yeah, that's as far as i got
10:12:50  <Wolf01> A lot of unstaged changes... but I already committed those
10:12:53  <LordAro> i resorted to cherry-picking a range instead
10:13:06  <TrueBrain> so, GitHub notifications can be found in #openttd.notice!
10:13:10  <TrueBrain> so, GitHub notifications can be found in #openttd.notice !
10:13:12  <TrueBrain> :)
10:13:55  <LordAro> butbut that's not here
10:14:24  <TrueBrain> I can also add that; lets just first test it in another channel
10:14:29  <TrueBrain> see how spammy it is / isnt
10:15:08  <LordAro> :p
10:16:27  <TrueBrain> okay, clang-ci works .. now I just have to rebuild all my images :D
10:17:26  <TrueBrain> next would be to see where frosch123 is pushing is pre-commit check scripts :D
10:17:53  *** Xaroth has joined #openttd
10:17:57  <TrueBrain> GO AWAY
10:18:00  <TrueBrain> @kick Xaroth GO AWAY
10:18:00  *** Xaroth was kicked by DorpsGek (GO AWAY)
10:18:10  *** Xaroth has joined #openttd
10:18:14  <Xaroth> ....
10:18:31  <frosch123> #openttd.notice <- haha, i forgit that place existed
10:18:31  <TrueBrain> best laugh I had all day :)
10:19:12  <Xaroth> TrueBrain: You are not difficult to please.
10:19:19  <TrueBrain> LordAro: bit an issue with IRC thing is, you need to allow external message, or you see someone joining/leaving all the time ... ugh
10:19:25  <TrueBrain> Xaroth: that's what she said
10:20:16  <LordAro> TrueBrain: yeah, it's not ideal
10:20:25  <LordAro> i guess using DorpsGek's user/pass wouldn't work?
10:20:32  <LordAro> i've never tried to connect multiple times
10:20:46  <Wolf01> Mmmh, stupid .suo file
10:20:48  <LordAro> oh, it'd ghost the actual bot, wouldn't it?
10:21:12  <TrueBrain> LordAro: that would kick DorpsGek from the network, and doesnt help :)
10:21:17  <TrueBrain> it still would have to join the channel
10:21:30  <Eddi|zuHause> TrueBrain: have it message DorpsGek, and he relays it onto the channel?
10:21:31  <TrueBrain> GitHub IRC thing is just not a persistant bot
10:21:45  <TrueBrain> "message" in this case means implementing an API endpoint :)
10:21:55  <TrueBrain> but looking at many other GitHub projects
10:22:01  <TrueBrain> I think we will have a GitHub bot sooner or later anyway
10:22:07  <TrueBrain> as many things become easier if you do ..
10:25:55  <TrueBrain> who wants to review Dockerfile changes? :)
10:26:03  <TrueBrain> I apoint LordAro!
10:26:11  <Xaroth> I second that.
10:26:14  <TrueBrain>
10:28:13  <LordAro> aah
10:31:08  <TrueBrain> yeah, you keep saying you want to contribute; so contribute! :P
10:31:19  <LordAro> *fine*
10:32:12  <Eddi|zuHause> somehow i just imagine TrueBrain to stand behind LordAro with a whip, and having it snap after saying that sentence
10:32:29  <TrueBrain> I am happy that came across over the interwebz :)
10:33:56  <Xaroth> Eddi|zuHause The correct term is "Voluntold".
10:35:58  *** Thedarkb has quit IRC
10:36:29  <TrueBrain> hmmmmmmm .. I can make my commit smaller by using a build-arg
10:36:33  <TrueBrain> *fixes*
10:41:27  <Wolf01> Is there a way to hide all the default OTTD branches?
10:43:03  *** Pikka has joined #openttd
10:43:08  <TrueBrain> no clue; they are all prefixed
10:44:19  <Wolf01> BTW I think I manages to rebase one branch
10:44:26  <Wolf01> *managed too
10:45:20  <Wolf01> Mmmh, no changes
10:45:29  <Wolf01> WTF
10:46:39  <Wolf01> "where" did it apply the commits then?
10:47:26  <Wolf01> Master, I suppose
10:47:38  *** Thedarkb has joined #openttd
10:48:27  <Wolf01> Nah... lost in space
10:48:35  <peter1138> You can remove the branches if you don't want them.
10:49:12  <TrueBrain> LordAro: wheezy-gcc means what-ever is latest in gcc
10:49:30  <TrueBrain> I do, how-ever, agree with the CI variant
10:50:36  *** iSoSyS has joined #openttd
10:53:41  <Eddi|zuHause> still unsure whether i should invest in getting some CK2 expansions :/
10:59:07  <Wolf01> I can't understand if cherry-pick lost english.txt changes
11:00:47  <Wolf01> Cherry-pick works but misses changes, rebase works but changes disappear, merge shows 190 conflicts
11:01:06  <Wolf01> Am I stupid or what?
11:01:30  <peter1138> Weeeellll
11:01:59  <LordAro> Wolf01: cherry-pick misses changes?
11:02:14  <Wolf01> I got the changes for the openttd code but not the string
11:02:19  <Wolf01> *strings
11:02:25  <TrueBrain> what is your fork Wolf01?
11:02:35  <Wolf01>
11:03:03  <TrueBrain> lets see in what stage your stuff is :D
11:04:23  <TrueBrain> owh, merges .. that explains :D
11:04:28  <TrueBrain> you synced your fork with merges
11:04:37  <TrueBrain> I always assume people do it with rebases
11:04:40  <TrueBrain> merges works too
11:04:43  <Wolf01> I always do it
11:04:47  <TrueBrain> but .. it is a bit more tricky I guess
11:05:17  <Wolf01> Is there a better way?
11:05:30  <TrueBrain> I always rebase; I hate merge commits
11:05:32  <Wolf01> I'm a bit SVN-ish
11:05:33  <TrueBrain> they make my head spin
11:05:49  <peter1138> Merge is good but not when the base repo changes under you
11:06:06  <TrueBrain> merge is never good :(
11:06:16  <peter1138> You may be better off with a new clone and cherry-picking the original commits.
11:06:46  <TrueBrain> Wolf01: what I just did and seems to work
11:06:54  <TrueBrain> git log deprecated/master..deprecated/game-state
11:07:00  <TrueBrain> this show me 3 commits; 1 sync, and 2 real commits
11:07:04  <TrueBrain> then I did:
11:07:09  <TrueBrain> git checkout origin/master -b game-state
11:07:17  <TrueBrain> git cherry-pick <ids of the two commits, oldest first>
11:07:59  <Wolf01> I'll try
11:08:20  *** synchris has joined #openttd
11:09:00  <peter1138> i7 8700k is pretty quick to compile openttd, but nothing like the days when it was in C ;)
11:09:53  <peter1138> Why did I have a branch that extends railtypes to 32...
11:10:01  <TrueBrain> Wolf01: it does miss the diff you resolved with the merge btw, so you lose a bit of content there
11:10:21  <peter1138> Yeah... merges...
11:11:16  <TrueBrain> Wolf01: the biggest issue with merges like this, is that creating a PR is very difficult. OpenTTD demands that your PR is "rebased", meaning your commits should fit on top. With merges this won't work.
11:11:26  <TrueBrain> what the other approach is, when you are updating to the latest master, is doing:
11:11:30  <TrueBrain> git rebase upstream/master
11:11:40  <TrueBrain> this will rewind your commits one by one on top of the new master
11:11:44  <TrueBrain> (and asks you to resolve commits)
11:11:52  <TrueBrain> just for a bit of understanding (I hope :D)
11:11:59  <Wolf01> Ok
11:14:22  <TrueBrain> the other syntax that works for a few of your branches at least:
11:14:33  <TrueBrain> git rebase --onto origin/master deprecated/master deprecated/notdocks
11:14:44  <TrueBrain> (first do: git checkout origin/master -b notdocks)
11:15:09  <TrueBrain> only improved-trees fails this way
11:15:25  <TrueBrain> but that branch is a bit weird to start with :D
11:15:56  <TrueBrain> but given there is only one real commit, you can do there: git diff deprecated/master..deprecated/improves-trees > temp.patch
11:15:59  <TrueBrain> and apply that patch
11:16:03  <TrueBrain> (it will have conflicts you have to resolve)
11:16:29  <TrueBrain> ah, no, it cleanly applies
11:17:20  <TrueBrain> as far as I can tell, really only your improved-trees is a problem; rest can either be rebased, cherry-picked, or frosch123' method
11:20:20  <Wolf01> With cherry-pick I still miss translation strings O_O
11:21:09  <TrueBrain> for which branch?
11:21:46  *** andythenorth has joined #openttd
11:21:47  <Wolf01> terraform-tools
11:26:16  <TrueBrain> if I use the rebase --onto technique
11:26:20  <TrueBrain> I have no diff between the two branches
11:26:25  <TrueBrain> which translation string are you missing?
11:27:33  <frosch123> what? there is no "git cp"?
11:30:50  *** Wacko1976 has joined #openttd
11:32:09  <Wolf01> Mmmh, It won't even let me merge it from VS
11:32:13  <Wolf01> *cherry-pick
11:33:45  *** Wormnest has quit IRC
11:35:55  <TrueBrain> git checkout origin/master -b terraform-tools-2 && git rebase --onto origin/terraform-tools deprecated/master deprecated/terraform-tools
11:36:14  <TrueBrain> that gives me a branch which is based on origin, with the same content als deprecated
11:37:15  <TrueBrain> (the -2 was just to avoid overwriting an existing branch)
11:37:31  <TrueBrain> I btw assume that origin is OpenTTD and deprecated is OpenTTD-Deprecated OF YOUR FORK
11:37:49  <Wolf01> "fatal: Needed a single revision"
11:37:59  <TrueBrain> what ... git version .. are you using?
11:38:01  <TrueBrain> (git --version)
11:38:10  <Wolf01> 2.7.4
11:38:16  <TrueBrain> same
11:39:03  <Wolf01>
11:39:07  <TrueBrain> oops
11:39:08  <TrueBrain> my bad
11:39:14  <TrueBrain> git checkout origin/master -b terraform-tools-2 && git rebase --onto origin/master deprecated/master deprecated/terraform-tools
11:39:58  <TrueBrain> ah, that also detaches .. so ..
11:40:04  <TrueBrain> git checkout origin/master -b terraform-tools-2 && git rebase --onto origin/master deprecated/master deprecated/terraform-tools && git checkout -b terraform-tools-3
11:40:10  <TrueBrain> guess the first checkout is not needed :)
11:40:45  <TrueBrain> indeed, that is not needed; but doesnt hurt :P
11:43:21  <Wolf01> Ok, that worked, could I call -3 with the right name?
11:43:33  <Wolf01> And publish that?
11:44:38  <TrueBrain> yes
11:45:00  <TrueBrain> git rebase --onto origin/master deprecated/master deprecated/terraform-tools && git checkout -b terraform-tools
11:45:03  <TrueBrain> I guess should do the trick
11:47:05  <TrueBrain> LordAro: I did my best to deduplicate
11:47:37  <LordAro> :>
11:47:48  <TrueBrain> gcc '6' is not optiomal, but it is what debian does
11:47:50  <TrueBrain> it is 6.3 ..
11:49:10  <Wolf01> Terraform tools seem ok, trying with transparency-ui now
11:50:30  <Wolf01> Worked, no missing translations
11:50:39  <LordAro> TrueBrain: of course, my review isn't relevant :p
11:51:03  <TrueBrain> ?
11:51:10  <TrueBrain> argh, gcc-6 doesnt create a gcc symlink
11:51:13  <TrueBrain> annoyyyiiinngggg
11:51:59  <TrueBrain> that is what 'gcc' brings to the table ..
11:53:30  <LordAro> "At least 1 approving review is required by reviewers with write access."
11:53:40  <TrueBrain> ah :D
11:53:54  <TrueBrain> okay, installing the specific version is more annoying than I expected :(
11:54:12  <LordAro> set CC/CXX vars?
11:54:25  <TrueBrain> but then I need knowledge of what package is installed
11:54:28  <TrueBrain> I was trying to avoid that :)
11:54:58  <LordAro> hack /etc/profile ? :p
11:55:17  <TrueBrain> again, still
11:55:20  <TrueBrain> I now have a packages list
11:55:21  <LordAro> mm
11:55:24  <TrueBrain> gcc-6 for example
11:55:25  <TrueBrain> which is nice
11:55:34  <TrueBrain> but ... it doesnt register itself with alternatives
11:55:37  <TrueBrain> which is what I did expect
11:56:50  <TrueBrain> weird .. I assumed that was what alternatives were for
11:56:54  <TrueBrain> now I have to register them myself ..
11:57:16  <LordAro> not totally awful...
11:57:50  *** Thedarkb has quit IRC
12:00:00  <andythenorth> so NRT fork will need rebased eh?
12:00:25  <LordAro> hype
12:01:59  <Wolf01> There I should have some unpublished branches :P
12:02:08  <TrueBrain> gratz
12:02:26  <TrueBrain> looks good
12:02:45  * LordAro watches the network graph get more complicated
12:02:47  <Wolf01> Ok, published all the branches
12:03:13  <Wolf01> Now I'll try to sync the 2 commits from base without merge
12:05:08  <LordAro> oh yeah, all the $Id$ comments can be removed
12:07:49  *** Thedarkb has joined #openttd
12:07:56  <Wolf01> So, if I understood correctly, I need to make a remote to base, and then rebase --onto origin/master base/master?
12:08:34  <TrueBrain> normally you dont need to use onto
12:08:36  <TrueBrain> you can just do
12:08:41  <TrueBrain> git fetch upstream
12:08:45  <TrueBrain> git rebase upstream/master
12:08:53  <TrueBrain> (where upstream is
12:09:04  <TrueBrain> git remote add upstream
12:09:06  <TrueBrain> if you dont have it yet
12:09:17  <TrueBrain> you have to do that for every branch
12:09:27  <TrueBrain> so first do something like: git checkout terraform-tools
12:12:49  <Wolf01> Mmmh
12:13:49  <Wolf01> I have 2 commits in pull which are mine, and 4 commits in push, 2 of them are mine (the same 2 of the pull)
12:14:14  <LordAro> quite a lot of stuff you can do with this
12:14:25  <LordAro> although you still need to set up your config yourself
12:15:22  <TrueBrain> LordAro: new attempt on getting this CI stuff right .. still not happy .. but at least it works :P
12:16:14  *** sla_ro|master has quit IRC
12:16:34  <LordAro> TrueBrain: gcc=4:6.* ?
12:16:40  <LordAro> what's that 4 doing there?
12:16:51  *** supermop has joined #openttd
12:16:54  <LordAro> oh, epoch?
12:17:02  <TrueBrain> no clue
12:17:05  <TrueBrain> ask Debian :D
12:17:16  <TrueBrain> (honestly no clue .. )
12:18:49  <LordAro> i think it's epoch - for when they need to downgrade a package for whatever reason
12:18:58  <LordAro> i.e. something more major than major
12:19:07  <TrueBrain> lol
12:19:12  <LordAro> arch does the same
12:22:10  <TrueBrain> now first building all the images; but this should allow us to at least get some clang reports :)
12:22:48  <TrueBrain> frosch123: how are you doing with the pre-commit stuff? :)
12:23:42  *** Thedarkb1 has joined #openttd
12:25:52  <supermop> why do lime kilns always end up on top of mountains
12:26:06  <frosch123> TrueBrain: checking messages works fine
12:26:16  <frosch123> git default whitespace check does not check enough tab madnesss
12:26:53  *** Thedarkb has quit IRC
12:27:25  <TrueBrain> lol
12:29:23  <LordAro> frosch123: ooh, gitattributes has the ability to show up bad whitespace
12:30:37  <frosch123> i know about "core.whitespace trailing-space,space-before-tab,indent-with-non-tab"
12:30:43  <frosch123> but those do not check for \t within a line
12:31:06  <LordAro> ah, well that's all i've got :>
12:31:55  <andythenorth> supermop: so it's easy to get the lime down hill
12:31:59  <andythenorth> just add it to a river
12:32:17  <supermop> and the rocks up the hill?
12:32:20  <andythenorth> yeah
12:32:28  <andythenorth> well mountains are made of rock eh?
12:33:08  *** chomwitt has joined #openttd
12:34:02  <supermop> if the quarries or limestone mines also spawned up there that would be a bit more believable
12:34:42  <supermop> waiting for ai to start, trying to avoid playing the game myself
12:44:09  <Pikka> o/
12:45:00  <andythenorth> lo bird
12:45:56  <Pikka> lo andy
12:46:13  <andythenorth> such cabeese
12:46:26  <Pikka> cabosen
12:46:34  <andythenorth> no testing yet, soz
12:47:17  <Pikka> that's fine, just interested to see if it works okay on other people's settings. just sent an update btw
12:47:24  <andythenorth> ta
12:47:33  <andythenorth> I can leave a game running, I have many ottd binaries :P
12:47:51  <andythenorth> but then it will crash when I change grfs under it :P
12:48:32  <Pikka> as long as it's just the game that crashes and not the AI, I'm happy
12:48:45  <Pikka> supermop, if you're literally waiting for it to start, "startai" in the console ;)
12:48:51  *** Thedarkb1 has quit IRC
12:53:30  <supermop> Pikka: crashed, can't find library 'pathfinder.road' with version 4
12:54:00  <frosch123> TrueBrain: <- that's the status so far
12:54:10  <frosch123> i am now adding a custom python script instead of the default whitespace checks
12:54:38  <TrueBrain> including tests :o
12:54:58  <Pikka> supermop, you'll need the road pathfinder from bananas
12:55:08  <Pikka> and the rail pathfinder too
12:55:20  <frosch123> TrueBrain: do you expect me to write scripts without syntax errors? :o
12:57:02  <TrueBrain> what does 'update' do?
12:57:14  <frosch123> that's the server side hook
12:57:40  <frosch123> it iterates over all pushed commits and reruns the normally client-side pre-commit and commit-msg hooks
12:58:02  <frosch123> it also checks for deleting tags and stuff, which i just copied from the default sample hook
12:58:09  <TrueBrain> complicated :D
12:58:26  <TrueBrain> but please add a comment on top explaining what it does :P Its a mistery script now :D
12:58:46  *** FLHerne has quit IRC
12:59:03  *** FLHerne has joined #openttd
12:59:04  <frosch123> <- should i not have removed those comments?
12:59:24  <supermop> ok it made some buses
12:59:45  <Pikka> o/
13:00:04  <TrueBrain> frosch123: it would have helped me to have at least the first part there :D
13:00:06  *** Thedarkb1 has joined #openttd
13:00:18  <TrueBrain> "based on" is not really helping me, as I dont know which version etc :)
13:01:00  <TrueBrain> so if I would to make a Docker which runs update origin/master HEAD
13:01:06  <TrueBrain> it checks the full PR?
13:02:13  <frosch123> hmm, let me split that part to a separate file
13:04:39  <TrueBrain> what I personally always really like in hooks
13:04:43  <TrueBrain> if you have a folder with the scripts
13:04:49  <TrueBrain> and something like: pre-commit
13:04:51  <TrueBrain> only calling the scripts
13:05:00  <TrueBrain> as it can become pretty messy without it
13:05:09  <TrueBrain> for example, you do a git diff-index check, but it is a bit hidden now :D
13:07:24  *** FLHerne has quit IRC
13:08:07  *** sim-al2 has joined #openttd
13:09:32  <TrueBrain> LordAro: you said to me that clang worked on OpenTTD ... SO MANY WARNINGS :P
13:09:47  <TrueBrain> unused typedef, ironicly
13:09:52  <TrueBrain> on every file :D
13:12:55  *** Thedarkb1 has quit IRC
13:13:14  <LordAro> really?
13:13:16  <Xaroth> Kill it with fire!
13:13:17  <LordAro> that's new
13:13:21  <TrueBrain> 3.8
13:13:22  <TrueBrain> new
13:13:24  <TrueBrain> really?
13:13:25  <TrueBrain> :D
13:13:27  <TrueBrain> assert_compile
13:13:34  *** tokai|noir has quit IRC
13:13:37  <LordAro> that's... not an issue on later versions? :p
13:13:48  <TrueBrain> so a good thing I run 3.8! :P
13:13:52  <supermop> Pikka:
13:14:03  <TrueBrain> I also think enough things are now in place for someone to create dockers per compiler version
13:14:11  <TrueBrain> to be clear, I am not going to be the one that does that
13:14:17  <TrueBrain> but there is enough infrastructure that anyone can pick that up :)
13:14:28  <andythenorth> probably TMWFTLB but eh
13:15:03  <Pikka> such cabense. for exact-length train making needs?
13:15:09  <andythenorth> exact
13:15:14  <andythenorth> I tried some variants
13:15:44  <andythenorth> horse is very tidy-minded about TL
13:15:58  <andythenorth> it bothers me now that some trains are 0.5, not integer :P
13:16:20  <andythenorth> if we'd put the grid lines at 32px, it would probably be fine :P
13:17:18  <andythenorth> Pikka: asymmetric caboose? o_O
13:17:24  <andythenorth> I keep trying them, but can't get it to look right
13:17:25  <LordAro> TrueBrain: there is an actual warning that i have fixed in my branch
13:17:55  <LordAro> the waening on 3.8 sounds like the warning flags in configure could do with tweaking
13:18:20  <TrueBrain> left or right, YOU LIED! :P
13:18:23  <TrueBrain> but CI does pass
13:18:32  <TrueBrain> I think Werror is missing :D
13:19:18  <TrueBrain> so, every commit is now checked with GCC 6 both 32bit/64bit, and Clang 3.8 (64bit only, as we already did 32bit on GCC)
13:19:19  <TrueBrain> :D
13:20:03  <TrueBrain> and I assume within a month someone made me a PR (not pointing fingers) so every week or so we can run many more GCC and Clang versions
13:20:18  <TrueBrain> frosch123: ^^ :D
13:21:07  <TrueBrain> and I really like the Squashing :D The PR keeps the original commits, so you can see very well what happened :)
13:22:16  <TrueBrain> frosch123: would you mind if I also enable squashing on OpenTTD? (so you can pick both). Requirement that PR should be up-to-date remains
13:23:09  <Xaroth> squashing puts all commits in a PR in as one, right?
13:23:16  <TrueBrain> yes
13:25:24  <frosch123> TrueBrain: sounds reasonable to allow both
13:25:37  <TrueBrain> yippie :)
13:25:41  <frosch123> makes review easier for changes which do not consist of multiple commits
13:25:47  <Rubidium> can you still bisect within the changes of a PR once it's squashed into master?
13:25:52  <TrueBrain> no
13:26:02  <TrueBrain> well, yes
13:26:03  <TrueBrain> kinda :D
13:26:09  <TrueBrain> you cannot do it via master
13:26:13  <TrueBrain> but the PR is still in git
13:26:17  <frosch123> squash is imho only for changed which should be a single commit anyway
13:26:23  <frosch123> *changes
13:26:24  <TrueBrain> yes ^^
13:26:30  <TrueBrain> it is not meant for a big new feature
13:26:46  <TrueBrain> it is like I just did with OpenTTD-CF, where I continued on the same change during the feedback
13:26:55  <TrueBrain> so you get non-sense commits like: fixing typo
13:26:56  <TrueBrain> etc
13:27:27  *** glx has joined #openttd
13:27:27  *** ChanServ sets mode: +v glx
13:27:56  <LordAro> rust does a thing where they "roll up" a load of minor pull requests into a larger one, then build that
13:28:22  <TrueBrain> Rubidium: just checked, answer is much more yes :D You can simply do a "fetch origin pull/ID/head" to get the PR in git
13:28:51  <frosch123> <- TrueBrain: you could call that with "env GIT_DIR=.git .git/hooks/ master prhead"
13:29:15  <TrueBrain> LordAro: I noticed that many that do stuff like Coverity before merging to master, do stuff like that
13:29:15  <frosch123> mind that i still want to replace the diff --check with something custom
13:29:28  <TrueBrain> where PRs during a day are stacked; then the bunch is sent to coverity, and if that passes, merged
13:30:38  <TrueBrain> frosch123: please use mktemp or a variant for tmp files
13:30:48  <TrueBrain> this is very annoying for build-farms :D No concurrency allowed ;)
13:31:01  *** Thedarkb-X40 has quit IRC
13:31:23  <TrueBrain> also, you tell me it accepts 2 params, the usage comments says 3, and the code only uses 1
13:31:28  <TrueBrain> I am heavily confused :D
13:32:29  <LordAro> TrueBrain: i can't (easily) test with clang3.8 locally, i'd have to build llvm
13:32:39  <TrueBrain> LordAro: fetch the docker!
13:32:40  <TrueBrain> :D
13:32:43  <LordAro> ;-;
13:33:45  <andythenorth> is there an OS X docker
13:33:54  <andythenorth> (to build OS X binary)?
13:33:54  <LordAro> TrueBrain: can you get jenkins to name the steps better, instead of just "docker logs --follow 98181fee552db82ba7593fa879fd03800c6feeb85fbf8c481daaacec60f6612e"
13:34:07  <TrueBrain> frosch123: also, would you mind adding a 'set -e' after '#!/bin/sh' ; if then there is an exit code in the middle of something, the script also fails (instead of silently ignoring it)
13:34:12  <TrueBrain> really helps for compile-farms
13:34:17  <TrueBrain> andythenorth: currently, no
13:34:25  <TrueBrain> LordAro: the stages are named
13:34:36  <TrueBrain> I cannot name the commands in between
13:34:44  <TrueBrain> that is the id of the docker you printed there
13:34:48  <TrueBrain> it has to be random
13:35:15  <TrueBrain> but the name of the stages are very clear, in my opinion
13:35:49  <LordAro> fair
13:35:54  * andythenorth reading
13:36:00  <TrueBrain> LordAro:
13:36:17  <TrueBrain> click Activity, then the top build
13:36:24  <TrueBrain> it even shows the paralel
13:36:36  <LordAro> yeah, that's where i was looking :)
13:36:38  <TrueBrain> andythenorth: the Docker I have build before uses osxcross
13:36:45  <LordAro> shame you can't name the commands,is all
13:36:54  <TrueBrain> why would you want to
13:36:57  <TrueBrain> read the Jenkinsfile
13:37:00  <LordAro> looks nicer!
13:37:02  <TrueBrain> much more descriptive
13:37:09  <TrueBrain> yes, your goldplating has no business here :P
13:37:16  <TrueBrain> lets keep a form of priority :D
13:37:32  <LordAro> pfft
13:41:12  *** Pikka has quit IRC
13:42:55  <andythenorth> supermop: I need 1 more variant, to go 1st or 2nd
13:42:56  <andythenorth>
13:43:11  <andythenorth> reversing a sprite to pure 2CC doesn't look good :P
13:43:15  *** Thedarkb1 has joined #openttd
13:43:22  <andythenorth> and there aren't many pixels to use :P
13:43:38  <LordAro> TrueBrain: honestly think it'd be faster for me to build llvm than to work out how docker works :p
13:43:46  <TrueBrain> your loss :)
13:44:12  <andythenorth> download docker, run docker?
13:44:18  * andythenorth hopes :|
13:44:26  <supermop> grey with cc
13:44:31  <andythenorth> maybe
13:44:36  <andythenorth> gen 1
13:44:51  <LordAro> andythenorth: it seems more complicated than that, unfortuantely
13:44:59  <LordAro> i think i managed to download the ci image, but...
13:45:08  <andythenorth> I am hoping it is like virtualbox
13:45:22  <andythenorth> virtualbox is not as good as it should be, but I can figure it out :P
13:46:41  <TrueBrain> LordAro: linux or Windows?
13:46:44  <LordAro> ooh, i have a 16.04 vagrant box sitting around
13:46:47  <LordAro> i can use that
13:46:53  <andythenorth> could do
13:46:56  <TrueBrain> Docker Toolbox is what you want
13:46:57  <TrueBrain> does that for you
13:47:00  <TrueBrain> Docker Machine
13:47:01  *** chomwitt has quit IRC
13:47:08  <TrueBrain> but yes, vagrant box works as well :P
13:47:19  <TrueBrain> or you need to have Windows 8 Pro or Windows 10 Pro
13:47:34  <TrueBrain> sucky Microsoft ... everyone has free virtualization, but Microsoft wants more money for it
13:47:36  <TrueBrain> really annoying
13:48:38  <TrueBrain> frosch123: ah, your script does work if I have 1 parameter like: origin/master..HEAD
13:50:26  <TrueBrain> frosch123: and I think (but I am not sure) that if you do 'set -e', you can remove the || exit 1 things
13:55:35  <LordAro> aha, docker exec
13:56:21  <TrueBrain> docker run :)
13:56:23  <TrueBrain> see README!
13:57:05  <LordAro> i've already done that
13:57:13  <LordAro> /usr/bin/ 14: /usr/bin/ ./configure: not found
13:57:16  <LordAro> is sad
13:57:21  <TrueBrain> so you didnt read the README
13:57:24  <TrueBrain> let me repeat what it says
13:57:28  <TrueBrain> in your working dir
13:57:32  <TrueBrain> you should have a 'source' folder
13:57:35  <TrueBrain> in that 'source' folder
13:57:39  <TrueBrain> should be the git checkout
13:57:49  <TrueBrain> now run the 'docker run' like with --id and -v pwd stuff
13:58:10  <LordAro> i see
13:58:17  <TrueBrain> always so happy if people dont read READMEs, but complain :D
13:58:27  <LordAro> it's not exactly obvious :p
13:58:36  <TrueBrain> ffs
13:58:38  <TrueBrain> how obvious can it be
13:58:38  <LordAro> i'm not interested in running releases
13:58:57  <TrueBrain> the Running CI says: IT FOLLOWS THE ABOVE CHAPTER EXACTLY
13:59:03  <TrueBrain> not reading is rarely an excuse :)
13:59:20  <TrueBrain> but sadly, this weird construction is needed because of Debian, so in the end, you can just blame them :)
14:00:58  <LordAro> no change
14:01:05  <TrueBrain> so you now have a folder
14:01:07  <TrueBrain> in it 'source'
14:01:09  <TrueBrain> with code
14:01:11  <LordAro> yup
14:01:15  <TrueBrain> and you run from that parent folder the docker run line?
14:01:22  <LordAro> ❯❯❯ ls source/openttd/configure                                                       ✘ 2
14:01:25  <LordAro> source/openttd/configure
14:01:30  <TrueBrain> *facepalm*
14:01:38  <TrueBrain> the source should be inside source
14:01:39  <LordAro> oh
14:01:41  <TrueBrain> not inside source/openttd
14:01:47  <TrueBrain> *failwhale* :D <3 :)
14:02:03  * LordAro continues to flail
14:02:06  <TrueBrain> :D
14:02:09  <TrueBrain> you will get there :P
14:02:18  <TrueBrain> you can cheat, and change workdir into workdir/source
14:02:23  <TrueBrain> then your pwd can be the source directly
14:02:26  <TrueBrain> but debian builds will fail
14:02:29  <TrueBrain> (permission issues)
14:02:33  <LordAro> that would've been sensible
14:02:36  <LordAro> but i've deleted it now
14:04:24  <TrueBrain> how to see ifa commit is part of a tree ... hmm
14:10:27  *** Thedarkb-X40 has joined #openttd
14:12:04  <LordAro> TrueBrain: i found --entrypoint
14:12:51  <frosch123> <- TrueBrain: next version, no open issues from my side
14:20:13  <TrueBrain> frosch123: cool; I have a few in a second :D
14:20:31  <TrueBrain> I get an error which I dont understand, if when I manually do the commands, I have no error :D
14:21:29  <frosch123> competing with arolard?
14:23:09  <TrueBrain> git rev-list is the issue
14:23:11  <TrueBrain> okay
14:23:23  <TrueBrain> owh, GIT_DIR
14:23:25  <TrueBrain> ugh
14:23:26  <TrueBrain> yes
14:23:28  <TrueBrain> I see
14:23:37  <TrueBrain> why do you have GIT_DIR? Was there a reason from your side?
14:23:45  <TrueBrain> as GIT_DIR is a git thingy, where it should point to the .git directory
14:23:57  <TrueBrain> or was that exactly for thwat it is?
14:24:03  <frosch123> yes, the hooks are supposed to be put into GIT_DIR/hooks
14:24:24  <frosch123> i use GIT_DIR to invoke subscripts
14:24:33  <frosch123> since the hooks may be called from either GIT_DIR ore REPO_DIR
14:25:11  <frosch123> depending on bare/server-side or client-side
14:25:25  <TrueBrain> yeah .. that needs to change a tiny bit, but I will give you an example of what I mean in a sec :)
14:26:02  <TrueBrain> okay, otherwise it seems to work
14:26:06  <TrueBrain> now let me update to your latest :)
14:28:09  <TrueBrain> does python not work with open("-") thing? hmm
14:28:19  <TrueBrain> no
14:28:24  <TrueBrain> as that would make your scripts a bit nicer
14:28:27  <TrueBrain> if you can read from stdin, instead of file
14:29:07  <frosch123> at least the commit-msg one is invoked from git using temporary file
14:29:25  <frosch123> so not worth the effort for check-diff?
14:30:01  *** sim-al2 has quit IRC
14:30:36  <TrueBrain> true
14:31:45  <TrueBrain>
14:31:53  <TrueBrain> too lazy to make a fork, sorry
14:32:01  <TrueBrain> I would really like the HOOKS_DIR
14:32:09  <TrueBrain> as otherwise I have to copy files inside the checkout-out git or something
14:32:17  <TrueBrain> the trap is really nice, as it cleans up on error too
14:32:26  <TrueBrain> and please name variables with 'file' if they are just that :)
14:36:06  <andythenorth> TB is like a less grump DaleStan :)
14:36:10  <andythenorth> we need more
14:36:49  <TrueBrain> no clue if that was a compliment
14:37:27  <TrueBrain> frosch123: I now have a Docker with the name commit-checker, which seems to be working :)
14:39:51  <glx> let DorpsGek decide :)
14:40:01  <TrueBrain> DorpsGek: yes or no?
14:40:04  <TrueBrain> :(
14:41:09  <DorpsGek> maybe
14:41:15  <TrueBrain> took you long enough :P
14:41:40  <LordAro> TrueBrain: ah, i see what's happened - it's using `c++` binary, not `clang` (they're the same, but the script is checking for basename == clang
14:41:46  <glx> needed to check my scripts
14:42:11  <TrueBrain> LordAro: I just did 'apt install clang' :P
14:43:15  <TrueBrain> LordAro: change your script to use realpath
14:43:20  <TrueBrain> $(realpath /usr/bin/cc)
14:43:28  <TrueBrain> does return /usr/lib/llvm-3.8/bin/clang
14:43:37  <TrueBrain> (in general, use realpath for many things :D)
14:43:39  <LordAro> my script? you mean config.lib :p
14:43:39  <TrueBrain> it follows symlinks
14:43:47  <TrueBrain> its yours now
14:43:49  <TrueBrain> deal with it
14:43:54  <LordAro> oh no
14:44:06  <frosch123> TrueBrain: added HOOKS_DIR and traps :)
14:44:46  <frosch123> and Dalestan is the guy you miss only when not here :)
14:44:53  <LordAro> oh, interesting
14:45:03  <LordAro> apparently the configure script does indeed not support clang
14:45:17  <LordAro> only when passed in as CXX or --cxx-build
14:45:25  <LordAro> (except it does in other places)
14:46:57  <andythenorth> dalestan taught me to ask better questions
14:47:06  <andythenorth> and to be ashamed about confusing props and vars
14:47:15  <TrueBrain>
14:47:20  <TrueBrain> frosch123: something like that?
14:47:30  <TrueBrain> (uses submodules :D)
14:47:37  <TrueBrain> not sure Jenkins does tha tproperly :)
14:47:47  <LordAro> omg subodules
14:48:11  <TrueBrain> frosch123: I now made the submodule use your repo; but I guess you will move it to OpenTTD sooner or later; than we need to change the URL there :)
14:48:28  <frosch123> TrueBrain: should we fork/transfer the repo to OpenTTD?
14:48:34  <TrueBrain> ^^ :P
14:48:37  <TrueBrain> transfer
14:48:40  <TrueBrain> please dont fork it to there
14:49:33  <TrueBrain> and you are Owner of the OpenTTD organization, so you can transfer it even :)
14:51:35  <frosch123> the script writes stuff to stderr, i assume jenkins will display that
14:52:11  <TrueBrain> both stdout and stderr
14:53:28  <frosch123> for transfering: is the repo name fine with you? OpenTTD-git-hooks ?
14:53:42  <TrueBrain> as good as any other
14:53:57  <TrueBrain> I was wondering for a moment about prefix of OpenTTD for everything, how useful is it really .. but I like it in forks etc
14:53:59  <TrueBrain> so yeah
14:54:26  <TrueBrain> WTB: reviewer for the OpenTTD-CF pull request :D
14:55:43  <frosch123> transfer done
15:00:21  *** iSoSyS has quit IRC
15:02:57  <TrueBrain> frosch123: you might want to set some branch permissions etc
15:03:01  <TrueBrain> but that is up to you :)
15:04:02  <TrueBrain> error: malformed object name origin/master
15:04:03  <TrueBrain> hmm
15:06:11  <TrueBrain> every CI check it downloads 100 MiB from GitHub :D
15:06:24  <frosch123> no idea what you mean with branch permissions, did i forbid somethnig?
15:06:47  <TrueBrain> no; you didnt forbid enough I think :D
15:06:59  <TrueBrain> Settings -> Branches
15:07:02  <TrueBrain> Choose a branch
15:07:03  <TrueBrain> pick Master
15:07:22  <TrueBrain> I normally protect branches, require pull request, request status ,restrict who can push
15:10:46  *** iSoSyS has joined #openttd
15:10:56  <frosch123> did you set them manually for all 20+ ottd branches?
15:11:01  <TrueBrain> yup
15:11:05  <TrueBrain> it can also be done via API
15:11:06  <TrueBrain> but .. meh
15:11:21  <frosch123> so it does not copy them from master when setting new branch?
15:11:26  <TrueBrain> nope
15:11:52  <peter1138> Hi
15:12:06  <frosch123> peter1138: sorry, i was unable to attend the party
15:12:22  <peter1138> Nobody did. Who'd want to be in TrueBrain's pants?
15:12:50  <TrueBrain> story of my life :(
15:18:33  *** Flygon has quit IRC
15:22:05  <Wolf01> will the next step be OTTD?
15:22:23  <peter1138> Sometimes I wish you could share stashes...
15:22:24  <Xaroth> Lego OpenTTD? Hasn't that been done already ? :P
15:22:36  <Wolf01> Not at this level
15:22:42  <frosch123> peter1138: mercurial queues?
15:23:13  <TrueBrain> you can share your stash of gold with me any day
15:23:13  <peter1138> Well, really it should just be a personal branch, but...
15:23:27  <peter1138> I'm like a dragon, I don't share my stash.
15:23:53  <TrueBrain> that went from wanting to share to refusing to share in 2 minutes
15:23:54  <TrueBrain> nice
15:25:15  <andythenorth> can't you just branch or gist? :P
15:25:24  <andythenorth> I only use stash when I'm about to fuck something up :(
15:25:38  <peter1138> TrueBrain, yeah, I didn't think that through. GOLD STASH, at least.
15:26:48  <glx> very often then andythenorth ;)
15:26:56  <andythenorth> reasonably
15:27:06  <andythenorth> apparently there's one in mercurial as well
15:27:47  <TrueBrain> okay ... I think the commit-checker is now also going to work ..
15:28:04  <TrueBrain> frosch123: I designed it now as such, that if the commit-checker fails, the regression checks never kick in
15:28:06  <TrueBrain> as .. fuck those people :P
15:28:15  <frosch123> :p
15:28:24  <TrueBrain> and it works :D
15:28:38  <glx> no need to compile if the style is wrong ;)
15:28:57  <TrueBrain> okay :D I need a reviewer for OpenTTD-CF #3 and for OpenTTD #6694 :)
15:30:54  <peter1138> is rm -rf needed on /var/lib/apt/lists/*
15:31:00  <TrueBrain> yuppers
15:31:03  <TrueBrain> default Docker trick
15:31:04  <peter1138> I guess apt-get clean leaves some bits?
15:31:05  <TrueBrain> keeps images smaller
15:31:11  <TrueBrain> clean only removes caches
15:31:14  <TrueBrain> not the list itself
15:31:16  <peter1138> is -f needed?
15:31:20  <TrueBrain> yes
15:31:25  <peter1138> or is that just habit? :D
15:31:29  <TrueBrain> that too
15:31:41  <TrueBrain> its a default thing everyone does in Dockers too
15:31:45  <peter1138> hehe
15:31:47  <TrueBrain> still dont get why Docker doesnt do it ..
15:31:50  <TrueBrain> they do the apt-get clean
15:31:51  <TrueBrain> I mean ..
15:32:03  <TrueBrain> (and I know why blabla, but it is still annoying
15:32:11  <TrueBrain> tnx glx :)
15:32:28  <peter1138> Yeah, I dunno enough about this stuff to actually review it.
15:33:08  <TrueBrain> no worries, neither do I
15:33:13  <peter1138> Hahah
15:33:29  <glx> same here
15:33:37  <TrueBrain> "it works"
15:33:45  *** FLHerne has joined #openttd
15:34:05  <peter1138> Hmm, how was it merged to OpenTTD:master? I thought it was OpenTTD-CF
15:34:15  <glx> I guess it's tested live before the PR anyway
15:34:45  <TrueBrain> yeah, that is a bit weird peter1138, but the OpenTTD is about the organization
15:34:49  <TrueBrain> like TrueBrain is the line lower
15:34:55  <TrueBrain> it skips the project
15:35:17  <peter1138> Oh. Weird and confusing.
15:35:20  <peter1138> File a bug!
15:35:23  <TrueBrain> in which project you are, you normally know
15:35:27  <TrueBrain> so it is redundant to add
15:35:37  <TrueBrain> but because we also called a project the same as our organization
15:35:46  <TrueBrain> there is where the weirdness comes
15:35:47  <peter1138> Yeah, I see.
15:38:05  <TrueBrain> pretty happy with the CI like this
15:38:08  <TrueBrain> everything is fully in dockers
15:38:10  <TrueBrain> fully isolated
15:38:23  <TrueBrain> worst someone can do, assuming no bugs in Docker are found/abused, is use CPU time
15:38:39  <TrueBrain> guess I could firewall them some more too
15:38:46  <TrueBrain> only allow https to github
15:39:31  <peter1138> That would be useful.
15:39:39  <peter1138> But not infallible.
15:39:52  <TrueBrain> nothing is; its a bit of a trust game
15:39:56  <peter1138> What causes it to run?
15:40:03  <TrueBrain> frosch123: no PRs with invalid commit messages can now be merged :)
15:40:18  <TrueBrain> GitHub does
15:40:46  <glx> oh we have another DorpsGek ?
15:40:59  <TrueBrain> of some sorts :P
15:41:10  <peter1138> Not quite what I meant.
15:41:46  <TrueBrain> frosch123: I am pretty sure this fails on release branches; but we fix that when we get there I guess :)
15:41:56  <peter1138> So about nightlies.
15:52:26  *** Cubey has joined #openttd
15:56:21  *** Gja has joined #openttd
16:02:55  <Wolf01> <TrueBrain> but because we also called a project the same as our organization <- change name to the organization, is easier now :D
16:16:57  <Wolf01> andythenorth: some inspiration? :D
16:19:12  <andythenorth> such hog
16:19:15  <andythenorth> not chibi enough though
16:19:24  <andythenorth> is nice DAF cab, hard shape
16:23:13  * andythenorth wonders
16:23:22  <andythenorth> why do brake vans get pax livery?
16:23:28  <andythenorth> they have no capacity :P
16:29:16  <andythenorth> NewLiveryGUI
16:32:54  <andythenorth> although...that was tried before for ships, and abandoned due to something mad
16:33:19  * andythenorth can't remember what
16:39:57  *** Gja has quit IRC
16:46:06  *** iSoSyS has quit IRC
16:49:40  *** Gja has joined #openttd
16:52:31  <andythenorth> supermop:
16:56:10  <peter1138> 84 and 90 are... um...
16:56:37  <andythenorth> they're the desperation editions
16:56:46  <andythenorth> ran out of ways to draw the same thing :P
16:56:55  *** iSoSyS has joined #openttd
16:59:09  <andythenorth> maybe we can rebuild him
16:59:16  *** iSoSyS has quit IRC
17:06:29  <Wolf01> ha!
17:08:37  <andythenorth> is it too late for coffee?
17:09:53  <frosch123> Wolf01: is that your keyboard?
17:10:23  <Wolf01> No, mine only changes colour at whole :(
17:11:23  <frosch123> there was a fff about all these colors
17:11:30  <frosch123> like also damage and stuff
17:13:43  <Wolf01> I wanted to make a mod to support mine, so I could flash it when flying fucks get destroyed by spitters :P
17:14:33  <frosch123>
17:17:23  <Wolf01> Yup, I remember that
17:17:30  *** Wormnest has joined #openttd
17:24:04  *** gelignite has quit IRC
17:30:34  *** supermop has quit IRC
17:32:57  <Thedarkb1> How long does it take for UFOs to explode?
17:35:14  <frosch123> until the aircraft has reached them
17:35:23  <frosch123> it needs to fly over the map from the map border
17:35:33  <frosch123> so, pretty fast on 64x64, pretty slow on 4kx4k
17:36:23  <andythenorth> swap caboose livery by flipping?
17:36:35  <andythenorth> works for mail cars, and I can pretty much automate it
17:36:45  <frosch123> magic :p
17:37:18  <andythenorth> flipping is a remarkably good solution to 'liveries'
17:46:23  *** Wacko1976 has quit IRC
17:56:25  *** ToffeeYogurtPots has joined #openttd
18:06:21  *** Zexaron has joined #openttd
18:11:57  *** Wacko1976 has joined #openttd
18:20:16  *** Supercheese has joined #openttd
18:28:46  *** sla_ro|master has joined #openttd
18:29:18  *** gelignite has joined #openttd
18:40:40  *** Stimrol has joined #openttd
19:02:50  *** FLHerne has quit IRC
19:12:34  <Wolf01> andythenorth: what is he talking about?
19:12:57  <andythenorth> he wants to know if we can modify default roads
19:13:15  <andythenorth> it took me a while to parse it :)
19:13:20  <Wolf01> :D
19:13:42  <Wolf01> I think yes, just redefine it without changing the graphics?
19:13:51  <andythenorth> I think I did that in Hog
19:15:11  <Wolf01> Also, not bumping savegame version made loading trunk games problematic, we should tell people that old NRT saves won't be loadable anymore and bump the savegame version
19:17:03  <Wolf01> Or maybe if we could find a way, like on JGRpp or some other way, to store the compatibility on savegames, so a savegame might even be loadable on different branches
19:19:20  *** Gja has quit IRC
19:23:36  <peter1138> no
19:24:06  <peter1138> just trunkify it :p
19:24:12  <peter1138> wait, we don't have trunk any more
19:24:21  *** Zexaron has quit IRC
19:26:44  *** FLHerne has joined #openttd
19:29:10  <LordAro> masterify it
19:33:57  <andythenorth> it's probably not worse than other things in ottd now
19:34:06  <andythenorth> it's just awaiting a reviewer :P
19:34:28  <andythenorth> 'awaiting'
19:34:53  <andythenorth> actually it wouldn't merge with svn trunk recently, and it needs rebased for github as well
19:35:17  <Wolf01> We could cleanup the repo
19:35:17  <andythenorth> but that's just admin :P
19:35:22  <Wolf01> ratt->master
19:35:49  <andythenorth> the merge has to be manual
19:35:57  <andythenorth> the savegame support broke
19:36:16  <Wolf01> We'll bump it to 9197
19:36:19  <andythenorth> and openttd.grf changed, means a manual merge of the spritesheets & reset the sprite positions for NRT
19:36:34  <andythenorth> due to new airport sprites :)
19:43:21  *** frosch123 has quit IRC
19:51:22  *** Supercheese has quit IRC
19:51:39  *** Supercheese has joined #openttd
19:58:10  *** Stimrol has quit IRC
20:02:35  *** iSoSyS has joined #openttd
20:03:37  <peter1138> Hmm
20:03:45  <peter1138> So there's 16 rail types, right?
20:04:46  <andythenorth> something like that
20:05:42  <peter1138> We should have a patch that removes all the $Id$ tags. Just to conflict with everything.
20:06:05  <peter1138> What about if there was 16 rail types on the map, but more behind the scenes?
20:06:18  <peter1138> Basically an indirection layer
20:06:51  <andythenorth> o_O
20:07:18  <peter1138> New method of trolling: fill the indirection layer with rubbish rail types.
20:11:25  <peter1138> (And same for NRT!)
20:20:07  <Eddi|zuHause> isn't that what the Railtype Translation Table already does?
20:21:39  <peter1138> No, that's only for defining and mapping for NewGRFs.
20:22:29  <peter1138> And... Railtypes are used a bitmask in places which limits the number somewhat anyway. Hmm.
20:22:49  <peter1138> Just extend the map array! :D
20:24:54  <michi_cc> andythenorth: You have something to review: :)
20:25:32  <andythenorth> Just Do ButGroundTypes
20:25:54  <andythenorth> michi_cc: ok :)
20:26:01  <andythenorth> right now I am in my own broken code
20:26:05  <andythenorth> but I will test that
20:26:06  <andythenorth> later
20:31:53  *** sla_ro|master has quit IRC
20:33:32  *** sim-al2 has joined #openttd
20:40:33  *** Stimrol has joined #openttd
20:52:10  <LordAro> peter1138: i'd imagine git is clever enough to resolve conflicts from such a change
20:53:22  *** Supercheese has quit IRC
21:15:26  *** Stimrol has quit IRC
21:17:59  *** synchris has quit IRC
21:18:06  <andythenorth> caboose nonsense done
21:18:14  <andythenorth> engines need some work eh :P
21:18:38  <andythenorth> that's just 2 caboose IDs / buy menu entries
21:19:09  <Eddi|zuHause> 103 is wrong
21:19:39  <Eddi|zuHause> also 97/98/99
21:20:01  <andythenorth> yes
21:20:17  <andythenorth> why paint engines when I could be automating needless cabeese? o_O
21:20:57  <Eddi|zuHause> somehow i must always think of "Kapuze"
21:21:54  <andythenorth> ECulturalReferenceDoesNotTranscend
21:22:17  <andythenorth> all caboose can be flipped
21:22:26  <andythenorth> 'all', it's just two :P
21:22:46  <andythenorth> is V453000 even here?
21:23:26  <Eddi|zuHause> this is a "Kapuze"
21:24:06  <andythenorth> hood with no coat?
21:24:17  <andythenorth> keeps the rain off limited parts eh
21:25:28  <Eddi|zuHause> well, usually they're attached to coats :p
21:25:54  <Thedarkb1> I like forcing towns to expand below sea level and flooding them.
21:27:59  <TrueBrain> OpenTTD source still uses tabs? Wow .. havent seen that in a long time :D
21:29:23  <Eddi|zuHause> but what about people who want to change the indentation from 4 to 2?
21:29:39  <TrueBrain> kudos to michi_cc for doing OSX shit :D
21:30:14  <andythenorth>  ok so I need a clone
21:30:20  <TrueBrain> unethical
21:31:01  <Wolf01> I need 3, like Michael Keaton
21:32:36  <andythenorth> wow that downloaded quick
21:32:44  <andythenorth> did the repo used to have loads of extra crap in it?
21:32:47  <andythenorth> the old repo
21:33:00  <andythenorth> and will it compile? :P
21:33:39  <TrueBrain> the old repo had less crap
21:34:45  <andythenorth> wow, ottd compiled first time
21:34:49  <andythenorth> boom
21:34:53  <TrueBrain> its, AMAZING
21:34:55  <TrueBrain> call a newspaper
21:35:10  <andythenorth> usually I have to piss around with the SDK and freetype
21:35:32  <andythenorth> now to try michi_cc's patch
21:37:09  <andythenorth> is there a way to test this without cloning michi's entire repo?
21:37:14  <andythenorth>
21:37:23  <TrueBrain> yes; fetch the PR ref
21:37:35  <andythenorth> k
21:37:37  <TrueBrain> I believe ... git fetch origin refs/pull/6695/head
21:37:39  <TrueBrain> not sure
21:37:44  <TrueBrain> google will tell you exactly :D
21:38:06  *** gelignite has quit IRC
21:38:35  <TrueBrain> weird, I can see michi_cc linked his account to his GitHub account, but when I want to invite him by email, it doesnt show a match
21:40:11  <TrueBrain> owh well, send you an invite anyway
21:43:31  <Thedarkb1> It would be nice if shares were implemented in a way that would be usable in Multiplayer
21:43:42  *** supermop has joined #openttd
21:44:38  <TrueBrain> and good night
21:45:32  <andythenorth> also :)
21:45:32  *** andythenorth has left #openttd
21:48:19  *** ToffeeYogurtPots has quit IRC
21:52:44  *** chomwitt has joined #openttd
21:55:52  <Wolf01> 'night
21:55:54  *** Wolf01 has quit IRC
22:01:35  *** Wormnest has quit IRC
22:12:37  *** Stimrol has joined #openttd
22:22:08  *** Progman has quit IRC
22:32:56  *** Stimrol has quit IRC
22:34:06  *** Thedarkb1 has quit IRC
22:53:35  *** Wacko1976 has quit IRC
22:53:41  *** Wacko1976 has joined #openttd
22:58:48  <LordAro> "FreeBSD's C compile does not support dump machine." However, removing C support is not possible because PSP must be linked with the C compiler."
22:58:51  <LordAro> hrm.
23:46:10  <Eddi|zuHause> sometimes you come across sentences that make no sense and you wonder whether you just miss some context
23:46:50  <Eddi|zuHause> or if there is something wrong with it on some fundamentally deeper level
23:48:55  *** iSoSyS has quit IRC

Powered by YARRSTE version: svn-trunk