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