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

---Logopened Sun Sep 30 00:00:11 2018
00:50-!-Supercheese [] has joined #openttd
00:50-!-Supercheese is "Supercheese" on #openttd
01:56-!-sla_ro|master [] has joined #openttd
01:56-!-sla_ro|master is "slamaster" on @#sla #openttd
02:15-!-andythenorth [] has joined #openttd
02:15-!-andythenorth is "andythenorth" on #openttd
02:22-!-andythenorth [] has quit [Read error: Connection reset by peer]
02:23-!-andythenorth [] has joined #openttd
02:23-!-andythenorth is "andythenorth" on #openttd
02:23-!-chomwitt is "chomwitt" on #debian #debian-games
02:23-!-chomwitt [] has joined #openttd
03:06*Pikka back in a couple of hours
03:06-!-Pikka [~Albert@] has quit [Quit: Leaving]
03:07<andythenorth>oof it was pikka
03:07<andythenorth>how rare
03:07<andythenorth>@seen danmack
03:07<@DorpsGek>andythenorth: danmack was last seen in #openttd 6 weeks, 4 days, 12 hours, 45 minutes, and 16 seconds ago: <DanMacK> LOL
03:07-!-nielsm [] has joined #openttd
03:07-!-nielsm is "Niels Martin Hansen" on #openttd #tycoon
03:28<andythenorth>moin nielsm
03:41-!-HerzogDeXtEr [] has joined #openttd
03:41-!-HerzogDeXtEr is "purple" on #openttd
04:06-!-Supercheese [] has quit [Quit: Valete omnes]
04:07-!-Progman [] has joined #openttd
04:07-!-Progman is "Peter Henschel" on #openttdcoop #openttd
04:30-!-OtakuSenpai [~OtakuSenp@] has joined #openttd
04:30-!-OtakuSenpai is "OtakuSenpai" on #openttdcoop #openttd
04:55-!-Progman [] has quit [Remote host closed the connection]
05:06-!-Wolf01 [] has joined #openttd
05:06-!-Wolf01 is "Wolf01" on #openttd
05:36-!-Nawab [~OtakuSenp@] has joined #openttd
05:36-!-Nawab is "OtakuSenpai" on #openttd #openttdcoop
05:37-!-OtakuSenpai [~OtakuSenp@] has quit [Ping timeout: 480 seconds]
05:41<Wolf01> andythenorth
05:41<andythenorth>red wheels
05:58-!-namad7 [] has joined #openttd
05:58-!-namad7 is "namad2" on #openttd
06:00-!-namad7 [] has quit []
06:01<andythenorth>49 trains to draw
06:01<andythenorth>166 drawn
06:05-!-Wacko1976 [] has joined #openttd
06:05-!-Wacko1976 is "The Chat Cool People Use" on #openttd #/r/openttd
06:07<Wolf01>Almost finished :P
06:08<andythenorth>some are just copy-paste-adjust
06:08<andythenorth>but I left some of the hardest to end :(
06:13-!-Wacko1976 [] has quit [Ping timeout: 480 seconds]
06:13<andythenorth>I can do 5 trains in a weekend
06:13<andythenorth>done by Christmas? o_O
06:32-!-Pikka [~Albert@] has joined #openttd
06:32-!-Pikka is "realname" on #openttd
06:34<blathijs>LordAro: TrueBrain: Do you know if there's any progress on the ICU ParagraphLayout thing? I've just created to track it as well.
06:42-!-Wacko1976 [] has joined #openttd
06:42-!-Wacko1976 is "The Chat Cool People Use" on #openttd #/r/openttd
06:56<andythenorth>it's Pikka
06:56<andythenorth>run away etc
06:57<andythenorth>Pikka: some ages ago, you were drawing trains
06:57<andythenorth>big ones and stuff
06:57<Pikka>I was!
06:58<Pikka>and I did...
07:07-!-Nawab [~OtakuSenp@] has quit [Ping timeout: 480 seconds]
07:07-!-frosch123 [] has joined #openttd
07:07-!-frosch123 is "frosch" on #openttdcoop.devzone #openttd
07:13-!-OtakuSenpai [~OtakuSenp@] has joined #openttd
07:13-!-OtakuSenpai is "OtakuSenpai" on #openttd #openttdcoop
07:18<andythenorth>Eddi|zuHause did a PR!
07:19<andythenorth>so can we merge it? o_O
07:20-!-triolus is "triolus" on #debian
07:20-!-triolus [] has joined #openttd
07:21<nielsm>I've been spending most of my time playing two point hospital instead of doing anything else... current masterpiece
07:21<andythenorth>I don't see the tanks in that
07:21*andythenorth only plays tank games now :P
07:22*andythenorth wishes WOT Blitz could be combined with Euro Truck Simulator
07:22<nielsm>and train games only count because they have tank engines in them?
07:23<Pikka>mmm, tanks
07:23<Eddi|zuHause>so is two point hospital anything like Biing!? :p
07:23<nielsm>I don't know that
07:24<andythenorth>Pikka: NARS reboot then?
07:24*Pikka back... eventually
07:24<Eddi|zuHause>andythenorth: Euro Blitz Simulator?
07:24<andythenorth>some kind of convoy ambush game
07:25<Pikka>possibly? :) plenty to finish with UKRS first, and I'd like to do industries and houses
07:25<Eddi|zuHause>i was thinking you're just tasked with driving around the tank, parking correctly, and stuff... no actual battles :p
07:25<Pikka>it's all on a rather distant back burner at the moment though
07:26<andythenorth>Eddi|zuHause: so tank loading simulator?
07:26<andythenorth>2 teams, 7 minutes, winner is first one to load all tanks?
07:27*Pikka ->
07:27-!-Pikka [~Albert@] has quit [Quit: Leaving]
07:39<LordAro>blathijs: no progress that i'm aware of
07:39<LordAro>well, it's not used on windows any more
07:39<LordAro>but that's probably not helpful to you
07:42-!-gelignite [] has joined #openttd
07:42-!-gelignite is "gelignite" on #openttd
07:44-!-Wacko1976_ [] has joined #openttd
07:44-!-Wacko1976_ is "The Chat Cool People Use" on #openttd #/r/openttd
07:46-!-andythenorth [] has quit [Ping timeout: 480 seconds]
07:47-!-Wacko1976 [] has quit [Ping timeout: 480 seconds]
07:49-!-andythenorth [] has joined #openttd
07:49-!-andythenorth is "andythenorth" on #openttd
07:52<blathijs>LordAro: What's the alternative on Windows? Is there some Windows API for layouting?
07:53<nielsm>it's already been implemented
07:57-!-OtakuSenpai [~OtakuSenp@] has quit [Remote host closed the connection]
07:57-!-OtakuSenpai [~OtakuSenp@] has joined #openttd
07:57-!-OtakuSenpai is "OtakuSenpai" on #openttd #openttdcoop
08:02-!-andythenorth [] has quit [Ping timeout: 480 seconds]
08:11-!-Samu [] has joined #openttd
08:11-!-Samu is "OFTC WebIRC Client" on #openttd
08:21-!-OtakuSenpai [~OtakuSenp@] has quit [Remote host closed the connection]
08:22-!-OtakuSenpai [~OtakuSenp@] has joined #openttd
08:22-!-OtakuSenpai is "OtakuSenpai" on #openttd #openttdcoop
08:25-!-OtakuSenpai [~OtakuSenp@] has quit [Read error: Connection reset by peer]
08:25-!-Nawab [~OtakuSenp@] has joined #openttd
08:25-!-Nawab is "OtakuSenpai" on #openttd #openttdcoop
08:26-!-andythenorth [] has joined #openttd
08:26-!-andythenorth is "andythenorth" on #openttd
08:31<andythenorth>I have to draw 2 narrow guage diesel engines
08:32<andythenorth>1950, 1995
08:32<andythenorth>pls send me the pixels :P
08:35-!-Nawab [~OtakuSenp@] has quit [Remote host closed the connection]
08:40-!-andythenorth [] has quit [Read error: Connection reset by peer]
08:40-!-andythenorth [] has joined #openttd
08:40-!-andythenorth is "andythenorth" on #openttd
08:40<andythenorth>mostly I need some RL inspiration :P
08:43<andythenorth>oof, here is the RL version of a train I invented in Horse :)
08:55<FLHerne>andythenorth: ?
08:55<andythenorth>mini bone?
08:55<FLHerne>(1967, but the bodywork is from 1997)
08:55<FLHerne>Originally like
08:56<andythenorth>I started drawing it, I'll find the spritesheet
08:56<FLHerne>"selected for trials on the FR on the grounds that the gas axe doesn't work so well on fibreglass, and the cabs fouled the FR loading gauge." :P
08:57<andythenorth>7 column of sprites, 2nd row :P
08:57<andythenorth>kind of ugly
08:59<FLHerne>Proportions look a bit off?
08:59<FLHerne>The cabs aren't higher than the main bodywork
08:59<FLHerne>(on the real one)
09:00<FLHerne>So it looks very stretched
09:08-!-tokai|noir [] has joined #openttd
09:08-!-tokai|noir is "Christian Rosentreter" on #openttd
09:08-!-mode/#openttd [+v tokai|noir] by ChanServ
09:10<andythenorth>need a colour scheme for NG diesels :P
09:11<andythenorth>funny bulky bonnets
09:13-!-andythenorth is now known as Guest119
09:13-!-andythenorth [] has joined #openttd
09:13-!-andythenorth is "andythenorth" on #openttd
09:15-!-tokai [] has quit [Ping timeout: 480 seconds]
09:20-!-Guest119 [] has quit [Ping timeout: 480 seconds]
09:23-!-andythenorth [] has quit [Quit: andythenorth]
09:31<FLHerne>I found quite interesting
10:05-!-Wacko1976 [] has joined #openttd
10:05-!-Wacko1976 is "The Chat Cool People Use" on #openttd #/r/openttd
10:06-!-Wacko1976_ [] has quit [Ping timeout: 480 seconds]
10:13-!-Wacko1976 [] has quit [Ping timeout: 480 seconds]
10:24-!-Wacko1976 [] has joined #openttd
10:24-!-Wacko1976 is "The Chat Cool People Use" on #openttd #/r/openttd
10:27-!-stefino [] has joined #openttd
10:27-!-stefino is "OFTC WebIRC Client" on #openttd
10:27<stefino> anyone know if this project is still alive?
10:32<frosch123>check the "history" tab :)
10:33<stefino>if you mean something like this "This page was last modified on 18 March 2011, at 08:18." :D
10:33<stefino>this is not so possitive
10:41-!-Thedarkb-T60 [] has joined #openttd
10:41-!-Thedarkb-T60 is "realname" on #openttd
10:46<@peter1138>But probably more useful than "nobody's heard of it"
10:53<Samu>gonna do a "fresh install solo AI competition", what do u think?
10:54<Samu>fresh openttd 1.8.0 install + AI downloaded from bananas
10:55<Samu>maybe the only exceptions is gameseed, it will be the same for every AI and that the AI starts from day 1
10:55<Samu>not 720
10:57<Samu>or do you have other ideas?
10:58<Samu>btw, is it possible to start decidated openttd in singleplayer?
11:00<Samu>nobody's interested in my shenanigans
11:13-!-stefino [] has quit [Quit: Page closed]
11:22<Samu>competition started!
11:23-!-jjavaholic [] has joined #openttd
11:23-!-jjavaholic is "realname" on #openttd
11:26-!-andythenorth [] has joined #openttd
11:26-!-andythenorth is "andythenorth" on #openttd
11:29-!-gelignite [] has quit [Quit: Match found!]
11:30-!-operand [] has joined #openttd
11:30-!-operand is "OFTC WebIRC Client" on #openttd
11:31<operand>tbh i wanna play this game again but i dont know how people manage to build really nice stuff like i always see on reddit and the forums and stuff :p
11:31<operand>all my networks are boring af
11:33<andythenorth>FLHerne: o_O ?
11:33<andythenorth>operand: screenshot, or it didn't happen :)
11:41-!-operand [] has quit [Remote host closed the connection]
11:50-!-jjavaholic [] has quit [Quit: Leaving]
12:04-!-Flygon [] has quit [Read error: Connection reset by peer]
12:16-!-Thedarkb-T60 [] has quit [Ping timeout: 480 seconds]
12:31-!-Thedarkb-T60 [] has joined #openttd
12:31-!-Thedarkb-T60 is "realname" on #openttd
12:37<Samu>i feel like creating patch requests of my stuff, but I dunno if that's how it works
12:37<Samu>what is deemed acceptable as a pull request?
12:39<LordAro>follows code style would be a good start :)
12:40<LordAro>(and complete)
12:40<LordAro>beyond that, they can be debated about as necessary
12:40<LordAro>(and possibly closed as a BAD FEATURE)
12:41<Samu>i dunno how many patches I got here... about 182 files unsorted
12:41<Samu>i dont think u want 182 pull requests
12:41<LordAro>i wouldn't think so
12:41<LordAro>surely there aren't 182 separate features
12:42-!-Progman [] has joined #openttd
12:42-!-Progman is "Peter Henschel" on #openttdcoop #openttd
12:42<Samu>ok, time to clean up stuff that was already implemented/rejected/fixed, etc...
12:42<Samu>deleting patches :(
12:42<LordAro>probably a good start
12:44<LordAro>but seriously, branch per feature/bugfix, multiple commits per branch
12:44<LordAro>i'm expecting maybe 10 branches
12:45<LordAro>(branches do not need to become pull requests)
12:46<Samu>have u seen this last branch? I put it all in 1 single commit
12:46<Samu>is 1 single commit a bad idea for such a large feature?
12:47<LordAro>maybe, maybe not
12:47<LordAro>depends on the feature :p
12:47<LordAro>for starters, the commit message is far too generic, "overhaul" doesn't explain to me what the feature is at all
12:48<Samu>different gui
12:48<Samu>but i'm also doing a few other things than just altering the gui
12:48<Samu>and it's not mentioned
12:48<LordAro>right, so those should be in separate commits
12:50<LordAro>commits should be, in general, as small as still makes logical sense - reorganise code in one commit, add new code (and use it) in another
12:50<LordAro>that sort of thing
12:50<andythenorth>electro-diesels with pantograph
12:51<andythenorth>hide pantograph on non-elrail?
12:51<Eddi|zuHause>as visual indication which power value they use?
12:52<Eddi|zuHause>lowered/raised pantograph
12:56<Samu>ugh, build on competitor canal needs to be modified, you recently made changes to the map tiles
12:56<Samu>it completely broke this one
12:56<andythenorth>Eddi|zuHause: more it just looks weird sticking up when there's no wires
12:57<andythenorth>and obvs it's an easy BAD FEATURE
12:58<Eddi|zuHause>well, real pantographs cannot be raised without a wire above them, otherwise they fling to a point where you cannot lower them anymore
12:58<Eddi|zuHause>they need the counterpressure of the wire to not cross this "point of no return"
13:04<Samu>Check Bankruptcy Before Infrastructure Costs yay, this one was implemented :p
13:08<andythenorth>pantograph can use a sprite layer :P
13:08<Eddi|zuHause>that should be possible now
13:08<Samu>faster server autosaves was rejected, wasn't it? I recall reading something from Alberth
13:09<Samu>on the old flyspray
13:10<LordAro>all issues were imported to github, you should be able to search for it
13:13<LordAro>(and flyspray is still up anyway)
13:21<andythenorth>anyone want to approve some PRs? o_O
13:22<Samu>restart dead ai was a bad feature, deleting
13:23-!-Tharbakim [] has joined #openttd
13:23-!-Tharbakim is "Tharbakim" on #openttd #lxde #irssi #bitlbee #/r/openttd
13:23<Samu>separate forbid 90 degrees for trains and ships
13:24<Samu>was something done about this? i heard u talking about it a few days ago
13:25<andythenorth>ships should never be forbidden
13:25<Samu>what the patch do: have 2 settings for the 90 degrees, 1 for trains, 1 for ships
13:28<Eddi|zuHause>bids should never be forshipped
13:28-!-gelignite [] has joined #openttd
13:28-!-gelignite is "gelignite" on #openttd
13:28<Samu>right... i have no idea wtf this was
13:29<Samu>okay, not deleted, it's about build on competitor canal stuff
13:30<Samu>terraforming rivers testing
13:31<Samu>very experimental patch, really cool to see it work, but there's missing graphics
13:34<Samu>variety changed to become a game setting v1 r27967 this was implemented, deleted
13:38<andythenorth>Eddi|zuHause: did nobody approve your PR yet? :|
13:39<Eddi|zuHause>would i notice?
13:39<andythenorth>maybe not
13:40<andythenorth>I've been given approval permissions
13:40<andythenorth>is that wise?
13:40-!-snail_UES_ [] has joined #openttd
13:40-!-snail_UES_ is "Jacopo Coletto" on #openttd
13:40<Eddi|zuHause>probably not :p
13:41<andythenorth>I've approved itr
13:41<andythenorth>can't merge though
13:44-!-Wacko1976 [] has quit [Ping timeout: 480 seconds]
13:46-!-Wacko1976 [] has joined #openttd
13:46-!-Wacko1976 is "The Chat Cool People Use" on #openttd #/r/openttd
13:54<Samu>im still learning this github website
13:54<Samu>how to turn an issue into a pull request ?
13:55<LordAro>you don't
13:55<Samu>i create a pull request and refer the issue?
13:55<Samu>hmm ok
13:55<Samu>1 single line pull request incoming
13:59<Samu>You’re editing a file in a project you don’t have write access to. Submitting a change to this file will write it to a new branch in your fork SamuXarick/OpenTTD, so you can send a pull request.
13:59<Samu>it's so confusing
14:00<LordAro>what's confusing?
14:00<Samu>what branch?
14:00<LordAro>whatever you name it
14:00<LordAro>there's a textbox
14:04<@peter1138>Yeah, all changes are done in branches, not master.
14:04<@peter1138>git branches are nothing like svn branches.
14:04<@peter1138>They're way more... temporary in a way. Can be used like svn branches as well, though.
14:05<Samu>patch-1? HORRIBLE NAME
14:05<Samu>i'm disappointed, how do i rename now?
14:05<@peter1138>I was going to play elite dangerous this afternoon, but when I loaded it up, my controller settings had been totally wiped. Not in the mood now :()
14:05<LordAro>what's wrong with it?
14:05-!-ToBeFree [] has joined #openttd
14:05-!-ToBeFree is "Tobias "ToBeFree" Frei" on #https-everywhere #oolite-dev #openttd #debian #linux #oolite #oolite-ger
14:05<Samu>it's a bad branch name
14:05<LordAro>the branch name is irrelevant, other for keeping track of what change it is
14:05<LordAro>there's no way to change it (in github web interface)
14:06<Samu>must delete or rename,
14:07<@peter1138>You can delete it. You can rename by making a new branch off it, and then deleting the old name.
14:07<@peter1138>If you already made a PR that would be a bad idea, though.
14:14<Samu>why is that everytime i find help about git stuff, it's always using command line stuff? useless help!
14:15<LordAro>because git is a command line program
14:15<Samu>isn't there a right-click rename somewhere?
14:15<LordAro>most people use it that way
14:15<LordAro>because it's not just a folder you can rename
14:16<Samu>they really like to make it hard to program
14:18<LordAro>well if you insist on not reading the documentation, that's to be expected
14:18<LordAro> i've not tried it myself, but this was released recently and i've heard good things about it, you might get on with it better than tortoisegit
14:21<Samu>alright, deleted
14:21<LordAro>your approach to software is weird
14:21<Samu>patch-1 Deleted just now by SamuXarick
14:21<LordAro>anyway, please just go read some stuff about how git actually works
14:22<LordAro>instead of your usual flailing
14:22<Samu>heh flailing
14:22-!-Wormnest [~Wormnest@] has joined #openttd
14:22-!-Wormnest is "Wormnest" on #openttd
14:22<LordAro>(hint: i shouldn't have to use the phrase "usual flailing" more than once)
14:25-!-andythenorth [] has quit [Quit: andythenorth]
14:33<LordAro> alternatively, one of these
14:42<Samu>there I go again, failing
14:44<Samu> I have a feeling the commit checker likes to fail just for the sake of failing
14:45-!-snail_UES_ [] has quit [Quit: snail_UES_]
14:46<Samu>this is so disappointing...
14:46<nielsm>the error is that you put [AI] before the :
14:47<nielsm>Fix #6460: [AI] add start_date parameter for Random AIs on new game
14:47<Samu>I see
14:47<Samu>how am I to fix that now?
14:48<Samu>it's already submited
14:48<Samu>can't go back
14:48<LordAro>you can overwrite it
14:48<nielsm>git commandline
14:48<+michi_cc>git commit --amend to fix the message and then git push -f to update
14:48<LordAro>but you guessed, it that probably involves using the command line
14:48<nielsm>git commit --amend
14:48<nielsm>then you can edit the commit message
14:48<nielsm>and then you have to git push --force
14:48<LordAro>i made the same mistake with the commit message in my PR
14:49-!-Supercheese [] has joined #openttd
14:49-!-Supercheese is "Supercheese" on #openttd
14:55<Samu>downloading Git :(
14:57<Samu>absolutely no idea what are these install options and checks, I just click next next next
14:58<LordAro>and you wonder why you don't understand thing
14:59<Samu>i'm forced to download trash to fix 1 little thing...
14:59<Samu>it's how I feel about all this
14:59<LordAro>try learning something
15:05<Eddi|zuHause>i have exactly two people on my ignore list... one for being incapable of learning, and one for being an asshole
15:06<LordAro>it's andy, isn't it? :p
15:06<Eddi|zuHause>almost :p
15:07<Eddi|zuHause>i would use the forum ignore list more, if it wasn't such an incredibly useless feature
15:08<Eddi|zuHause>cause there's two or three more people like that, that i really wish i could ignore
15:16-!-Thedarkb1-T60 [] has joined #openttd
15:16-!-Thedarkb1-T60 is "realname" on #openttd
15:22-!-Thedarkb-T60 [] has quit [Ping timeout: 480 seconds]
15:24-!-ToBeFree [] has quit [Quit: Leaving]
15:38-!-ToBeFree [] has joined #openttd
15:38-!-ToBeFree is "Tobias "ToBeFree" Frei" on #https-everywhere #oolite-dev #openttd #debian #linux #oolite #oolite-ger
15:38-!-glx [] has joined #openttd
15:38-!-mode/#openttd [+v glx] by ChanServ
15:38-!-glx is "Loïc GUILLOUX" on +#openttd
15:38-!-ToBeFree [] has quit [Remote host closed the connection]
15:54-!-gelignite [] has quit [Quit: Match found!]
15:58-!-andythenorth [] has joined #openttd
15:58-!-andythenorth is "andythenorth" on #openttd
16:00-!-sla_ro|master [] has quit []
16:17-!-Pikka [~Albert@] has joined #openttd
16:17-!-Pikka is "realname" on #openttd
16:17<andythenorth>uh oh
16:18<LordAro>oh uh
16:19<Pikka>dan didn't show, then?
16:26-!-frosch123 [] has quit [Quit: be yourself, except: if you have the opportunity to be a unicorn, then be a unicorn]
16:29<LordAro>@seen DanMack
16:29<@DorpsGek>LordAro: DanMack was last seen in #openttd 6 weeks, 5 days, 2 hours, 7 minutes, and 34 seconds ago: <DanMacK> LOL
16:30-!-nielsm [] has quit [Ping timeout: 480 seconds]
16:30<Samu>didn't work
16:30<Pikka>such is thing
16:31<LordAro>Samu: you've made a new commit, rather than amending the previous one
16:31<LordAro>the keyword here is "amend" (--amend in commandline speak)
16:31<Samu>I swear I used amend
16:31<Samu>then clicked commit
16:31<LordAro>used amend where?
16:32<LordAro>but regardless, now that you've got 2 commits, you'll need rebase
16:32<Samu>in Git GUI
16:32<Samu>I'm digging my own grave
16:33<andythenorth>until you know how to do it, it's hard
16:33<andythenorth>basic git is super easy
16:34<andythenorth>more advanced git is not
16:37<Samu>push didn't work
16:37<Samu>or if it did, nothing changed
16:38<LordAro>assuming there's an actual error message ("didn't work" continues to be useless), it'll be because you've "rewritten history", or changed the commits in the branch (name, content, whatever)
16:38<LordAro>you'll need to "force push"
16:39<LordAro>in git gui this is "force overwrite existing branch"
16:39<LordAro>there's a checkbox
16:39<Samu>i checked that box
16:39<Samu>i swear
16:39<Samu>nothing changed
16:39<LordAro>well was there an error message?
16:39<Samu>I ended up clicking commit
16:39<LordAro>this is why didn't work is useless
16:40<LordAro>it tells us nothing
16:40<Samu>it said Success
16:40<Samu>then I saw nothing changed on github
16:41<LordAro>thank you
16:41<LordAro>that was better, wasn't it?
16:41<LordAro>so yes, commit did nothing because there were no changes, and push also did nothing because there were no changes
16:41<Samu>the change was the message
16:42<LordAro>well you've already pushed that
16:42<LordAro>can you not see the second commit on github?
16:42<LordAro>(refresh the page)
16:42<Samu>i closed it
16:43<LordAro>so when you say "nothing changed on github" ...?
16:44<LordAro>and i have reopened it, because i am going to get this through your thick skull if it kills me
16:44-!-andythenorth [] has quit [Quit: andythenorth]
16:46<Samu>uh, ok :(
16:46<Samu>if you're really up to help me
16:46<LordAro> first off, read this
16:46<LordAro>yes, i know it uses the commandline syntax, but just go with it
16:51<Samu>i used git commit --amend in the command line, and I didn't know how to work with the editor
16:51<Samu>i couldn't navigate or save the file, I simply didn't know how to work
16:52<Samu>next I tried git GUI
16:52<Samu>brb, reading the rest
16:53<LordAro>yeah, if it dumps you into vi, you're probably going to have a bad time
16:53<LordAro>prepending EDITOR=nano might help
16:55<Samu>i need git rebase interactive from what I am reading
16:56<Samu>i hope it's not another program I must install
16:56<LordAro>it's not
16:56<LordAro>it is, however, another commandline flag
16:56<LordAro>`git rebase --interactive` (with the EDITOR thing from above)
16:57<Samu>git rebase --interactive EDITOR=nano
16:57<Samu>gonna try
16:57<Samu>prepend, hmm not sure what is that
16:57<LordAro>the opposite of append :p
16:57<LordAro>(put it at the beginning)
16:58-!-Wormnest [~Wormnest@] has quit [Ping timeout: 480 seconds]
16:59<Samu>git 'EDITOR=nano' is not a git command :(
17:00<LordAro>right at the beginning
17:00<LordAro>before git
17:00<LordAro>(this tells your commandline to use the nano editor)
17:01<Samu>'EDITOR' is not recognized as an internal or external command, operable program or batch file.
17:02<LordAro>and you're definitely running `EDITOR=nano git rebase --interactive` ?
17:02<LordAro>oh hang on, i see
17:02<LordAro>you're actually using cmd for this, aren't you?
17:02<Samu>Git CMD
17:02<Samu>there's also Git BASH
17:02<Samu>should I try that?
17:02<LordAro>aha, yes
17:03<Samu>$ EDITOR=nano git rebase --interactive fatal: not a git repository (or any of the parent directories): .git
17:03<LordAro>you still need to be in the correct directory
17:04<LordAro>(change directory in the same way that you do in cmd)
17:04<Samu>ahm, ok it's on D:\OpenTTD\OpenTTD GitHub
17:04<Samu>ahm, ok it's on D:\OpenTTD\OpenTTD GitHub\OpenTTD
17:04<Samu>because the thing is dumb
17:05<LordAro>right, so it's a slightly different syntax - cd /D/OpenTTD/...
17:06<Samu>yes! I'm in
17:06<Samu>I think
17:07<Eddi|zuHause>"EDITOR=nano" <-- surely there is a setting for that so you don't have to type it
17:07<+glx>git bash has a subset of MSYS2
17:07<Samu>Ricardo@FX-8150 MINGW64 /D/OpenTTD/OpenTTD GitHub/OpenTTD (start_date-for-Random-AI)
17:07<+glx>yes there's a gitrc somewhere
17:07<LordAro>i wasn't going to bother with that until later
17:08<Eddi|zuHause>LordAro: something more global
17:08<+glx>and I think I just use notepad
17:08<LordAro>Eddi|zuHause: .bashrc?
17:08<+glx>it's enough for git interactive
17:08<+glx>edit, save, close
17:09<Eddi|zuHause>LordAro: not quite what i meant
17:09<Eddi|zuHause>LordAro: also that still requires you to be actually in bash
17:09<LordAro>well, git checks various locations for its config dir
17:10<+glx>BTW my gitbash is powershell
17:10<LordAro>(.)gitconfig doesn't have to be per-repo
17:10<Samu> now I'm lost :p
17:10<+glx>with git-posh
17:10<Samu>maybe i shall read another guide?
17:10<+glx>or posh-git
17:11<LordAro>Samu: ah, my bad, i gave you the wrong command - git rebase --interactive origin/master
17:11<LordAro>(specifies the source branch)
17:12<Eddi|zuHause>what i probably meant: "git config --global core.editor nano"
17:13<LordAro>yeah, probably
17:13<LordAro>i tend to forget i can actually edit the config with git
17:13<Eddi|zuHause>i learned that basically yesterday
17:14-!-Wacko1976 [] has quit [Ping timeout: 480 seconds]
17:17<LordAro>right, so you've got a list of the commits (oldest first) in your branch at the top, and a load of comments below them
17:18<LordAro>you want to edit this file to tell the rebase to do what you want
17:19<LordAro>in this case, i'd recommend a reword for the first commit, and a fixup for the second
17:20<LordAro>(if you've not used nano before - exit will give you the option of saving)
17:29<Samu>where do I write these commands
17:29<Samu>this thing looks like a text editor
17:30<LordAro>it is indeed a text editor :)
17:30<LordAro>and replace the "pick" command, as appropriate
17:30<Samu>ah, it's a batch kind of thing?
17:30<Samu>ah, like a .bat file
17:31<LordAro>soort of
17:31<Samu>reword 3089aba46 Fix #6460 [AI]: add start_date parameter for Random AIs on new game
17:32<Samu>reword 3089aba46 Fix #6460: add start_date parameter for Random AIs on new game
17:32<LordAro>like that, yes
17:33<LordAro>(another window will open to let you actually alter the commit message)
17:33<Samu>really? I thought this was just text :(
17:34<LordAro>well, another editor window
17:34<LordAro>once you exit this one
17:34-!-Wolf01 [] has quit [Quit: Once again the world is quick to bury me.]
17:36<Samu> ah i see, i'm here now
17:36<LordAro>excellent, now correct the commit message
17:38<Samu>what about the refix? didn't open anything more :(
17:38<LordAro>fixup happens automatically, no further input required
17:38<LordAro>(read the comments at the bottom of the first rebase window again)
17:39<Samu>like "squash" but blabla
17:39<Samu>discard this commits message
17:40<LordAro>you can work out enough to also read squash's description? :p
17:40<LordAro>though i will admit "meld" is perhaps not the most obvious word to use
17:41<Samu>use commit, but meld into previous commit
17:41<LordAro>essentially, fixup takes that commit and combines it with the previous
17:41<LordAro>squash does the same, but the commit messages are also combined (iirc, i don't often use squash)
17:42<LordAro>anyway, all done?
17:42<Samu>not sure, i think not
17:42<LordAro>rebase has been successful
17:42<Samu> nothing changed
17:42<LordAro>now you need to push your changes
17:42-!-Progman [] has quit [Remote host closed the connection]
17:43<LordAro>as mentioned previously, you've changed the contents of the branch, so git won't let you push normally (doesn't let you overwrite changes)
17:43<LordAro>to force this, you need to ... force it
17:43<+glx>git push -f
17:44<LordAro>i always like to specify the remote and branch name when force pushing, to save other overwriting trouble
17:44<Samu>there is the 1 behind, 2 ahead thing :(
17:45<Samu>i dont have a push button, only a pull
17:45<Samu>or do u mean to use the git bash commands?
17:45<+glx>use the command line
17:46<LordAro>git gui does have a force push option as well
17:46<LordAro>it's one of the checkboxes
17:46<Samu>oh, I was on GitHub Desktop
17:46<+glx>github desktop tends to mess things up
17:46<Samu>ok i used glx
17:46<Samu>it pushed?
17:47<LordAro>it did!
17:47<+glx>like adding stupid merge commits
17:47<+glx>when a basic rebase would be better
17:48<LordAro>github has historically been very opposed to any sort of history rewriting
17:48<+glx>it's understandable yes
17:48<+glx>at least for main repos
17:48<Samu> ah, it took the changes of the 2nd commit
17:48<LordAro>i was surprised when they added squashing
17:48<Samu>i see
17:49<+glx>but for a PR branch it's safe to rewrite history
17:50<LordAro>i much prefer the history rewriting workflow for PRs
17:50<+glx>never rewrite history in a shared repo
17:50<Samu>what about the 1 behind, 2 ahead now?
17:51<Samu>nevermind, doesn't have a pull
17:51<Samu>only a fetch now
17:51<+glx>else coauthor will probably kill you
17:51<LordAro>Samu: it should be gone
17:51<LordAro>given the 2 commits that were there before have been replaced by the single commit
17:51<LordAro>glx: eh, as long as you agree beforehand
17:52<Samu>there's the Fix #6920: Make 9.8m/s^2 a common constant for TE-calculation that appeared in-between :(
17:52<+glx>anyway it makes sense to not mess with history when other work on the same repo
17:52<LordAro>Samu: in between?
17:53<Samu>yes, I made my first commit, then this one appears, then i made my second commit
17:53<Samu>and now I pushed this 3rd edit
17:53<LordAro>can you share what you're seeing?
17:54<LordAro>because you rebased on top of origin/master, your changes were applied to the latest commit on the master branch, which includes the TE-calculation commit
17:55<LordAro>it's clever like that
17:55<Samu>and ahead, brb
17:55<Samu> ahead
17:56<+glx>git fetch origin, then git rebase origin/master
17:56<LordAro>glx: upstream i think, judging by the screenshot
17:56<LordAro>Samu: slight adjustment to what i said above, because "origin" is your fork, and "upstream" is OpenTTD/OpenTTD
17:57<LordAro>because you rebased on top of origin/master, which is your fork, your changes were applied to the latest commit on the master branch of your fork, which did not include the TE-calculation commit
17:57<LordAro>hence, your branch does not include that commit, but upstream/master does
17:57<LordAro>it's nothing to worry about
17:59<+glx>hmm yes maybe I mixed up things
18:00<LordAro>i used to use upstream/origin, these days i use origin/fork
18:01-!-sushibear_ [] has joined #openttd
18:01-!-sushibear_ is "SushiBear" on #openttd #C
18:01-!-sushibear [] has quit [Read error: Connection reset by peer]
18:04<Eddi|zuHause>i generally try to default-pull from upstream and default-push to fork
18:13-!-chomwitt [] has quit [Ping timeout: 480 seconds]
18:24<Samu>thx LordAro for your enormous patience
18:24<Samu>and glc
18:32-!-triolus [] has quit [Quit: WeeChat 2.2]
18:46-!-Wormnest [~Wormnest@] has joined #openttd
18:46-!-Wormnest is "Wormnest" on #openttd
18:50-!-Wormnest [~Wormnest@] has quit []
18:51-!-Supercheese [] has quit [Read error: Connection reset by peer]
18:51-!-Supercheese [] has joined #openttd
18:51-!-Supercheese is "Supercheese" on #openttd
18:52-!-cHawk [] has quit [Quit: Leaving]
18:59-!-snail_UES_ [] has joined #openttd
18:59-!-snail_UES_ is "Jacopo Coletto" on #openttd
19:16<Samu>my proposal was meant to be that way :(
19:17<Samu>neutral stations are neutral, and thus, unafected by exclusive transport rights
19:18<Samu>i guess i can agree with nielsmh idea
19:19<Samu>only allow vehicles of own company to load cargo/deliver cargo
19:22<Eddi|zuHause> can anyone tell me what the ratio between upper and lower input is?
19:24-!-cHawk [] has joined #openttd
19:24-!-cHawk is "realname" on #openttd
19:32<Eddi|zuHause>i feel like i missed a more straightforward solution
---Logclosed Sun Sep 30 19:34:00 2018