Config
Log for #openttd on 30th September 2018:
Times are UTC Toggle Colours
00:07:12  *** Progman_ has quit IRC
00:09:03  *** chomwitt has quit IRC
00:18:05  <Samu> https://github.com/OpenTTD/OpenTTD/blob/master/src/script/api/script_list.cpp#L916
00:18:07  <Samu> ugh
00:18:09  *** snail_UES_ has joined #openttd
00:21:47  <Samu> so the idea I had was to put the valuator on hold, and suspend the script
00:21:58  <Samu> how would it resume?
00:22:41  <Samu> I better give up before I start
00:26:13  *** Flygon has joined #openttd
00:42:57  <Samu> WmDOT could really use some buses
00:43:14  <Samu> it already builds "highways"
00:43:25  <Samu> towns are connected, so why not
01:00:26  *** bob has joined #openttd
01:46:06  *** Samu has quit IRC
03:08:17  *** glx has quit IRC
03:17:06  *** haudrauf has quit IRC
03:18:05  *** haudrauf has joined #openttd
03:37:08  *** Maarten^ has joined #openttd
03:37:54  *** Wacko1976-work has joined #openttd
03:39:48  *** WWacko1976-work has quit IRC
03:41:42  *** Maarten has quit IRC
03:41:42  *** Maarten^ is now known as Maarten
03:48:29  *** snail_UES_ has quit IRC
03:57:35  *** Pikka has joined #openttd
04:50:36  *** Supercheese has joined #openttd
05:56:51  *** sla_ro|master has joined #openttd
06:15:55  *** andythenorth has joined #openttd
06:19:50  <andythenorth> moin
06:22:37  *** andythenorth has quit IRC
06:23:08  *** andythenorth has joined #openttd
06:23:31  *** chomwitt has joined #openttd
07:06:17  <Pikka> moin
07:06:26  * Pikka back in a couple of hours
07:06:30  *** Pikka has quit IRC
07:07:28  <andythenorth> oof it was pikka
07:07:32  <andythenorth> how rare
07:07:38  <andythenorth> @seen danmack
07:07:38  <DorpsGek> andythenorth: danmack was last seen in #openttd 6 weeks, 4 days, 12 hours, 45 minutes, and 16 seconds ago: <DanMacK> LOL
07:07:55  *** nielsm has joined #openttd
07:28:40  <andythenorth> moin nielsm
07:41:44  *** HerzogDeXtEr has joined #openttd
07:56:09  <nielsm> morning
08:06:34  *** Supercheese has quit IRC
08:07:16  *** Progman has joined #openttd
08:30:21  *** OtakuSenpai has joined #openttd
08:55:05  *** Progman has quit IRC
09:06:44  *** Wolf01 has joined #openttd
09:07:03  <Wolf01> o/
09:33:31  <andythenorth> yo
09:36:48  *** Nawab has joined #openttd
09:37:30  *** OtakuSenpai has quit IRC
09:41:21  <Wolf01> https://farm2.staticflickr.com/1942/44952962111_04580458f5_z.jpg andythenorth
09:41:41  <andythenorth> red wheels
09:57:31  <andythenorth> 77%
09:58:09  *** namad7 has joined #openttd
10:00:07  *** namad7 has quit IRC
10:01:33  <andythenorth> 49 trains to draw
10:01:37  <andythenorth> 166 drawn
10:05:13  *** Wacko1976 has joined #openttd
10:07:17  <Wolf01> Almost finished :P
10:08:24  <andythenorth> well
10:08:30  <andythenorth> some are just copy-paste-adjust
10:08:36  <andythenorth> but I left some of the hardest to end :(
10:13:16  *** Wacko1976 has quit IRC
10:13:23  <andythenorth> I can do 5 trains in a weekend
10:13:29  <andythenorth> done by Christmas? o_O
10:32:18  *** Pikka has joined #openttd
10:33:22  <Pikka> zounds
10:33:39  <Wolf01> o/
10:33:59  <Pikka> o/
10:34:17  <blathijs> LordAro: TrueBrain: Do you know if there's any progress on the ICU ParagraphLayout thing? I've just created https://github.com/OpenTTD/OpenTTD/issues/6922 to track it as well.
10:42:34  *** Wacko1976 has joined #openttd
10:56:18  <andythenorth> oof
10:56:20  <andythenorth> it's Pikka
10:56:27  <andythenorth> run away etc
10:56:31  <Pikka> uhoh
10:57:33  <andythenorth> Pikka: some ages ago, you were drawing trains
10:57:39  <andythenorth> big ones and stuff
10:57:52  <Pikka> I was!
10:58:28  <Pikka> and I did...
11:07:10  *** Nawab has quit IRC
11:07:16  *** frosch123 has joined #openttd
11:13:35  *** OtakuSenpai has joined #openttd
11:18:57  <andythenorth> Eddi|zuHause did a PR!
11:18:58  <andythenorth> https://github.com/OpenTTD/OpenTTD/pull/6921
11:19:03  <andythenorth> so can we merge it? o_O
11:20:04  *** triolus has joined #openttd
11:21:11  <nielsm> I've been spending most of my time playing two point hospital instead of doing anything else... current masterpiece https://0x0.st/sYAk.jpg
11:21:36  <andythenorth> I don't see the tanks in that
11:21:43  * andythenorth only plays tank games now :P
11:22:02  * andythenorth wishes WOT Blitz could be combined with Euro Truck Simulator
11:22:40  <nielsm> and train games only count because they have tank engines in them?
11:23:28  <Pikka> mmm, tanks
11:23:39  <Eddi|zuHause> so is two point hospital anything like Biing!? :p
11:23:59  <nielsm> I don't know that
11:24:05  <andythenorth> Pikka: NARS reboot then?
11:24:06  * Pikka back... eventually
11:24:09  <Pikka> oh
11:24:12  <Pikka> well
11:24:33  <Eddi|zuHause> andythenorth: Euro Blitz Simulator?
11:24:41  <andythenorth> yes
11:24:56  <andythenorth> some kind of convoy ambush game
11:25:10  <Pikka> possibly? :) plenty to finish with UKRS first, and I'd like to do industries and houses
11:25:22  <Eddi|zuHause> i was thinking you're just tasked with driving around the tank, parking correctly, and stuff... no actual battles :p
11:25:34  <Pikka> it's all on a rather distant back burner at the moment though
11:26:13  <andythenorth> Eddi|zuHause: so tank loading simulator?
11:26:25  <andythenorth> 2 teams, 7 minutes, winner is first one to load all tanks?
11:26:48  <andythenorth> https://www.youtube.com/watch?v=yBNCnk19Blk
11:27:41  * Pikka ->
11:27:42  *** Pikka has quit IRC
11:39:29  <LordAro> blathijs: no progress that i'm aware of
11:39:49  <LordAro> well, it's not used on windows any more
11:39:58  <LordAro> but that's probably not helpful to you
11:42:45  *** gelignite has joined #openttd
11:44:04  *** Wacko1976_ has joined #openttd
11:46:21  *** andythenorth has quit IRC
11:47:46  *** Wacko1976 has quit IRC
11:49:27  *** andythenorth has joined #openttd
11:52:39  <blathijs> LordAro: What's the alternative on Windows? Is there some Windows API for layouting?
11:53:40  <nielsm> yes
11:53:43  <nielsm> uniscribe
11:53:50  <nielsm> it's already been implemented
11:57:10  *** OtakuSenpai has quit IRC
11:57:50  *** OtakuSenpai has joined #openttd
12:02:18  *** andythenorth has quit IRC
12:11:16  *** Samu has joined #openttd
12:21:29  *** OtakuSenpai has quit IRC
12:22:23  *** OtakuSenpai has joined #openttd
12:25:26  *** OtakuSenpai has quit IRC
12:25:35  *** Nawab has joined #openttd
12:26:55  *** andythenorth has joined #openttd
12:31:35  <andythenorth> hmm
12:31:50  <andythenorth> I have to draw 2 narrow guage diesel engines
12:32:17  <andythenorth> 1950, 1995
12:32:33  <andythenorth> pls send me the pixels :P
12:35:04  *** Nawab has quit IRC
12:40:00  *** andythenorth has quit IRC
12:40:29  *** andythenorth has joined #openttd
12:40:41  <andythenorth> mostly I need some RL inspiration :P
12:43:28  <andythenorth> oof, here is the RL version of a train I invented in Horse :) https://photos.smugmug.com/Trains/Narrow-Gauge-Diesel/i-FH2DxHX/0/87fce10f/L/7321%20%27St%20Annes%20Express%27%20Severn%20Lamb%204w-4DH%20-%20St%20Annes%20Miniature%20Railway%2027.02.16%20%20Brian%20Cuttell-L.jpg
12:55:22  <FLHerne> andythenorth: https://www.festipedia.org.uk/wiki/Vale_of_Ffestiniog ?
12:55:35  <andythenorth> mini bone?
12:55:43  <FLHerne> (1967, but the bodywork is from 1997)
12:55:59  <FLHerne> Originally like https://www.festipedia.org.uk/wiki/Castell_Caernarfon
12:56:09  <andythenorth> I started drawing it, I'll find the spritesheet
12:56:41  <andythenorth> https://dev.openttdcoop.org/projects/iron-horse/repository/entry/src/graphics/pony/boar_cat.png
12:56:45  <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
12:57:30  <andythenorth> 7 column of sprites, 2nd row :P
12:57:36  <andythenorth> kind of ugly
12:59:23  <FLHerne> Proportions look a bit off?
12:59:31  <FLHerne> The cabs aren't higher than the main bodywork
12:59:41  <FLHerne> (on the real one)
13:00:08  <FLHerne> So it looks very stretched
13:08:11  *** tokai|noir has joined #openttd
13:08:11  *** ChanServ sets mode: +v tokai|noir
13:10:30  <andythenorth> need a colour scheme for NG diesels :P
13:10:53  <andythenorth> https://www.festipedia.org.uk/wiki/Hunslet_Taylor_6357
13:11:06  <andythenorth> funny bulky bonnets
13:13:25  *** andythenorth is now known as Guest119
13:13:25  *** andythenorth has joined #openttd
13:15:06  *** tokai has quit IRC
13:20:21  *** Guest119 has quit IRC
13:23:36  *** andythenorth has quit IRC
13:31:36  <FLHerne> I found https://www.festipedia.org.uk/wiki/Plasser_And_Theurer_KMX95_CM_Tamper quite interesting
14:05:28  *** Wacko1976 has joined #openttd
14:06:51  *** Wacko1976_ has quit IRC
14:13:33  *** Wacko1976 has quit IRC
14:24:44  *** Wacko1976 has joined #openttd
14:27:02  *** stefino has joined #openttd
14:27:18  <stefino> Hi..do anyone know if this project is still alive?
14:27:20  <stefino> https://wiki.openttd.org/Air_Vehicles_(New_Graphics)
14:32:48  <frosch123> check the "history" tab :)
14:33:30  <stefino> if you mean something like this "This page was last modified on 18 March 2011, at 08:18." :D
14:33:36  <stefino> this is not so possitive
14:41:09  *** Thedarkb-T60 has joined #openttd
14:46:15  <peter1138> But probably more useful than "nobody's heard of it"
14:53:48  <Samu> gonna do a "fresh install solo AI competition", what do u think?
14:54:05  <Samu> fresh openttd 1.8.0 install + AI downloaded from bananas
14:55:31  <Samu> maybe the only exceptions is gameseed, it will be the same for every AI and that the AI starts from day 1
14:55:35  <Samu> not 720
14:57:26  <Samu> or do you have other ideas?
14:58:51  <Samu> btw, is it possible to start decidated openttd in singleplayer?
15:00:30  <Samu> nobody's interested in my shenanigans
15:13:53  *** stefino has quit IRC
15:22:41  <Samu> competition started!https://imgur.com/xGtgfqU
15:23:10  *** jjavaholic has joined #openttd
15:26:15  *** andythenorth has joined #openttd
15:29:15  *** gelignite has quit IRC
15:30:44  *** operand has joined #openttd
15:31:26  <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
15:31:29  <operand> all my networks are boring af
15:33:06  <andythenorth> FLHerne: o_O ? http://www.johnsmurray.com/files/web105931.jpg
15:33:18  <andythenorth> operand: screenshot, or it didn't happen :)
15:41:07  *** operand has quit IRC
15:50:49  *** jjavaholic has quit IRC
16:05:00  *** Flygon has quit IRC
16:16:11  *** Thedarkb-T60 has quit IRC
16:31:07  *** Thedarkb-T60 has joined #openttd
16:37:45  <Samu> i feel like creating patch requests of my stuff, but I dunno if that's how it works
16:37:57  <Samu> what is deemed acceptable as a pull request?
16:39:45  <LordAro> follows code style would be a good start :)
16:40:18  <LordAro> (and complete)
16:40:26  <LordAro> beyond that, they can be debated about as necessary
16:40:39  <LordAro> (and possibly closed as a BAD FEATURE)
16:41:00  <Samu> i dunno how many patches I got here... about 182 files unsorted
16:41:21  <Samu> i dont think u want 182 pull requests
16:41:29  <LordAro> i wouldn't think so
16:41:36  <LordAro> surely there aren't 182 separate features
16:42:07  *** Progman has joined #openttd
16:42:43  <Samu> ok, time to clean up stuff that was already implemented/rejected/fixed, etc...
16:42:49  <Samu> deleting patches :(
16:42:52  <LordAro> probably a good start
16:44:24  <LordAro> but seriously, branch per feature/bugfix, multiple commits per branch
16:44:54  <LordAro> i'm expecting maybe 10 branches
16:45:16  <LordAro> (branches do not need to become pull requests)
16:46:03  <Samu> have u seen this last https://github.com/OpenTTD/OpenTTD/compare/master...SamuXarick:max_no_competitors-=-15-v33-r27931.patch branch? I put it all in 1 single commit
16:46:38  <Samu> is 1 single commit a bad idea for such a large feature?
16:47:19  <LordAro> maybe, maybe not
16:47:24  <LordAro> depends on the feature :p
16:47:47  <LordAro> for starters, the commit message is far too generic, "overhaul" doesn't explain to me what the feature is at all
16:48:05  <Samu> different gui
16:48:32  <Samu> but i'm also doing a few other things than just altering the gui
16:48:40  <Samu> and it's not mentioned
16:48:49  <LordAro> right, so those should be in separate commits
16:50:02  <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
16:50:05  <LordAro> that sort of thing
16:50:50  <andythenorth> oof
16:50:58  <andythenorth> electro-diesels with pantograph
16:51:07  <andythenorth> hide pantograph on non-elrail?
16:51:52  <Eddi|zuHause> as visual indication which power value they use?
16:52:08  <Eddi|zuHause> lowered/raised pantograph
16:56:14  <Samu> ugh, build on competitor canal needs to be modified, you recently made changes to the map tiles
16:56:22  <Samu> it completely broke this one
16:56:53  <andythenorth> Eddi|zuHause: more it just looks weird sticking up when there's no wires
16:57:03  <andythenorth> and obvs it's an easy BAD FEATURE
16:58:15  <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
16:58:57  <Eddi|zuHause> they need the counterpressure of the wire to not cross this "point of no return"
17:04:39  <Samu> Check Bankruptcy Before Infrastructure Costs yay, this one was implemented :p
17:04:41  <Samu> deleting
17:08:13  <andythenorth> pantograph can use a sprite layer :P
17:08:34  <Eddi|zuHause> that should be possible now
17:08:46  <Samu> faster server autosaves was rejected, wasn't it? I recall reading something from Alberth
17:09:03  <Samu> on the old flyspray
17:10:53  <LordAro> all issues were imported to github, you should be able to search for it
17:13:01  <LordAro> (and flyspray is still up anyway)
17:21:59  <andythenorth> anyone want to approve some PRs? o_O
17:22:00  <Samu> restart dead ai was a bad feature, deleting
17:23:29  *** Tharbakim has joined #openttd
17:23:43  <Samu> separate forbid 90 degrees for trains and ships
17:24:02  <Samu> was something done about this? i heard u talking about it a few days ago
17:25:07  <andythenorth> ships should never be forbidden
17:25:22  <Samu> what the patch do: have 2 settings for the 90 degrees, 1 for trains, 1 for ships
17:28:02  <Eddi|zuHause> bids should never be forshipped
17:28:13  *** gelignite has joined #openttd
17:28:30  <Samu> temp.patch
17:28:41  <Samu> right... i have no idea wtf this was
17:28:44  <Samu> dleeted
17:29:24  <Samu> okay, not deleted, it's about build on competitor canal stuff
17:30:45  <Samu> terraforming rivers testing
17:31:12  <Samu> very experimental patch, really cool to see it work, but there's missing graphics
17:34:12  <Samu> variety changed to become a game setting v1 r27967 this was implemented, deleted
17:38:47  <andythenorth> Eddi|zuHause: did nobody approve your PR yet? :|
17:39:18  <Eddi|zuHause> would i notice?
17:39:35  <andythenorth> maybe not
17:39:53  <andythenorth> oh
17:40:00  <andythenorth> I've been given approval permissions
17:40:02  <andythenorth> is that wise?
17:40:19  *** snail_UES_ has joined #openttd
17:40:32  <Eddi|zuHause> probably not :p
17:41:48  <andythenorth> I've approved itr
17:41:52  <andythenorth> can't merge though
17:44:43  *** Wacko1976 has quit IRC
17:46:33  *** Wacko1976 has joined #openttd
17:54:13  <Samu> im still learning this github website
17:54:51  <Samu> how to turn an issue into a pull request ?
17:55:02  <LordAro> you don't
17:55:09  <Samu> i create a pull request and refer the issue?
17:55:15  <LordAro> yeah
17:55:22  <Samu> hmm ok
17:55:56  <Samu> 1 single line pull request incoming
17:59:40  <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.
17:59:58  <Samu> it's so confusing
18:00:05  <LordAro> what's confusing?
18:00:36  <Samu> what branch?
18:00:45  <LordAro> whatever you name it
18:00:47  <LordAro> there's a textbox
18:04:23  <peter1138> Yeah, all changes are done in branches, not master.
18:04:30  <peter1138> git branches are nothing like svn branches.
18:04:52  <peter1138> They're way more... temporary in a way. Can be used like svn branches as well, though.
18:05:09  <Samu> patch-1? HORRIBLE NAME
18:05:15  <Samu> i'm disappointed, how do i rename now?
18:05:19  <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 :()
18:05:21  <LordAro> what's wrong with it?
18:05:28  *** ToBeFree has joined #openttd
18:05:34  <Samu> it's a bad branch name
18:05:39  <LordAro> the branch name is irrelevant, other for keeping track of what change it is
18:05:58  <LordAro> there's no way to change it (in github web interface)
18:06:58  <Samu> must delete or rename,
18:07:09  <LordAro> why?
18:07:32  <peter1138> You can delete it. You can rename by making a new branch off it, and then deleting the old name.
18:07:51  <peter1138> If you already made a PR that would be a bad idea, though.
18:14:54  <Samu> why is that everytime i find help about git stuff, it's always using command line stuff? useless help!
18:15:13  <LordAro> because git is a command line program
18:15:17  <Samu> isn't there a right-click rename somewhere?
18:15:18  <LordAro> most people use it that way
18:15:30  <LordAro> because it's not just a folder you can rename
18:16:34  <Samu> they really like to make it hard to program
18:18:17  <LordAro> well if you insist on not reading the documentation, that's to be expected
18:18:47  <LordAro> https://www.sublimemerge.com/ 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
18:21:06  <Samu> alright, deleted
18:21:12  <LordAro> ...
18:21:18  <LordAro> your approach to software is weird
18:21:21  <Samu> patch-1 Deleted just now by SamuXarick
18:21:55  <LordAro> anyway, please just go read some stuff about how git actually works
18:22:08  <LordAro> instead of your usual flailing
18:22:15  <Samu> heh flailing
18:22:20  *** Wormnest has joined #openttd
18:22:25  <LordAro> (hint: i shouldn't have to use the phrase "usual flailing" more than once)
18:25:22  *** andythenorth has quit IRC
18:29:29  <peter1138> heh
18:33:24  <LordAro> https://git-scm.com/download/gui/windows alternatively, one of these
18:42:01  <Samu> there I go again, failing
18:44:27  <Samu> https://github.com/OpenTTD/OpenTTD/pull/6923 I have a feeling the commit checker likes to fail just for the sake of failing
18:45:45  *** snail_UES_ has quit IRC
18:46:04  <Samu> this is so disappointing...
18:46:41  <nielsm> the error is that you put [AI] before the :
18:47:02  <nielsm> Fix #6460: [AI] add start_date parameter for Random AIs on new game
18:47:49  <Samu> I see
18:47:53  <Samu> how am I to fix that now?
18:48:01  <Samu> it's already submited
18:48:03  <Samu> can't go back
18:48:23  <LordAro> you can overwrite it
18:48:28  <nielsm> git commandline
18:48:30  <michi_cc> git commit --amend to fix the message and then git push -f to update
18:48:30  <LordAro> but you guessed, it that probably involves using the command line
18:48:32  <nielsm> git commit --amend
18:48:39  <nielsm> then you can edit the commit message
18:48:47  <nielsm> and then you have to git push --force
18:48:49  <LordAro> i made the same mistake with the commit message in my PR
18:49:07  *** Supercheese has joined #openttd
18:55:36  <Samu> downloading Git :(
18:57:00  <Samu> absolutely no idea what are these install options and checks, I just click next next next
18:58:08  <LordAro> and you wonder why you don't understand thing
18:58:10  <LordAro> s
18:59:03  <Samu> i'm forced to download trash to fix 1 little thing...
18:59:12  <Samu> :(
18:59:18  <Samu> sorry
18:59:28  <Samu> it's how I feel about all this
18:59:44  <LordAro> try learning something
19:05:55  <Eddi|zuHause> i have exactly two people on my ignore list... one for being incapable of learning, and one for being an asshole
19:06:14  <LordAro> it's andy, isn't it? :p
19:06:38  <Eddi|zuHause> almost :p
19:07:22  <Eddi|zuHause> i would use the forum ignore list more, if it wasn't such an incredibly useless feature
19:08:06  <Eddi|zuHause> cause there's two or three more people like that, that i really wish i could ignore
19:16:55  *** Thedarkb1-T60 has joined #openttd
19:22:38  *** Thedarkb-T60 has quit IRC
19:24:13  *** ToBeFree has quit IRC
19:38:28  *** ToBeFree has joined #openttd
19:38:51  *** glx has joined #openttd
19:38:51  *** ChanServ sets mode: +v glx
19:38:53  *** ToBeFree has quit IRC
19:54:45  *** gelignite has quit IRC
19:58:09  *** andythenorth has joined #openttd
20:00:09  *** sla_ro|master has quit IRC
20:17:35  *** Pikka has joined #openttd
20:17:42  <andythenorth> uh oh
20:18:11  <LordAro> oh uh
20:19:12  <Pikka> mmhm
20:19:34  <Pikka> dan didn't show, then?
20:26:48  *** frosch123 has quit IRC
20:28:09  <andythenorth> nope
20:29:56  <LordAro> @seen DanMack
20:29:56  <DorpsGek> LordAro: DanMack was last seen in #openttd 6 weeks, 5 days, 2 hours, 7 minutes, and 34 seconds ago: <DanMacK> LOL
20:30:13  *** nielsm has quit IRC
20:30:24  <Samu> didn't work
20:30:51  <Pikka> such is thing
20:31:21  <LordAro> Samu: you've made a new commit, rather than amending the previous one
20:31:38  <LordAro> the keyword here is "amend" (--amend in commandline speak)
20:31:43  <Samu> I swear I used amend
20:31:48  <Samu> then clicked commit
20:31:59  <LordAro> used amend where?
20:32:11  <LordAro> but regardless, now that you've got 2 commits, you'll need rebase
20:32:16  <Samu> in Git GUI
20:32:38  <Samu> I'm digging my own grave
20:33:51  <andythenorth> until you know how to do it, it's hard
20:33:55  <andythenorth> basic git is super easy
20:34:04  <andythenorth> more advanced git is not
20:37:42  <Samu> push didn't work
20:37:51  <Samu> or if it did, nothing changed
20:38:34  <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)
20:38:39  <LordAro> you'll need to "force push"
20:39:19  <LordAro> in git gui this is "force overwrite existing branch"
20:39:24  <LordAro> there's a checkbox
20:39:36  <Samu> i checked that box
20:39:39  <Samu> i swear
20:39:43  <Samu> nothing changed
20:39:49  <LordAro> well was there an error message?
20:39:52  <Samu> I ended up clicking commit
20:39:54  <LordAro> this is why didn't work is useless
20:40:00  <LordAro> it tells us nothing
20:40:16  <Samu> it said Success
20:40:24  <Samu> then I saw nothing changed on github
20:41:07  <LordAro> thank you
20:41:10  <LordAro> that was better, wasn't it?
20:41:33  <LordAro> so yes, commit did nothing because there were no changes, and push also did nothing because there were no changes
20:41:51  <Samu> the change was the message
20:42:06  <LordAro> well you've already pushed that
20:42:16  <LordAro> can you not see the second commit on github?
20:42:19  <LordAro> (refresh the page)
20:42:43  <Samu> i closed it
20:43:05  <LordAro> so when you say "nothing changed on github" ...?
20:44:26  <LordAro> and i have reopened it, because i am going to get this through your thick skull if it kills me
20:44:50  *** andythenorth has quit IRC
20:46:17  <Samu> uh, ok :(
20:46:25  <Samu> if you're really up to help me
20:46:39  <LordAro> https://www.atlassian.com/git/tutorials/rewriting-history first off, read this
20:46:53  <LordAro> yes, i know it uses the commandline syntax, but just go with it
20:51:32  <Samu> i used git commit --amend in the command line, and I didn't know how to work with the editor
20:51:57  <Samu> i couldn't navigate or save the file, I simply didn't know how to work
20:52:11  <Samu> next I tried git GUI
20:52:33  <Samu> brb, reading the rest
20:53:27  <LordAro> yeah, if it dumps you into vi, you're probably going to have a bad time
20:53:36  <LordAro> prepending EDITOR=nano might help
20:55:47  <Samu> i need git rebase interactive from what I am reading
20:56:01  <Samu> i hope it's not another program I must install
20:56:09  <LordAro> it's not
20:56:16  <LordAro> it is, however, another commandline flag
20:56:29  <LordAro> `git rebase --interactive` (with the EDITOR thing from above)
20:57:10  <Samu> git rebase --interactive EDITOR=nano
20:57:14  <Samu> gonna try
20:57:16  <LordAro> prepend
20:57:29  <Samu> prepend, hmm not sure what is that
20:57:36  <LordAro> the opposite of append :p
20:57:42  <LordAro> (put it at the beginning)
20:58:11  *** Wormnest has quit IRC
20:59:59  <Samu> git 'EDITOR=nano' is not a git command :(
21:00:30  <LordAro> right at the beginning
21:00:31  <LordAro> before git
21:00:47  <LordAro> (this tells your commandline to use the nano editor)
21:01:46  <Samu> 'EDITOR' is not recognized as an internal or external command, operable program or batch file.
21:02:14  <LordAro> and you're definitely running `EDITOR=nano git rebase --interactive` ?
21:02:25  <LordAro> oh hang on, i see
21:02:33  <LordAro> you're actually using cmd for this, aren't you?
21:02:42  <Samu> Git CMD
21:02:48  <Samu> there's also Git BASH
21:02:50  <Samu> should I try that?
21:02:53  <LordAro> aha, yes
21:03:35  <Samu> $ EDITOR=nano git rebase --interactive fatal: not a git repository (or any of the parent directories): .git
21:03:51  <LordAro> you still need to be in the correct directory
21:04:11  <LordAro> (change directory in the same way that you do in cmd)
21:04:17  <Samu> ahm, ok it's on D:\OpenTTD\OpenTTD GitHub
21:04:28  <Samu> ahm, ok it's on D:\OpenTTD\OpenTTD GitHub\OpenTTD
21:04:36  <Samu> because the thing is dumb
21:05:42  <LordAro> right, so it's a slightly different syntax - cd /D/OpenTTD/...
21:06:52  <Samu> yes! I'm in
21:06:56  <Samu> I think
21:07:05  <Eddi|zuHause> "EDITOR=nano" <-- surely there is a setting for that so you don't have to type it
21:07:09  <glx> git bash has a subset of MSYS2
21:07:20  <Samu> Ricardo@FX-8150 MINGW64 /D/OpenTTD/OpenTTD GitHub/OpenTTD (start_date-for-Random-AI)
21:07:27  <LordAro> excellent
21:07:38  <glx> yes there's a gitrc somewhere
21:07:49  <LordAro> .gitconfig
21:07:57  <LordAro> i wasn't going to bother with that until later
21:08:06  <Eddi|zuHause> LordAro: something more global
21:08:10  <glx> and I think I just use notepad
21:08:23  <LordAro> Eddi|zuHause: .bashrc?
21:08:40  <glx> it's enough for git interactive
21:08:53  <glx> edit, save, close
21:09:06  <Eddi|zuHause> LordAro: not quite what i meant
21:09:20  <Eddi|zuHause> LordAro: also that still requires you to be actually in bash
21:09:40  <LordAro> well, git checks various locations for its config dir
21:09:47  <LordAro> file*
21:10:05  <glx> BTW my gitbash is powershell
21:10:05  <LordAro> (.)gitconfig doesn't have to be per-repo
21:10:24  <Samu> https://imgur.com/gf5mMOd now I'm lost :p
21:10:36  <glx> with git-posh
21:10:37  <Samu> maybe i shall read another guide?
21:10:52  <glx> or posh-git
21:11:10  <LordAro> Samu: ah, my bad, i gave you the wrong command - git rebase --interactive origin/master
21:11:29  <LordAro> (specifies the source branch)
21:11:31  <LordAro> (ish)
21:12:37  <Eddi|zuHause> what i probably meant: "git config --global core.editor nano"
21:13:13  <LordAro> yeah, probably
21:13:25  <LordAro> i tend to forget i can actually edit the config with git
21:13:45  <Eddi|zuHause> i learned that basically yesterday
21:14:43  *** Wacko1976 has quit IRC
21:15:58  <Samu> https://imgur.com/Yh2AKbF
21:16:00  <Samu> there
21:17:13  <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
21:18:25  <LordAro> you want to edit this file to tell the rebase to do what you want
21:19:00  <LordAro> in this case, i'd recommend a reword for the first commit, and a fixup for the second
21:20:29  <LordAro> (if you've not used nano before - exit will give you the option of saving)
21:29:37  <Samu> where do I write these commands
21:29:46  <Samu> this thing looks like a text editor
21:30:25  <LordAro> it is indeed a text editor :)
21:30:46  <LordAro> and replace the "pick" command, as appropriate
21:30:49  <Samu> ah, it's a batch kind of thing?
21:30:58  <Samu> ah, like a .bat file
21:31:02  <LordAro> soort of
21:31:54  <Samu> reword 3089aba46 Fix #6460 [AI]: add start_date parameter for Random AIs on new game
21:32:06  <Samu> reword 3089aba46 Fix #6460: add start_date parameter for Random AIs on new game
21:32:08  <Samu> ops
21:32:53  <LordAro> like that, yes
21:33:11  <LordAro> (another window will open to let you actually alter the commit message)
21:33:33  <Samu> really? I thought this was just text :(
21:34:10  <LordAro> well, another editor window
21:34:17  <LordAro> once you exit this one
21:34:39  <Wolf01> 'night
21:34:43  *** Wolf01 has quit IRC
21:36:26  <Samu> https://imgur.com/1ISJ3pk ah i see, i'm here now
21:36:55  <LordAro> excellent, now correct the commit message
21:38:09  <Samu> what about the refix? didn't open anything more :(
21:38:37  <LordAro> fixup happens automatically, no further input required
21:38:54  <LordAro> (read the comments at the bottom of the first rebase window again)
21:39:38  <Samu> like "squash" but blabla
21:39:51  <Samu> discard this commits message
21:40:28  <LordAro> you can work out enough to also read squash's description? :p
21:40:45  <LordAro> though i will admit "meld" is perhaps not the most obvious word to use
21:41:06  <Samu> use commit, but meld into previous commit
21:41:31  <LordAro> essentially, fixup takes that commit and combines it with the previous
21:41:56  <LordAro> squash does the same, but the commit messages are also combined (iirc, i don't often use squash)
21:42:09  <LordAro> anyway, all done?
21:42:11  <Samu> https://imgur.com/CDDx3TZ
21:42:16  <Samu> not sure, i think not
21:42:27  <LordAro> almost!
21:42:31  <LordAro> rebase has been successful
21:42:32  <Samu> https://github.com/OpenTTD/OpenTTD/pull/6923 nothing changed
21:42:39  <LordAro> now you need to push your changes
21:42:44  *** Progman has quit IRC
21:43:26  <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)
21:43:36  <LordAro> to force this, you need to ... force it
21:43:59  <glx> git push -f
21:44:07  <LordAro> ^
21:44:27  <LordAro> i always like to specify the remote and branch name when force pushing, to save other overwriting trouble
21:44:31  <Samu> there is the 1 behind, 2 ahead thing :(
21:45:32  <Samu> i dont have a push button, only a pull
21:45:40  <Samu> or do u mean to use the git bash commands?
21:45:43  <glx> use the command line
21:46:05  <LordAro> git gui does have a force push option as well
21:46:08  <LordAro> it's one of the checkboxes
21:46:22  <Samu> oh, I was on GitHub Desktop
21:46:39  <glx> github desktop tends to mess things up
21:46:43  <Samu> ok i used glx
21:46:50  <Samu> it pushed?
21:47:03  <LordAro> it did!
21:47:05  <LordAro> yay!
21:47:10  <glx> like adding stupid merge commits
21:47:36  <glx> when a basic rebase would be better
21:48:12  <LordAro> github has historically been very opposed to any sort of history rewriting
21:48:26  <glx> it's understandable yes
21:48:45  <glx> at least for main repos
21:48:50  <Samu> https://github.com/OpenTTD/OpenTTD/pull/6923/files ah, it took the changes of the 2nd commit
21:48:50  <LordAro> i was surprised when they added squashing
21:48:54  <Samu> i see
21:49:53  <glx> but for a PR branch it's safe to rewrite history
21:50:14  <LordAro> yeah
21:50:32  <LordAro> i much prefer the history rewriting workflow for PRs
21:50:42  <glx> never rewrite history in a shared repo
21:50:52  <Samu> what about the 1 behind, 2 ahead now?
21:51:02  <Samu> nevermind, doesn't have a pull
21:51:06  <Samu> only a fetch now
21:51:07  <glx> else coauthor will probably kill you
21:51:08  <LordAro> Samu: it should be gone
21:51:33  <LordAro> given the 2 commits that were there before have been replaced by the single commit
21:51:53  <LordAro> glx: eh, as long as you agree beforehand
21:52:23  <Samu> there's the Fix #6920: Make 9.8m/s^2 a common constant for TE-calculation that appeared in-between :(
21:52:40  <glx> anyway it makes sense to not mess with history when other work on the same repo
21:52:43  <LordAro> Samu: in between?
21:53:05  <Samu> yes, I made my first commit, then this one appears, then i made my second commit
21:53:19  <Samu> and now I pushed this 3rd edit
21:53:23  <LordAro> can you share what you're seeing?
21:54:57  <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
21:55:02  <LordAro> it's clever like that
21:55:12  <Samu> https://imgur.com/MjUcBBT
21:55:17  <Samu> behind
21:55:21  <Samu> and ahead, brb
21:55:48  <Samu> https://imgur.com/LKWP8Ed ahead
21:56:01  <glx> git fetch origin, then git rebase origin/master
21:56:16  <LordAro> glx: upstream i think, judging by the screenshot
21:56:58  <LordAro> Samu: slight adjustment to what i said above, because "origin" is your fork, and "upstream" is OpenTTD/OpenTTD
21:57:37  <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
21:57:49  <LordAro> hence, your branch does not include that commit, but upstream/master does
21:57:54  <LordAro> it's nothing to worry about
21:59:29  <glx> hmm yes maybe I mixed up things
22:00:11  <LordAro> i used to use upstream/origin, these days i use origin/fork
22:01:57  *** sushibear_ has joined #openttd
22:01:57  *** sushibear has quit IRC
22:04:39  <Eddi|zuHause> i generally try to default-pull from upstream and default-push to fork
22:13:23  *** chomwitt has quit IRC
22:24:04  <Samu> thx LordAro for your enormous patience
22:24:41  <Samu> and glc
22:24:43  <Samu> glx
22:25:48  <LordAro> :)
22:32:38  *** triolus has quit IRC
22:46:43  *** Wormnest has joined #openttd
22:50:22  *** Wormnest has quit IRC
22:51:00  *** Supercheese has quit IRC
22:51:22  *** Supercheese has joined #openttd
22:52:45  *** cHawk has quit IRC
22:59:33  *** snail_UES_ has joined #openttd
23:14:45  <Samu> https://github.com/OpenTTD/OpenTTD/issues/6657#issuecomment-395957406
23:16:28  <Samu> my proposal was meant to be that way :(
23:17:11  <Samu> neutral stations are neutral, and thus, unafected by exclusive transport rights
23:18:20  <Samu> i guess i can agree with nielsmh idea
23:19:17  <Samu> only allow vehicles of own company to load cargo/deliver cargo
23:22:36  <Eddi|zuHause> https://ibin.co/4HXE77eS9NLD.png can anyone tell me what the ratio between upper and lower input is?
23:24:11  *** cHawk has joined #openttd
23:32:57  <Eddi|zuHause> i feel like i missed a more straightforward solution https://imagebin.ca/v/4HXHHCAnxNgv
23:34:00  *** mikegrb has quit IRC
23:48:13  *** snail_UES_ has quit IRC
23:54:53  *** snail_UES_ has joined #openttd
23:57:14  *** Mahjong has joined #openttd
23:58:05  *** Mahjong has joined #openttd

Powered by YARRSTE version: svn-trunk