Times are UTC Toggle Colours
04:42:45 <Brot6> zBase - Bug #4781 (New): Level crossings missing road crossing lights XkamnetX @ http://dev.openttdcoop.org/issues/4781 12:01:40 <Ammler> hmm, did chillcore report the new repo url? 12:02:20 <Ammler> oh, doesn't look like he merged his patch 12:02:48 <Ammler> I could simply add a clone to chillpp.mq 12:19:03 *** chillcore has joined #openttdcoop.devzone 12:19:26 <chillcore> Hello all 12:22:28 <chillcore> Ammler: I have not yet pushed, the reason being that I get a warning that a second head will be created when using "push -f" and I do not know what the CF does when a repo has two heads. will it just compile tip or will the two heads fight? 12:22:49 <chillcore> I wanted to spare you the cleanup again. 12:32:11 <Ammler> why do you care? 12:32:27 <Ammler> oh well, still why do you care? :-) 12:33:00 <Ammler> if you base your patches on a older rev then the head on that repo, you get a new head 12:33:09 <Ammler> but that does really not matter, imo 12:33:29 <Ammler> cf will either update to tip or default 12:34:06 <Ammler> if you use trunk only, you have default and tip on same changeset 12:35:13 <chillcore> ok. just wanted to be sure. 12:36:06 <chillcore> will push now then as everything is already setup. Thank you. 12:38:45 <chillcore> hmmm ... File "bin/data/copypaste.grf" may not be added ... 12:39:32 <chillcore> could you please enable binary supprt on this repo? 12:39:49 <chillcore> whenever you find some time that is 12:56:31 <V453000> I think he is busy arguing :) 12:59:16 <chillcore> ah ok. thank you for the info. 13:00:54 <V453000> yw :) 13:01:27 * chillcore continues holding his finger above the enter button. :P 13:01:51 <chillcore> just kidding. whenever is fine as usual. 13:14:34 <Ammler> chillcore: ? 13:14:42 <Ammler> you should highlight 13:15:39 <chillcore> will do Ammler 13:17:05 <planetmaker> chillcore, creating new heads is not a principle problem. It's like an unnamed branche 13:17:06 <Ammler> I mean, I don't get your question 13:17:07 <planetmaker> -e 13:17:38 <planetmaker> but you might want to close the unwanted heads... or they'll show up pointlessly in hg heads 13:17:44 <Ammler> how do you enable binary support? 13:17:46 <chillcore> I could not upload the grfs ... most llikely the pngs would have failed to. IIRC last time someone enabled binary files exlicitely. 13:18:00 <Ammler> ah, grfs aren't allowed per default 13:18:10 <Ammler> now you need .devzone :-) 13:19:26 <Ammler> .devzone/hooks/repo_check.ini 13:19:34 <Ammler> we might need .devzone anyway 13:20:30 <chillcore> repo_check.ini can stay emty? 13:22:08 <Ammler> https://hg.openttdcoop.org/misc/file/default/mercurial/hooks/repo_checks.ini 13:22:22 <Ammler> use that and adjust accordingly 13:22:32 <Brot6> DevZone Help Center - Revision 176:fc79301ada49: [Hooks] don't allow binaries like .grf, .tar* .rar ... XAmmlerX @ http://dev.openttdcoop.org/projects/home/repository/revisions/fc79301ada49 13:23:28 <Ammler> oh, and you need to push that before you push the grf 13:24:37 <chillcore> ok. 13:25:33 <Ammler> I will then later add the script to generate diffs 13:26:21 <Ammler> or if you think, you know how, feel free to 13:26:46 <Ammler> also enabling building on push would then make sense 13:29:14 <Ammler> chillcore: why do you need to push a grf at all? 13:29:25 <Ammler> don't youhave the sources? 13:30:12 <Ammler> I thouht, you update ottd.grf 13:31:16 <Ammler> hmm, you can't as you would lose support of OpenGFX, right? 13:31:53 <chillcore> sorry for the delay I have a visitor. 13:32:09 <Ammler> please do not always worry about us :-P 13:32:35 <Ammler> we aren't here because of you 13:33:25 <chillcore> I used to provide the grfs with the binaries for easy of configuration. I can provide them seperatly if prefered. 13:33:36 <Ammler> no 13:33:57 <Ammler> if we like to also provide diffs etc. we need .devzone anyway 13:34:10 <chillcore> ... not here because of me ... :( 13:34:12 <chillcore> ok 13:34:16 <Ammler> :-D 13:34:29 <Ammler> we are here for everyone :-P 13:38:36 <planetmaker> oh, can we now disable the grfhook by an addition to the .devzone files, Ammler ? 13:39:01 <Ammler> we could since the beginning 13:39:37 <Ammler> alberth made the hook repo customizeable since we added it 13:40:09 <Ammler> back then, we were developing grfpack ;-) 13:40:54 <Ammler> https://hg.openttdcoop.org/grfpack/file/73c3e28da510/.devzone/hooks/repo_check.ini 13:42:02 <chillcore> devzone needs to be in trunk this time right next to .hg? enabling the builds is done in .devzone/build/releases/enable and the same for testing right? Do I need testing? 13:42:29 <chillcore> now first unpatch ... 13:45:11 <Ammler> no need for releases 13:45:16 <Ammler> also no need for testing 13:45:29 <Ammler> just add the hook ini for now 13:46:13 <Ammler> testing was to test automatic merging of mq 13:46:36 <Ammler> if we use devzone to build the diffs, it would be on push (.devzone/build/push/...) 14:13:22 <chillcore> Ammler: I pushed that ini file and re-added the patch but I still am not allowed to upload the grfs. First push was fine and second did not need -f before aborting 14:14:46 <chillcore> in regards of that script for diffs ... I would not know where to start to be honest. 14:14:58 <Ammler> your ini still has .grf as bad-ending 14:15:20 <Ammler> I posted the default ini which is used if you don't have a custom ii 14:15:24 <Ammler> you need to adjust it 14:15:32 <Ammler> removing .grf 14:15:46 <chillcore> damn I forgot to "adjust as needed" ... nom nom ... I blame my visitor ... nah. 14:15:57 <Ammler> yeah :-P 14:16:07 <Ammler> as long as don't sorry again 14:16:57 <chillcore> I won't. Sorry for doing that before :P (how do you do the teeth thinghie?) 14:16:58 <Ammler> also be sue, to have the ini in the same branch as your patch will be 14:17:15 <Ammler> else it might fail again, well maybe not, you will see 14:17:20 <chillcore> I did that yes ;) 14:17:36 <Ammler> I guess, it just looks for tip 14:17:43 <Ammler> no clue really 14:17:50 <Ammler> that was done by someone else 14:18:03 <Ammler> (Alberth) 14:26:49 <chillcore> Ammler: Made the change ... still refused. 14:32:38 <Ammler> hmm, I am sure, it should work 14:34:40 <chillcore> I just ried again to make sure. it sends everything (I think) and as it ends it does a rollback 14:34:44 <chillcore> +t 14:34:59 <Brot6> test: update from r128 to r129 done - http://bundles.openttdcoop.org/test/push/r129 14:35:22 <Ammler> chillcore: and refuses because of the grf? 14:35:51 <chillcore> remote: added 1 changesets with 340 changes to 340 files remote: File "bin/data/copypaste.grf" may not be added to the repository.transaction abort! remote: rollback completed 14:39:36 <Ammler> I wonder if this is because of the multiple heads 14:41:51 <Brot6> test: update from r129 to r131 done - http://bundles.openttdcoop.org/test/push/r131 14:42:10 <chillcore> maybe. in regards of that ... Alberth suggested to strip everything between r22556 and later since I will not be bumping anyways. 14:44:04 <Ammler> strip is useless on next update you would pull it again 14:44:39 <Ammler> I can't reproduce it on the test repo 14:46:59 <Ammler> strange 14:49:11 <chillcore> I could try and push one of the .png and then a .grf to see if that makes a difference? 14:50:10 <Ammler> I strip the rest for test 14:52:14 <Ammler> but first try again :-) 14:52:39 <Ammler> I guess, the check for existing ini file is screwed 14:52:56 <Ammler> now I need to be sorry :-P 14:53:55 <chillcore> no luck ... still refuses. 14:54:03 <chillcore> hehe 15:22:10 <Brot6> NewGRF Meta Language - Bug #4769 (Closed): Assertion error with high value from random switch -> pow... XV453000X @ http://dev.openttdcoop.org/issues/4769 15:22:10 <Brot6> NewGRF Meta Language - Bug #4769 (Closed): Assertion error with high value from random switch -> pow... XHirundoX @ http://dev.openttdcoop.org/issues/4769#change-12947 15:22:10 <Brot6> NewGRF Meta Language - Revision 2051:791823b6088a: Fix #4769: Missing range check for callback resul... XHirundoX @ http://dev.openttdcoop.org/projects/nml/repository/revisions/791823b6088a 15:23:02 <V453000> \o/ Hirundo :) 15:23:07 <V453000> could you pretty please look at http://dev.openttdcoop.org/issues/4742? :) 15:23:14 <V453000> without the ? :D http://dev.openttdcoop.org/issues/4742 15:23:56 <Ammler> chillcore: I disabled the hook completely for your repo, please try again 15:24:26 <Ammler> ? does not hurt in a url 15:24:42 <chillcore> the ini file still aplied? Ammler 15:24:48 <Ammler> yep 15:24:51 <Ammler> doesn't matter 15:26:04 <chillcore> pushing will create a new head again. Is this OK? 15:34:54 <Ammler> omg, you seriously like to ask that again? 15:35:00 <Ammler> how many times? 15:35:12 <chillcore> already pushing ... he 15:35:12 <Ammler> you can have millions of heads, it does not hurt 15:35:31 <chillcore> +- 1.30 min remaining 15:35:41 <Ammler> as long as tip or default is the revision you like to build :-) 15:43:15 <chillcore> Ammler: remote: added 2186 changesets with 11726 changes to 1379 files (+1 heads) it seems to have worked this time 15:43:44 <Ammler> you added again 11k changes? 15:43:53 <Ammler> ah 2k changesets 15:44:23 <Ammler> ah the changesets I stripped :-P 15:44:30 <chillcore> apparently ... I never counted them. the patch without the newgrf stuff is +50k lines 15:44:35 <chillcore> that too ;) 15:44:39 <Ammler> the patch is one 15:45:05 <chillcore> ah 15:45:26 <chillcore> so now we wait? 15:45:29 <Ammler> did you already ask TB to change the url 15:45:40 <chillcore> ehm no 15:45:44 <Ammler> I clone the repo to chillpp.mq just to be sure 15:46:12 <chillcore> I needed to ask to change chill.mq in chillpp right? 15:46:14 <chillcore> ok 15:46:51 <chillcore> s chill.mq chillpp.mq 15:47:14 <Ammler> yep, dunno, maybe planetmaker did already, but I doubt it 15:47:45 <Ammler> I cloned to chillpp.mq 15:47:58 <Ammler> I could also add a hook to automatically push forward 15:48:21 <Ammler> but that I will do if TB isn't available until your next update 15:48:24 <chillcore> that would be fine yes, I think 15:49:56 <chillcore> where do I tell people to clone from http://hg.openttdcoop.org/chillpp.mq or without the mq? 15:50:10 <Ammler> without, damn :-P 15:50:31 <Ammler> but for now, the .mq is a clone 15:52:22 <chillcore> ah ok, because with is where people would get the patched source before instead of only the mq. 15:52:35 <chillcore> I'll update the project description 15:52:54 <Ammler> mäh 15:53:00 <Ammler> silly me, I simply symlink it 15:53:10 <Ammler> then we don't need to bother about updates 15:56:15 <Brot6> NewGRF Meta Language - Bug #4760 (Closed): Cache also the white pixels messages XplanetmakerX @ http://dev.openttdcoop.org/issues/4760 15:56:15 <Brot6> NewGRF Meta Language - Bug #4760 (Closed): Cache also the white pixels messages XHirundoX @ http://dev.openttdcoop.org/issues/4760#change-12950 15:56:15 <Brot6> NewGRF Meta Language - Revision 2052:ff0d58bb5bb6: Fix/Feature #4760: Cache white pixel messages. XHirundoX @ http://dev.openttdcoop.org/projects/nml/repository/revisions/ff0d58bb5bb6 16:05:52 <Brot6> NewGRF Meta Language - Revision 2053:cfa0f8333ae8: Fix #4742: Random switch interdependencies were m... XHirundoX @ http://dev.openttdcoop.org/projects/nml/repository/revisions/cfa0f8333ae8 16:06:52 <V453000> HELL YEAH :D 16:06:54 <Brot6> NewGRF Meta Language - Bug #4742 (Closed): Random_switch dependent: pre_process error XV453000X @ http://dev.openttdcoop.org/issues/4742 16:06:55 <Brot6> NewGRF Meta Language - Bug #4742 (Closed): Random_switch dependent: pre_process error XHirundoX @ http://dev.openttdcoop.org/issues/4742#change-12953 16:06:59 <V453000> hail madness 16:07:16 <V453000> thanks Hirundo :) 16:23:28 <V453000> @logs 16:23:29 <Webster> #openttdcoop IRC webstuff - IRC Log Viewer - http://webster.openttdcoop.org/ 16:24:53 <Brot6> NUTS Unrealistic Train Set - Revision 6:27241922bdf9: Change: short MagPax wagons, new MaglevICE XV453000X @ http://dev.openttdcoop.org/projects/nuts/repository/revisions/27241922bdf9 16:25:10 <V453000> omg I pushed so hard I almost shat my pants 16:25:12 <V453000> :)) 16:40:22 <chillcore> Ammler: FYI I cloned and compiled the patched repo fine. The only thing that is still not correct is the repo showing r399; maybe that needs some time still? 16:40:50 <chillcore> thank you very much once again. 16:41:34 <Ammler> in dev.o.o? 16:42:12 <chillcore> oh yeah before I forget there seems to be a new repo https://dev.openttdcoop.org/projects/ammler or has that always been there? 16:42:52 <Ammler> oh, who could that belong to? :-P 16:43:16 <Ammler> anyway, project != repo 16:43:22 <Ammler> some projects have a repo 16:43:39 <chillcore> https://dev.openttdcoop.org/projects/chillpp/repository here it shows as r399 since yesteday 16:43:44 <chillcore> hehehe 16:44:34 <Ammler> no clue, why the import wasn't complete, I said yesterday already, I don't like it 16:44:44 <chillcore> it was updating but then I fixed that ' and it stopped ... 16:44:49 <Ammler> redmine is not done for forks 16:48:27 <chillcore> ooh wait this is strange ... 16:48:34 <Ammler> I would disable the module there 16:48:56 <Ammler> and hope the push auth still works :-) 16:49:08 <chillcore> I can not look at revision 400 but I could look at r1 (and the others) 16:49:18 <chillcore> I can disable it ofcourse 16:49:36 <Ammler> and then try if auth still works 16:50:32 <chillcore> r1 contains Target version: IS2.1 16:50:38 <chillcore> author? 16:51:55 <chillcore> about r1 ... my bad entered 1 i the wrong box, oops 17:00:28 <chillcore> Ammler: I can still push. 17:08:48 <Brot6> nml: update from r2049 to r2053 done - http://bundles.openttdcoop.org/nml/nightlies/r2053 17:17:49 <Ammler> chillcore: well then, if the openttd.org CF uploads the new bundles, we will see how to make the diffs for it 17:18:59 <chillcore> great. 17:19:05 <Brot6> isr: update from r20 to r22 done - http://bundles.openttdcoop.org/isr/nightlies/r22 17:19:55 <chillcore> would it not be wise to re-add some restrictions to what can be uploaded? 17:20:54 <chillcore> who knows someday someone comes in and want co-ownership. it would be easy to forget that my repo has no restrictions at all with unforseen conequences 17:21:18 <chillcore> +missing lettres :) 17:21:52 <Brot6> manindu: rebuild of r7 done (Diffsize: 10) (DiffDiffsize: 13) - http://bundles.openttdcoop.org/manindu/nightlies/r7/log 17:22:14 <Brot6> ogfx-industries: rebuild of r133 done (Diffsize: 56352) (DiffDiffsize: 18) - http://bundles.openttdcoop.org/ogfx-industries/nightlies/r133/log 17:32:23 <Brot6> ogfx-trains: rebuild of r695 done (4 warnings) (Diffsize: 53918) (DiffDiffsize: 18) - http://bundles.openttdcoop.org/ogfx-trains/nightlies/r695/log 17:33:13 <Brot6> metrotrackset: rebuild of r107 done (Diffsize: 5284) (DiffDiffsize: 18) - http://bundles.openttdcoop.org/metrotrackset/nightlies/r107/log 17:33:33 <Brot6> swedishrails: rebuild of r249 done (Diffsize: 1334) (DiffDiffsize: 18) - http://bundles.openttdcoop.org/swedishrails/nightlies/r249/log 17:34:14 <planetmaker> Ammler: chillcore: why does the CF then need to make the diffs? The code is in the repo... no-one needs diffs. People shall checkout the repo there really 17:34:26 <planetmaker> If they want to compile. Or get the readily-compiled version 17:34:57 <planetmaker> other than that: it's of course easy for chillcore to provide a diff occasionally, if people "need" it 17:36:16 <Brot6> debugveh: rebuild of r10 done (Diffsize: 1000) (DiffDiffsize: 16) - http://bundles.openttdcoop.org/debugveh/nightlies/r10/log 17:36:28 <Brot6> uselesstracks: rebuild of r18 done (Diffsize: 760) (DiffDiffsize: 18) - http://bundles.openttdcoop.org/uselesstracks/nightlies/r18/log 17:36:34 <Brot6> zBuild - Bug #4784 (New): DevZone compile failed XcompilerX @ http://dev.openttdcoop.org/issues/4784 17:36:41 <Brot6> german-townnames: rebuild of r35 done (Diffsize: 49) (DiffDiffsize: 16) - http://bundles.openttdcoop.org/german-townnames/nightlies/r35/log 17:36:57 <Brot6> spanishtowns: rebuild of r10 done (Diffsize: 18) (DiffDiffsize: 16) - http://bundles.openttdcoop.org/spanishtowns/nightlies/r10/log 17:37:00 <chillcore> I could even pour all commits in an MQ myself as (and if) I continue. Just a matter of selecting comit and exporting; when using the gui 17:37:32 <planetmaker> if you want the separate patches, a mq is helpful. If not... well :-) 17:38:20 <planetmaker> you could keep them in separate branches (named or unnamed or maybe even only bookmarked), but... that's all a matter of personal preference 17:38:42 <planetmaker> separate branches add the additional overhead that you need to keep each in working order AND add the merge work every time 17:40:03 <chillcore> true but I just realised ... if someone insist on an MQ to limit bandwith usage or whatever. I can just select all comits and export them as patches. 17:40:55 *** ODM has joined #openttdcoop.devzone 17:41:40 <chillcore> complete source are available by checkout and that suffices for GPL, right.? 17:44:55 <chillcore> doesn't sound very nice towards svn and git users (who do not have the proper extentions) written like that ... 17:46:03 <planetmaker> yes. Though a diff is easily created hg diff -rtip:XXX where XXX is the revision of trunk it corresponds to 17:46:29 <Ammler> well, that is why I didn't want to do something already :-) 17:46:39 <planetmaker> you got a point wrt other vcs users 17:46:41 <Brot6> NewGRF Meta Language - Revision 2054:a7cc07b12c17: Feature #4736: Properly validate item IDs. Also, ... XHirundoX @ http://dev.openttdcoop.org/projects/nml/repository/revisions/a7cc07b12c17 17:48:12 <chillcore> I have written down that command that I keep forgetting, pm 17:49:17 <chillcore> I could just post a patch at the forums each time I feel the need for "a release" and see the repo as development source. ;) 17:49:24 <chillcore> problem solved? 17:50:17 <chillcore> development is for people interesed read pseudo nightlies 17:51:11 <planetmaker> problem solved, yes ;-) 17:51:22 <chillcore> yay 17:54:35 <Brot6> dutchroadfurniture: rebuild of r145 done (Diffsize: 44023) (DiffDiffsize: 16) - http://bundles.openttdcoop.org/dutchroadfurniture/nightlies/r145/log 17:55:50 <Brot6> airportsplus: rebuild of r171 done (Diffsize: 96793) (DiffDiffsize: 18) - http://bundles.openttdcoop.org/airportsplus/nightlies/r171/log 17:58:00 *** frosch123 has joined #openttdcoop.devzone 18:00:47 <Brot6> ogfx-rv: rebuild of r163 done (Diffsize: 2051) (DiffDiffsize: 18) - http://bundles.openttdcoop.org/ogfx-rv/nightlies/r163/log 18:01:44 <Brot6> ogfx-landscape: rebuild of r113 done (Diffsize: 8798) (DiffDiffsize: 18) - http://bundles.openttdcoop.org/ogfx-landscape/nightlies/r113/log 18:01:59 <Brot6> friss: rebuild of r43 done (Diffsize: 3333) (DiffDiffsize: 18) - http://bundles.openttdcoop.org/friss/nightlies/r43/log 18:02:11 <Brot6> indonesiantowns: rebuild of r41 done (1 warnings) (Diffsize: 19) (DiffDiffsize: 17) - http://bundles.openttdcoop.org/indonesiantowns/nightlies/r41/log 18:02:15 <Brot6> Following repos rebuilds successful without any difference to earlier nightlies builds: cets (9 warnings), dutchtrains, canrail (8 warnings), bandit (1 warnings) (Diffsize: 8194), firs, make-nml (Diffsize: 9), opengfx, britrains (10 warnings) (Diffsize: 133525), dutchtracks, belarusiantowns (Diffsize: 72), frenchtowns, fish (3 warnings), swisstowns (Diffsize: 51), newgrf_makefile (Diffsize: 21) 18:05:53 <Brot6> NewGRF Meta Language - Bug #4736: Position change of disabled code causes/removes "invalid ID" error XHirundoX @ http://dev.openttdcoop.org/issues/4736#change-12956 18:05:54 <Brot6> NewGRF Meta Language - Bug #4736 (Closed): Position change of disabled code causes/removes "invalid ... XHirundoX @ http://dev.openttdcoop.org/issues/4736#change-12959 18:08:54 <planetmaker> quak 18:09:23 <frosch123> moin :) 18:17:49 <Brot6> NewGRF Meta Language - Bug #4730: Random value in CB 2D does not work XHirundoX @ http://dev.openttdcoop.org/issues/4730#change-12962 18:33:11 <planetmaker> hm, Hirundo here? 18:55:35 <Brot6> Dutch Trains 2 - Feature Request #4748: wagon speed limits of early wagons are too low XVoyager1X @ http://dev.openttdcoop.org/issues/4748#change-12965 18:58:20 <Ammler> according to irc status no 18:59:58 <planetmaker> I'm sure the last NML commit breaks some stuff 19:00:10 <planetmaker> ogfx+trains is broken when compiled with NML head 19:10:00 <Brot6> NewGRF Meta Language - Bug #4787 (Confirmed): NML r2054 breaks OpenGFX+Trains XplanetmakerX @ http://dev.openttdcoop.org/issues/4787 19:18:05 <Brot6> NewGRF Meta Language - Bug #4730: Random value in CB 2D does not work XplanetmakerX @ http://dev.openttdcoop.org/issues/4730#change-12968 19:18:13 <Ammler> a new ticket confirmed is silly :-P 19:18:23 <Ammler> you confirmed yourself? 19:18:34 <Brot6> NewGRF Meta Language - Bug #4730 (Confirmed): Random value in CB 2D does not work XplanetmakerX @ http://dev.openttdcoop.org/issues/4730#change-12968 19:20:53 <Brot6> NewGRF Meta Language - Bug #4730: Random value in CB 2D does not work XplanetmakerX @ http://dev.openttdcoop.org/issues/4730#change-12974 19:27:21 <chillcore> good night all. 19:27:55 *** chillcore has quit IRC 19:58:30 *** Alberth has joined #openttdcoop.devzone 21:30:45 *** Alberth has left #openttdcoop.devzone 21:33:33 <Brot6> OpenGFX+ Trains - Revision 699:12ab0a2c2605: Add: Polish translation (wojteks86) XplanetmakerX @ http://dev.openttdcoop.org/projects/ogfx-trains/repository/revisions/12ab0a2c2605 22:01:49 *** ODM has quit IRC 22:53:10 *** frosch123 has quit IRC