Back to Home / #openttd / 2018 / 04 / Prev Day | Next Day
#openttd IRC Logs for 2018-04-08

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