Times are UTC Toggle Colours
00:02:28 *** frosch123 has quit IRC 00:18:39 *** KenjiE20 has quit IRC 00:19:30 *** ODM has quit IRC 01:34:19 *** Seberoth2 has joined #openttdcoop.devzone 01:36:34 *** Seberoth has quit IRC 01:42:45 *** Seberoth2 has quit IRC 07:17:01 *** ODM has joined #openttdcoop.devzone 08:07:41 <Brot6> FIRS Industry Replacement Set - Revision 1079:5d858f64ac09: Change: cleaned up static newgrf info (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/5d858f64ac09 08:07:41 <Brot6> FIRS Industry Replacement Set - Revision 1080:b090961239df: Change: tidy static newgrf formatting (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/b090961239df 08:07:41 <Brot6> FIRS Industry Replacement Set - Revision 1081:ebd07ca73fba: Change: newgrf settting GUI item for ... (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/ebd07ca73fba 08:07:43 <Brot6> FIRS Industry Replacement Set - Revision 1082:6acdc6a32fa1: Feature: FIRS supports Newgrf Setting... (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/6acdc6a32fa1 08:07:47 <Brot6> FIRS Industry Replacement Set - Revision 1083:590adfa3e601: merge (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/590adfa3e601 08:52:34 *** Alberth has joined #openttdcoop.devzone 09:03:47 <Brot6> TransRapid Track Set - Feature #1185 (New): minimum openttd version (foobar) @ http://dev.openttdcoop.org/issues/1185 09:05:39 <Brot6> Metro Track Set - Feature #1186 (New): minimum openttd version (foobar) @ http://dev.openttdcoop.org/issues/1186 09:06:38 *** FooBar has joined #openttdcoop.devzone 09:23:41 <Brot6> FIRS Industry Replacement Set - Revision 1084:9de351a477ed: merge (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/9de351a477ed 09:23:41 <Brot6> FIRS Industry Replacement Set - Revision 1085:a91df2e2636c: merge (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/a91df2e2636c 09:26:34 <Brot6> TransRapid Track Set - Bug #1187 (New): non-railtypes construction buttons (foobar) @ http://dev.openttdcoop.org/issues/1187 09:27:38 <andythenorth> bad stuff happened 09:27:51 <andythenorth> anyone want to go on a hg adventure? 09:27:56 <Brot6> Metro Track Set - Bug #1188 (New): non-railtypes construction buttons (foobar) @ http://dev.openttdcoop.org/issues/1188 09:28:06 <FooBar> what's wrong? 09:28:39 <FooBar> hopefully nothing bad happened... 09:30:01 <andythenorth> FooBar: probably not 09:30:17 <andythenorth> I experimented with trying to backport to 0.3 branch 09:30:36 <andythenorth> when that failed I experimented with trying to delete 0.3 branch 09:30:41 <FooBar> hmmm, I have no clue how that works 09:30:48 <andythenorth> now I have some scary looking merges 09:31:05 <andythenorth> and 0.3 branch is back again :P 09:31:35 <FooBar> :) 09:31:44 <FooBar> in 1084 you basically merged all files :P 09:32:00 <andythenorth> looks horrible 09:32:14 <FooBar> luckily the pcx'es didn't change...try and merge those\ 09:32:37 <andythenorth> I just want to do a 0.3 release, but with selective changes 9.9 09:32:46 <FooBar> darn backslash, who put that there anyways :S 09:33:07 <FooBar> especially since there's another button that does exactly the same... 09:33:27 <FooBar> anyways, 0.3 is finished now? 09:33:42 <andythenorth> finished enough to release 09:33:55 <andythenorth> no idea if closure code works 09:34:16 <FooBar> people will tell 09:34:52 <andythenorth> the plan was to backport some changesets to 0.3 branch 09:35:01 <andythenorth> but no-one knows how to do that 09:35:02 <FooBar> they shouldn't be using releases if they want something that is thoroughly tested 09:35:11 <FooBar> oh wait, that's nightlies...oh well 09:35:40 <andythenorth> I want to delete 0.3 branch, then branch from tip, and remove things that break 0.2 savegames 09:37:09 <FooBar> maybe keep 0.3, then make diff between 0.3 branch and commit you want to backport, apply patch to 0.3 branch, commit 09:37:54 <FooBar> but indeed, nobody (read: google) seems to know how to backport 09:39:01 <FooBar> see this: http://old.nabble.com/About-the-use-of-hg-transplant-td28501495.html 09:39:02 <Webster> Title: Old Nabble - monetdb-developers - About the use of hg transplant (at old.nabble.com) 09:39:50 <FooBar> seems to require an extension though 09:40:11 <andythenorth> I tried transplant but it was baffling 09:40:20 <andythenorth> Ammler: can you help? ^ 09:42:04 <FooBar> "Another possibility to backport changes is to use hg export and hg import. " 09:42:20 * andythenorth googles 09:42:54 <andythenorth> could clone 0.2 then patch for 0.3 09:43:09 <andythenorth> but then there are two working repos, not one. And one of them is local to my mac 09:43:19 <andythenorth> maintaining 0.3 would be a no-go 09:44:01 <FooBar> maybe ask some openttd dev. They do backports all the time 09:44:19 <andythenorth> I'll see if anyone's awake in #openttd yet 09:44:36 <andythenorth> meanwhile there's a nice new bug report in the forums - FIRS dev thread 09:44:38 <andythenorth> : 09:44:39 <andythenorth> :) 09:44:45 <FooBar> there are some around here as well :) 09:44:52 <FooBar> i mean devs, not bugreports 09:48:14 <FooBar> also, iron ore mine produces <invalid cargo> in arctic :S (r1076) 09:49:21 <andythenorth> FooBar: interestingly I think I've quite badly broken the repo 09:49:33 * andythenorth tests 09:49:47 <FooBar> I still have a r1076... 09:50:20 <FooBar> I'll just not pull or push until you think it's unbroken again :) 09:50:45 <andythenorth> fishing harbour, fish cargo, build menu dates etc all AWOL 09:51:00 <andythenorth> NewGRF GUI stuff also all awol 09:51:11 <andythenorth> I can probably just revert some of those merges 09:52:21 <andythenorth> hmm 09:52:23 <andythenorth> apparently not 10:13:45 <Brot6> FIRS Industry Replacement Set - Bug #1189 (New): availability date wrong on several industries (foobar) @ http://dev.openttdcoop.org/issues/1189 10:28:33 *** KenjiE20 has joined #openttdcoop.devzone 10:45:50 *** frosch123 has joined #openttdcoop.devzone 11:16:57 <FooBar> how do I OpenTTD-version-check (action 7) for both 1.0.3 and r20242? 11:17:41 <FooBar> the first requires \dx10380000 and the second \dx11004F11... 11:19:44 <FooBar> \dx10304F11 doesn't work, as r19891 qualifies that as well 11:22:57 <frosch123> i guess you need two action7 11:23:55 <frosch123> hmm, or weven three 11:24:50 <FooBar> I figured that too, but can't seem to get my head around it :S 11:25:15 <frosch123> if (version < 1.0.3) disable 11:25:26 <frosch123> if (version < 1.0.4) skip next check 11:25:50 <frosch123> if (version < r19891) disable 11:26:02 <FooBar> hmmm, let me try that 11:26:11 <frosch123> s/1.0.4/1.1.0/ 11:28:15 <Rubidium> hmm... what are the "// Escapes:" in a nfo actually used for? Because I think nforenum really messes it up 11:28:29 <Rubidium> or at least makes a mess of it 11:29:19 <frosch123> i guess "x=y" means apply s/y/x/ 11:29:45 <frosch123> but never used them :) 11:29:46 <FooBar> I recall those being needed for renum to understand \something escape sequences. It should be somewhere in the renum topic why this was added 11:31:12 <Rubidium> frosch123: but for some reason nforenum dumps everything on one line with lots of = and grfcodec makes 4 quite nice, lot smaller lines 11:31:17 <Rubidium> with only a few = 11:32:20 <Brot6> TransRapid Track Set - Bug #1182 (New): parameters don't do what they should do (foobar) @ http://dev.openttdcoop.org/issues/1182 11:32:20 <Brot6> TransRapid Track Set - Feature #1183 (New): snowy depot for railtypes (foobar) @ http://dev.openttdcoop.org/issues/1183 11:32:20 <Brot6> TransRapid Track Set - Revision 0:ff135ab310de: Populate repo: with code based on r40 of metrotra... (foobar) @ http://dev.openttdcoop.org/projects/transrapidtrackset/repository/revisions/ff135ab310de 11:32:20 <Brot6> Base Costs Mod - Presets - Revision 11:1b1c3df6d4d6: [lib] Feature: new var REVISION for dev and ... (Ammler) @ http://dev.openttdcoop.org/projects/basecosts-presets/repository/revisions/1b1c3df6d4d6 11:32:24 <Ammler> andythenorth: stripped until r1981 11:32:49 <Ammler> please push again fixed repo 11:32:52 <andythenorth> ammler thanks 11:33:49 <andythenorth> Ammler: I'll clone the clean repo, reapply r1082 and cross my fingers :o 11:33:55 <Ammler> no 11:34:06 <andythenorth> no? 11:34:12 <Ammler> I might have stripped too much 11:34:22 <Ammler> isn't your local repo fixed? 11:34:42 <andythenorth> I 'fixed' it by cloning remote about half an hour ago 11:34:50 <andythenorth> I don't trust my previous copy 11:35:11 <andythenorth> I tried out various transplant / strip / branch experiments which could be bad 11:35:23 <Ammler> http://hg.openttdcoop.org/firs/graph <-- current remote repo 11:35:29 <Ammler> the merge is missing 11:35:44 <Ammler> you could clone it merge and push 11:35:51 <andythenorth> the merge is the problem 11:36:00 <Ammler> shall I strip more? 11:36:07 <andythenorth> no, let me test a little here 11:36:22 <Ammler> hg strip rNUM 11:36:33 <Ammler> without r 11:36:40 <Ammler> or hg strip HASH 11:37:25 <Ammler> I am not able to define a 2nd parameter 11:37:36 <Ammler> with Action14 11:38:11 <Ammler> also I still miss defining default 11:41:40 <frosch123> default is 0, just as before 11:42:05 <Ammler> no, default was unset 11:42:22 <frosch123> depends whether there are parameters after it :p 11:42:25 <Ammler> then I define "default" with ActionD 11:43:03 <frosch123> oh, now it understand. the NPAR enforces a number of parameters once you open the gui 11:43:05 <andythenorth> Ammler: could you unbundle the strip? r1082 would be useful. It has work in it that is otherwise lost 11:43:17 <andythenorth> we don't need 1083-105 though 11:43:40 <Brot6> NFORenum - Revision 418:2645b5b8b7c0: Change: remove trailing whitespace (Rubidium) @ http://dev.openttdcoop.org/projects/nforenum/repository/revisions/2645b5b8b7c0 11:43:43 <Ammler> andythenorth: you don't have that commit anymore? 11:43:51 <andythenorth> I thought I had r1082 in my original local repo, but apparently not 11:44:46 <frosch123> http://devs.openttd.org/~frosch/firs1082.diff <- are you missing that? 11:44:46 <andythenorth> today's lesson: do *not* follow internet advice that a branch can be removed by stripping a changeset a long way back down the tree. work gets lost that way :( 11:44:53 <andythenorth> frosch123: yes 11:44:57 <andythenorth> I'll apply that ta 11:45:01 <Ammler> andythenorth: done 11:45:15 <andythenorth> Ammler: thanks 11:45:54 <Ammler> andythenorth: you shouldn't strip "pushed" things anyway 11:45:57 <Ammler> never 11:46:11 <andythenorth> Ammler: so I learn :P 11:46:20 <andythenorth> I'm now at 1083 11:46:21 <Brot6> FIRS Industry Replacement Set - Revision 1082:6acdc6a32fa1: Feature: FIRS supports Newgrf Setting... (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/6acdc6a32fa1 11:46:21 <Brot6> FIRS Industry Replacement Set - Revision 1083:9de351a477ed: merge (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/9de351a477ed 11:46:26 <FooBar> frosch123: no luck on the version thing. Here is code if you want to take a look: http://pastebin.com/4H9pNpkH 11:47:37 <Ammler> oh, r1083 wrong? 11:47:42 <andythenorth> Ammler: one more strip should do it 11:47:47 <andythenorth> just remove r1083 11:47:53 <andythenorth> leaving tip as r1082 11:47:57 <frosch123> \dx11080000 //value: ottd version 1.1.0 <- FooBaruse 11000000 11:47:57 <andythenorth> should work 11:48:03 <frosch123> i.e. alpha, not release 11:48:27 <Ammler> ok, done 11:48:47 <Brot6> TransRapid Track Set - Revision 0:ff135ab310de: Populate repo: with code based on r40 of metrotra... (foobar) @ http://dev.openttdcoop.org/projects/transrapidtrackset/repository/revisions/ff135ab310de 11:49:05 <FooBar> frosch123: thanks, will test 11:49:14 <andythenorth> Ammler: thanks. Crossing my fingers :) 11:49:43 <Brot6> NFORenum - Revision 419:2bcd8cb50525: Change: put the escapes per action on a line instead of all... (Rubidium) @ http://dev.openttdcoop.org/projects/nforenum/repository/revisions/2bcd8cb50525 11:49:48 <andythenorth> Ammler: yay 11:49:59 <Ammler> andythenorth: you still have multiple heads 11:50:09 <andythenorth> how to resolve that? 11:50:16 <Ammler> merge? 11:50:38 <Ammler> why was r1083 wrong? 11:50:49 <andythenorth> I don't know, but it nuked an awful lot of stuff 11:51:02 <andythenorth> the merge seemed to touch a lot of files it shouldn't need to touch 11:51:07 <andythenorth> like approx 68 11:51:19 <andythenorth> do you want to try pull + merge? 11:51:25 <FooBar> frosch123: works! Thanks again :) 11:51:36 <frosch123> np :) 11:51:37 <Ammler> http://hg.openttdcoop.org/firs/rev/4264919bc1a1 <-- is that the evil one? 11:51:57 <andythenorth> that only affects two files 11:52:15 * andythenorth tests 11:52:26 <Ammler> the other in that head also 11:52:36 <Ammler> so I don't see why a merge hurts 11:52:40 <andythenorth> Ammler: that one seems fine 11:52:56 <andythenorth> I think the issue stems to me trying transplant / strip 11:53:02 <andythenorth> I think all is now ok 11:53:05 <Ammler> imo r1083 was fine 11:53:09 <Ammler> no 11:53:14 <Ammler> you have 2 heads now 11:53:19 <andythenorth> I'm going to merge those 11:53:36 <andythenorth> it builds ok 11:53:42 <andythenorth> so I'll commit them 11:53:48 <andythenorth> them / it /s 11:54:11 <andythenorth> hmm 11:54:13 <Ammler> do you have a tool to view graphs local? 11:54:17 <andythenorth> no 11:54:30 <andythenorth> and my newly cloned repo can't push, so I have a few things to change here 11:54:32 <andythenorth> :P 11:54:41 <Ammler> tortoisehg should be for osx too 11:55:26 <Ammler> else there is a simple ascii extension graphlog 11:56:43 <Ammler> did you like to move the 0.3 branch? 11:57:00 <andythenorth> I'd like to murder the 0.3 branch 11:57:10 <Ammler> I never understood how you can branch without release :-P 11:57:20 <andythenorth> well you can 11:57:29 <andythenorth> but not if you don't understand the transplant extension properly 11:57:31 <andythenorth> and I don't 11:57:47 <Brot6> FIRS Industry Replacement Set - Revision 1083:d945b7346982: merge (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/d945b7346982 11:57:55 <Ammler> transplant is like copy the commit 11:58:07 <Ammler> but you could also merge to the branch 11:58:21 <andythenorth> we could try merging tip to 0.3 11:58:26 <andythenorth> and then edit 0.3 to make the release 11:58:37 <Ammler> if you like to "copy" everything merge is easier 11:58:47 * andythenorth may copy local repo this time for backup 11:58:48 <andythenorth> :P 11:58:57 <Ammler> translplant is cherry picking 11:59:11 <andythenorth> there's a lot to cherry pick though 11:59:26 <andythenorth> and it seems to require some horrible manual merge resolving 11:59:31 <andythenorth> I don't fancy that :( 11:59:41 <andythenorth> I started on it this morning, but failed to get very fat 11:59:43 <andythenorth> far /s 12:00:11 <andythenorth> so what happens to people who had pulled the repo recently and were at 1085? 12:00:16 <Ammler> but if you like to merge everything 12:00:25 <andythenorth> I think we merge everything 12:00:39 <andythenorth> then I just edit out things that break savegame 12:04:59 <andythenorth> Ammler: looks like a few commits got into the 0.3 branch that should be in trunk 12:05:14 <andythenorth> 1071-1073 12:05:54 <Ammler> I played around with it, there are some comflicts :-) 12:06:08 <Ammler> in ids.pnfo 12:06:10 <Brot6> NFORenum - Revision 420:38f1672a9cb4: Fix: don't warn on newobjects buy menu sprite cargo type (Rubidium) @ http://dev.openttdcoop.org/projects/nforenum/repository/revisions/38f1672a9cb4 12:06:37 <andythenorth> Ammler: are those the only conflicts? 12:06:42 <andythenorth> I can probably manually resolve those 12:08:41 <Ammler> http://hg.openttdcoop.org/firs-clone/graph <-- it would look somehow like that 12:08:48 <Ammler> hg up 0.3 12:08:50 <Ammler> hg merge tip 12:09:37 <Ammler> i might have resolved the ids conflict wrongly 12:10:01 <andythenorth> I didn't get conflicts when I tried that here 12:10:13 <FooBar> hmmm... I'd better go to the supermarket if I want to eat something tonight... 12:10:18 <FooBar> later everyone! 12:10:20 <andythenorth> bye 12:10:42 <Rubidium> I loathe thee 12:10:55 <Brot6> FIRS Industry Replacement Set - Revision 1084:f9f4a5d1f657: merged 0.3 branch with tip (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/f9f4a5d1f657 12:10:55 <Brot6> NewGRF Meta Language - Revision 628:22a354e2df95: Doc: Add comments to ReplaceNew AST node. (Hirundo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/22a354e2df95 12:10:58 <Rubidium> ... for having a supermarket that is open at this time 12:11:14 <andythenorth> :o 12:11:27 * andythenorth lives in a capitalist country 12:11:37 <andythenorth> supermarkets are open extensively on a Sunday 12:11:55 <andythenorth> Ammler: I did the merge and pushed 12:12:24 <andythenorth> so now I want to close the 0.3 branch for tidiness... 12:12:57 <Ammler> he? 12:13:06 <Ammler> then why did you merge? 12:13:16 <andythenorth> hmm, wrong thinking 12:13:29 <andythenorth> I want to make the 0.3 branch the working branch for 0.3 release 12:13:31 <andythenorth> not close it 12:13:35 <andythenorth> I am being dumb 12:13:49 <Ammler> :-) 12:13:59 <Ammler> current tip is 0.3 branch 12:14:04 * andythenorth goes for an adventure in commit logs 12:14:18 <Ammler> "hg branch" does tell you 12:14:23 <Ammler> or hg parent 12:14:41 <Ammler> if you like to confinue on default, you will need to hg up default 12:14:55 * andythenorth wonders...is there a way to remove certain changesets *only* from the branch 12:15:00 <Hirundo> How many different containers are there to store a name/value pair in nml? (ID COLON expression SEMICOLON) 12:15:01 <andythenorth> not the whole fricking repo 12:15:51 <Ammler> strip is only useful, when you change the repo or when you work on a local repo 12:16:26 <andythenorth> I'll just do this manually in that case 12:16:28 <Ammler> hg backout might help you 12:16:59 <Ammler> or simply apply reverse patch of the "unwanted" commit 12:18:14 <andythenorth> hg backout looks promising 12:18:28 <andythenorth> dunno if it only applies in the branch though? 12:18:52 <Ammler> hg backout will add a new head 12:19:05 <Ammler> if you merge that to the branch, it will apply there :-) 12:20:27 <andythenorth> but it should never be merged to trunk...sounds like a recipe for disaster waiting to happen? 12:21:02 <Ammler> you can't make disasters, only maybe ugly things 12:21:25 <Alberth> Hirundo: somewhere near infinite ? 12:21:33 <Ammler> luckily your aren't able do remote strip :-) 12:22:03 <andythenorth> Ammler: so e.g. if we want to remove r1065 from 0.3 12:22:07 <andythenorth> what to do? 12:22:15 <Hirundo> I'm currently re-globalizing Assignment into somewhat of a generic class 12:23:24 <Hirundo> Since I do not intend to add class n+1 12:24:24 <Ammler> andythenorth: hg diff -c1065 --reverse | patch -p1 12:24:40 <Ammler> because I haven't used backout yet :-) 12:24:56 <andythenorth> hg diff: option --reverse not recognized 12:25:18 <Ammler> andythenorth: hg diff -c1065 | patch -Rp1 12:29:16 <andythenorth> Ammler: seems to work 12:29:19 <andythenorth> and then commit? 12:29:24 <Ammler> yep 12:29:55 <Ammler> I guess, backout wouldn't have worked anyway 12:35:04 <Brot6> FIRS Industry Replacement Set - Revision 1085:0000180dc2aa: Change: removed r1065 from 0.3 branch (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/0000180dc2aa 12:35:05 <Brot6> FIRS Industry Replacement Set - Revision 1086:c54900a2c2cb: Change: removed fishing industries fr... (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/c54900a2c2cb 12:35:05 <Brot6> FIRS Industry Replacement Set - Revision 1087:37687be6419a: Change: remove Fish cargo from 0.3 br... (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/37687be6419a 12:37:11 * andythenorth thinks a FIRS 0.3 release might be imminent :) 12:38:19 <Ammler> transplant is useful, when you have done the release and just like to "copy" bugfixes anymore, imo 12:39:59 <Ammler> you might alos update your mercurial 12:40:07 <Ammler> afaik, there is 1.6 on macports 12:41:56 <Ammler> does someone have a Action14 example with 2 parameters? 12:42:20 <Yexo> have you checked the firs code? 12:43:17 <Ammler> http://pastebin.com/G51FbUYG <-- what's wrong here? 12:43:37 <Ammler> firs has only one, hmm 12:44:30 <andythenorth> Ammler: have you trued removing lines until it works? 12:44:43 <andythenorth> tried /s 12:44:51 <Ammler> andy, then I end with 1 12:45:22 <Yexo> Ammler: I think you need to remove the 00 on line 11 12:46:14 <Yexo> the 0-byte on line 9 ends the "C" "VALU", the 0-byte on line 10 ends the first parameter (started by "C" \d0) and the 0-byte on line 11 ends the "C" "PARA" block 12:47:17 <Yexo> after each 0-byte you should remove one level of indentation (as yo udo on line 10/11), but you forgot that one line 12 (that would make the problem more obvious) 12:48:03 <Ammler> Yexo: yep, that was it 12:54:04 <Ammler> maybe you could call the default display-none or so? 12:54:25 <Ammler> which means, what to display on unset, so it wouldn't confuse with default 12:55:12 <Ammler> or start-value 12:58:03 <Ammler> also it needs a unset 12:59:41 <Ammler> it becomes specially a problem, when someone just like to edit the e.g. the 3rd parameter 13:03:41 *** Seberoth has joined #openttdcoop.devzone 13:05:39 *** Guest443 is now known as V453000 13:13:35 <Ammler> rewrite the whole thing to make 0 default can be a pain... :'-( 13:13:50 <FooBar> man, that took a while. Half of Germany decided to come shopping today, so I had to make all kinds of detours, which ofcourse involved a railway crossing at which a train needed to pass at the very same time as I. Luckily most Germans don't have a customer card so there was no line at the self-checkout registers at the supermarket :) 13:16:29 <FooBar> anyways, have I missed something important? Probably not 13:18:29 <Brot6> NewGRF Meta Language - Revision 629:ded8caf6608a: Revert (r596): Make Assignment available global... (Hirundo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/ded8caf6608a 13:18:29 <Brot6> NewGRF Meta Language - Revision 630:42ca3c1ad2c4: Change: Document and niceify the Assigmnent code. (Hirundo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/42ca3c1ad2c4 13:49:19 *** Seberoth has quit IRC 14:30:01 *** Seberoth has joined #openttdcoop.devzone 14:31:41 <Brot6> FIRS Industry Replacement Set - Revision 1088:89bd2025eaba: Change: update readme for 0.3 release (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/89bd2025eaba 14:31:41 <Brot6> FIRS Industry Replacement Set - Revision 1089:3150f153ec75: Change: update changelog for 0.3 release (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/3150f153ec75 14:31:41 <Brot6> FIRS Industry Replacement Set - Revision 1090:6957af8e4d47: Change: sandbox mode unfinished - doc... (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/6957af8e4d47 14:33:20 <Brot6> FIRS Industry Replacement Set - Revision 1091:2eaf3992c682: Added tag 0.3 for changeset 6957af8e4d47 (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/2eaf3992c682 14:34:35 <Brot6> firs: update from 0.2 to 0.3 done (4 errors) - http://bundles.openttdcoop.org/firs/releases/0.3 14:35:22 <FooBar> and there we have it :) 14:36:23 <Ammler> 4 errors - ignoreable? 14:37:04 <andythenorth> are they linter failures on first four sprites? 14:37:34 <andythenorth> two language errors :o 14:37:57 <Ammler> > hg branches 14:37:59 <Ammler> 0.3 1091:2eaf3992c682 14:38:00 <Ammler> default 1083:d945b7346982 (inactive) 14:38:04 <Ammler> why is default inactive? 14:38:05 <Rubidium> redefinition of strings 14:38:13 <Rubidium> s/strings/macros/ 14:38:51 <Ammler> I am also not sure, if it is wise to name a tag like a branch 14:39:05 <Ammler> maybe you should call the tag 0.3.0 14:39:16 <andythenorth> I agree 14:39:40 <andythenorth> and also the md5 sums appear not to match :o 14:39:46 <andythenorth> something is screwy 14:39:54 <andythenorth> can't rollback something pushed? 14:40:27 <Brot6> TransRapid Track Set - Feature #1190 (New): Code maglev stations as NewStations for use with rail... (foobar) @ http://dev.openttdcoop.org/issues/1190 14:40:28 <FooBar> no, can only rollback local 14:40:48 <andythenorth> Ammler: I don't think this tag is good, how can we remove it? 14:41:38 <FooBar> It should be possible to remove. Most simplest is by editing .hgtags and removing the line. Then retag and commit 14:41:59 <Ammler> yes, edit .hgtags 14:42:05 <Ammler> add a ".0" 14:42:25 <FooBar> oh, that's even better 14:42:35 <Ammler> well, in that case, not generally :-) 14:43:01 <FooBar> well, yes 14:43:04 <Ammler> I am not sure, if it will build a new release, since the hash is the same 14:43:14 <andythenorth> are tags always added to tip? 14:43:23 <Ammler> if you don't use -r, yes 14:43:26 <andythenorth> the 0.3 tag is not present in the 0.3 branch 14:43:33 <andythenorth> I am not sure of the right way to do this 14:43:44 <Ammler> hmm, not tip 14:43:46 <Ammler> to parent 14:43:58 <Ammler> but as tip 14:44:05 <Ammler> (of course) 14:44:20 <andythenorth> so I've removed the tag 14:44:25 <andythenorth> I'll look at the errors 14:44:50 <Ammler> then you will have anohter hash anyway 14:44:55 <Brot6> FIRS Industry Replacement Set - Revision 1092:48deffb1cbdd: Remove: bad tag for 0.3 release (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/48deffb1cbdd 14:44:55 <Brot6> firs: update from 0.3 to 0.2 done - http://bundles.openttdcoop.org/firs/releases/0.2 14:45:22 <Ammler> autsch 14:45:31 <FooBar> that's more like a downgrade :P 14:45:43 <Ammler> yes, don't push a removed tag :-P 14:46:19 <FooBar> doesn't really hurt I think, eventually... 14:46:25 <Ammler> it doesn't 14:46:28 <andythenorth> I have some troubles locally 14:46:36 <andythenorth> my renum appears not to be running 14:47:05 <Ammler> except that it does change the date of 0.2 14:47:20 <FooBar> hmmm 14:47:20 <Ammler> maybe I should use commit date and touch the files 14:48:09 <Ammler> andythenorth: do you build self? 14:48:10 <andythenorth> Ammler: could you pull FIRS and tell me how many errors make reports for you? 14:48:33 <Ammler> andythenorth: push a 0.3.0-beta1 14:49:27 <Ammler> also the 0.3.0 is still there 14:49:34 <Brot6> FIRS Industry Replacement Set - Revision 1093:685e5ee867e0: Added tag 0.3.0-beta1 for changeset 4... (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/685e5ee867e0 14:50:31 <Brot6> firs: update from 0.2 to 0.3.0-beta1 done (4 errors) - http://bundles.openttdcoop.org/firs/releases/0.3.0-beta1 14:51:01 <Ammler> I wouldn't see more 14:52:04 <andythenorth> ok there are two cpp errors relating to defines 14:52:07 <andythenorth> not critical 14:52:21 <andythenorth> there should be a bunch of linter failures being reported for action 14 14:52:34 <Rubidium> andythenorth: there are no linter failures! 14:52:45 <andythenorth> it worries me that (a) I don't see the cpp errors and (b) I do see the linter failures (v. old renum) 14:53:15 <Rubidium> andythenorth: probably because the compile farm has some global CFLAGS 14:53:48 <Rubidium> try CFLAGS=-Wundef make 14:54:02 <Rubidium> hmm, no... that's not the -W 14:54:06 <Rubidium> +right 14:54:50 <Rubidium> Ammler: what cflags does the CF set? 14:54:59 <Ammler> how I would see? 14:55:08 <Rubidium> check export 14:55:17 <andythenorth> Rubidium: that showed the undef error 14:55:19 <Ammler> $CFLAGS is empty 14:55:20 <andythenorth> thanks 14:56:02 <Rubidium> hmm, then it might be compiler version? 14:56:22 <Ammler> 4.4.1 14:57:13 <Ammler> does the server show too much or too less? 14:58:02 <Rubidium> no, the redefinition stuff is usually not cleaning up stuff properly 14:59:05 <Brot6> FIRS Industry Replacement Set - Revision 1094:4beab4725dbe: Fix: missing undef for FISH cargo string (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/4beab4725dbe 14:59:05 <Brot6> FIRS Industry Replacement Set - Revision 1095:85a3224f9209: Added tag 0.3.0-beta2 for changeset 4... (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/85a3224f9209 14:59:22 <Brot6> firs: update from 0.3.0-beta1 to 0.3.0-beta2 done - http://bundles.openttdcoop.org/firs/releases/0.3.0-beta2 14:59:31 <Rubidium> and that could cause odd bugs when using defines 14:59:43 <andythenorth> Ammler: no errors now? 14:59:57 <Ammler> well, nothing obvious 15:00:53 <andythenorth> time to check the md5 then 15:05:33 <Brot6> TransRapid Track Set - Bug #1191 (New): no need to include bridges twice (foobar) @ http://dev.openttdcoop.org/issues/1191 15:06:27 <Brot6> TransRapid Track Set - Bug #1192 (New): no need to include depots twice (foobar) @ http://dev.openttdcoop.org/issues/1192 15:08:06 <Brot6> TransRapid Track Set - Bug #1193 (New): no need to include overlay tracks twice either (foobar) @ http://dev.openttdcoop.org/issues/1193 15:09:53 <andythenorth> Ammler: md5 checks out ok 15:09:58 <andythenorth> so I'm going to tag 0.3.0 15:11:10 <FooBar> hmm, maybe I should state in readme that users "must own TTD-win cd if they want to set parameter 0 bit 0" :P 15:11:24 <Brot6> firs: update from 0.3.0-beta2 to 0.3.0 done - http://bundles.openttdcoop.org/firs/releases/0.3.0 15:11:44 <Ammler> FooBar: don't use 0 for non-default 15:12:10 <Ammler> or have you a "trick" to workaround Action14 issue? 15:12:28 <FooBar> haven't tried action 14 yet 15:12:36 <Brot6> FIRS Industry Replacement Set - Revision 1096:32347ae48751: Added tag 0.3.0 for changeset 85a3224... (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/32347ae48751 15:12:39 <FooBar> but if there's an issue there, it should be fixed :) 15:12:47 <Ammler> easiest is to have 0 as default 15:13:06 <Ammler> well, it's not a bug :-P 15:13:33 <FooBar> well, 0 is default. Setting /bit 0/ (i.e. value 1) gives you non-default sprites including TTD stuff 15:14:40 <Ammler> ah, true 15:14:42 <Ammler> misread 15:15:06 <Brot6> TransRapid Track Set - Feature #1194 (New): include action 14 (foobar) @ http://dev.openttdcoop.org/issues/1194 15:15:14 <FooBar> no problem 15:15:22 <FooBar> I do that all the time :P 15:16:15 <Ammler> with Action14, you are going quite likely to set a bit or parameter somewhere not at top 15:16:28 <Ammler> and then all settings before will be set to 0 15:16:42 * FooBar wonders if there's a script that can take a selection from one pcx file, overlay that with a selection from a second pcx file and save it to a selection in a third pcx file 15:16:49 <Ammler> so it is quite recommend to have 0 also default 15:17:10 <Ammler> imagemagick should do that 15:17:33 <FooBar> hmmm...is that available at your server? 15:17:56 <Ammler> quite easy 15:18:02 <FooBar> oh never mind. Doesn't make sense anyways 15:18:02 <Ammler> just edit the build.spec 15:18:40 <FooBar> I was thinking that building the grf with TTD graphics would require you to put the trg*-files somewhere 15:18:50 <Ammler> every tool, which you can run locally, should be available on the build system 15:19:16 <FooBar> But since we provide precompiled grfs, the TTD graphics would still end up in the grf 15:19:40 <FooBar> that still doesn't require users to actually have the graphics to use them 15:20:36 <Ammler> oh well, I don't think, it is a problem to publish a part of original sprites 15:20:42 <FooBar> so never mind that then :D 15:20:55 <Ammler> even openttd does that 15:21:33 <Ammler> as long, as you don't upload a complete baseset with orginal sprites :-P 15:22:54 <FooBar> well, it would be a requirement to have the original base set somewhere. Could be a non-public dir though, but there's no real point to it 15:23:57 <Hirundo> If I want to set base costs 1, 3 and 5, do I need three separate action0s? 15:24:09 <andythenorth> Ammler: how do I see the hg tree view on redmine? 15:24:35 <Ammler> no 15:24:43 <Ammler> Hirundo: just set 2 and 4 to 8 15:25:09 <Hirundo> That's a solution I'd prefer to avoid 15:25:25 <FooBar> 2 and 4 can be set by something else 15:25:29 <Hirundo> To avoid e.g. interference with other grfs 15:25:34 <FooBar> yes, that :) 15:26:05 <Ammler> Hirundo: what is if you set it to 0? 15:26:36 <FooBar> andythenorth: I believe you don't 15:27:16 <andythenorth> http://hg.openttdcoop.org/firs/graph 15:27:21 <Ammler> Hirundo: the settings are "chrooted" per grf anyway, somehow 15:27:30 <FooBar> andythenorth: yes, that would be the alternative 15:28:21 <andythenorth> Ammler: I'm not quite sure now whether we have two FIRS branches or just one 15:28:29 <FooBar> or just get TortoiseHg and you can see it on your own computer. Also make using hg much easier: you don't have to remember any command :) 15:28:30 <Ammler> default and 0.3 15:28:44 <Ammler> default is somewhere below 15:28:48 <Ammler> just run hg branches 15:28:49 <andythenorth> but they are in sync, so the graph shows only one head? 15:28:58 <Ammler> no 15:29:01 <andythenorth> hmm 15:29:09 <Ammler> tip is 0.3 15:29:10 <Hirundo> There is some magic in the base cost code that makes vehicle-related costs grf-only 15:29:21 <Ammler> somewhere below is a green default, there is the head of it 15:29:26 <andythenorth> Ammler: thanks 15:29:39 <Ammler> or in redmine, you can chose branch "default" 15:29:46 <Ammler> then you see the head of it 15:29:56 <andythenorth> so r1093 should be ported to default branch 15:30:00 <andythenorth> oops 15:30:03 <andythenorth> r1094 that is 15:30:17 <Ammler> then I would use transplant 15:30:52 <andythenorth> do you know how to do it? 15:31:18 <Ammler> I will check... 15:32:26 * FooBar concludes that branches occur as soon as planetmakr commits something 15:33:23 * FooBar believes the origin of twitter lies within irc 15:34:18 <andythenorth> twitter is just a better rss 15:35:56 <FooBar> I woudn't say better. It requires you to have an account to follow someone, rss doesn't (if I understand twitter correctly, that is) 15:35:57 <Ammler> andythenorth: only one rev? 15:36:30 <andythenorth> Ammler: maybe r1090 as well 15:36:59 <FooBar> but I was referring to the /me type of comments. Like most tweets: you could do without them just fine :P 15:39:42 * andythenorth fancies some food 15:39:59 * andythenorth is glad it's sunny 15:40:10 * andythenorth saw a funny dog 15:41:59 <Ammler> http://hg.openttdcoop.org/firs-clone/graph <-- nice graph, shall I push? 15:42:11 <Ammler> hg transplant -b0.3 -m 1090 -m 1094 15:42:28 <Ammler> at branch default head 15:42:48 <Ammler> hg up default 15:42:50 <Ammler> hg transplant -b0.3 -m 1090 -m 1094 15:43:12 <Ammler> you can continue with -m REV.... 15:43:28 <andythenorth> looks like a train network :P 15:43:41 <andythenorth> push 15:43:41 <Ammler> but looks right 15:43:47 <andythenorth> thanks :) 15:44:01 <andythenorth> 0.3 is now 'stopped' except for bug fixes 15:44:04 <Ammler> hmm, I might need to merge 15:44:11 <Brot6> firs: compile of failed - http://bundles.openttdcoop.org/firs/releases/ERROR/ 15:44:13 <andythenorth> we go on with default and try not to need this again :) 15:44:17 <Ammler> lol 15:44:50 <Brot6> FIRS Industry Replacement Set - Revision 1097:343ac32fdaca: Change: sandbox mode unfinished - doc... (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/343ac32fdaca 15:44:50 <Brot6> FIRS Industry Replacement Set - Revision 1098:94f3bea8fb67: Fix: missing undef for FISH cargo string (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/94f3bea8fb67 15:45:55 <Ammler> andythenorth: branching is fine 15:46:09 <Brot6> TransRapid Track Set - Feature #1195 (New): do something about railtype-bridges (foobar) @ http://dev.openttdcoop.org/issues/1195 15:46:46 <Ammler> why did it say +1 head 15:46:49 <Ammler> I see only 2 15:48:04 <Ammler> but i would branch just before a planned release, not for purpose 15:53:54 <Alberth> when you branch, you create one additional head, hence +1 head 15:54:21 <Alberth> note that a branch does not need to have a name 15:58:04 <Ammler> Alberth: how many branches does current firs have? 15:58:12 <Ammler> if I run hg heads, it tells me 2 15:58:27 <Ammler> but those are quite old 15:59:01 <andythenorth> Ammler: I see 2, which is the expected number 15:59:39 <Ammler> yes, I just wonder, why I got a msg +1 heads at push 15:59:49 <Ammler> maybe because default became active again? 16:00:52 <Alberth> that happens with a pull if you are at a branch 16:01:01 <Alberth> ie 'default' gets 'added' 16:01:37 <Alberth> in a way that it is not part of the branch you are before the pull 16:02:24 <Alberth> so that happening with a push, when tip is not 'default' does not sound so weird 16:03:54 <Ammler> that also explains why default get inactive when its not head 16:03:57 <Ammler> tip* 16:11:44 <andythenorth> Ammler: thanks for help today 16:11:47 * andythenorth is afk 16:11:57 *** andythenorth has left #openttdcoop.devzone 16:18:28 <Brot6> basecosts: update from r6 to r10 done - http://bundles.openttdcoop.org/basecosts/nightlies/r10 16:19:08 <Brot6> firs: update from r1076 to r1098 done (2 errors) - http://bundles.openttdcoop.org/firs/nightlies/r1098 16:19:47 <Brot6> firs-clone: update from to r1098 done (2 errors) - http://bundles.openttdcoop.org/firs-clone/nightlies/r1098 16:21:29 <Brot6> nforenum: update from r417 to r420 done - http://bundles.openttdcoop.org/nforenum/nightlies/r420 16:22:06 <Brot6> nml: compile of r630 failed - http://bundles.openttdcoop.org/nml/nightlies/ERROR/r630 16:22:41 <Brot6> nutracks: update from r86 to r90 done (13 errors) - http://bundles.openttdcoop.org/nutracks/nightlies/r90 16:23:12 <Brot6> transrapidtrackset: update from to r0 done - http://bundles.openttdcoop.org/transrapidtrackset/nightlies/r0 16:23:13 <Brot6> Following repos didn't need a nightlies update: 2cctrainset (r573), 32bpp-extra (r38), airportsplus (r52), comic-houses (r71), fish (r386), grfcodec (r188), heqs (r371), metrotrackset (r40), newgrf_makefile (r124), ogfxplus (r41), opengfx (r469), openmsx (r91), opensfx (r97), snowlinemod (r15), swedishrails (r140), worldairlinersset (r659) 16:24:09 <Brot6> 2cctrainset: rebuild of r573 done (6 errors) (Diffsize: 13) - http://bundles.openttdcoop.org/2cctrainset/nightlies/r573/log 16:24:53 <Brot6> 32bpp-extra: rebuild of r38 done (1 errors) (Diffsize: 13) - http://bundles.openttdcoop.org/32bpp-extra/nightlies/r38/log 16:25:18 <Brot6> airportsplus: rebuild of r52 done (Diffsize: 13) - http://bundles.openttdcoop.org/airportsplus/nightlies/r52/log 16:25:39 <Brot6> basecosts: rebuild of r10 done (Diffsize: 13) - http://bundles.openttdcoop.org/basecosts/nightlies/r10/log 16:26:05 <Brot6> comic-houses: rebuild of r71 done (3 errors) (Diffsize: 13) - http://bundles.openttdcoop.org/comic-houses/nightlies/r71/log 16:26:42 <Brot6> firs: rebuild of r1098 done (2 errors) (Diffsize: 13) - http://bundles.openttdcoop.org/firs/nightlies/r1098/log 16:27:23 <Brot6> firs-clone: rebuild of r1098 done (2 errors) (Diffsize: 13) - http://bundles.openttdcoop.org/firs-clone/nightlies/r1098/log 16:28:01 <Brot6> fish: rebuild of r386 done (6 errors) (Diffsize: 13) - http://bundles.openttdcoop.org/fish/nightlies/r386/log 16:28:39 <Brot6> heqs: rebuild of r371 done (Diffsize: 13) - http://bundles.openttdcoop.org/heqs/nightlies/r371/log 16:29:09 <Brot6> metrotrackset: rebuild of r40 done (6 errors) (Diffsize: 13) - http://bundles.openttdcoop.org/metrotrackset/nightlies/r40/log 16:29:26 <Brot6> newgrf_makefile: rebuild of r124 done (Diffsize: 13) - http://bundles.openttdcoop.org/newgrf_makefile/nightlies/r124/log 16:30:33 <Brot6> opengfx: rebuild of r469 done (Diffsize: 78) - http://bundles.openttdcoop.org/opengfx/nightlies/r469/log 16:31:01 <Brot6> snowlinemod: rebuild of r15 done (Diffsize: 13) - http://bundles.openttdcoop.org/snowlinemod/nightlies/r15/log 16:31:16 <Brot6> NewGRF Meta Language - Revision 631:068789435061: Fix (r630): when adding pos as argument to the ... (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/068789435061 16:32:03 <Brot6> worldairlinersset: rebuild of r659 done (Diffsize: 13) - http://bundles.openttdcoop.org/worldairlinersset/nightlies/r659/log 16:34:47 <Ammler> forgot to remove the clone 16:34:56 <Ammler> shall I retrigger nml? 16:35:44 <Yexo> doesn't matter much 16:35:53 <Yexo> it was a trivial fix, and no big changes have been done 16:36:27 <Ammler> just because it failed yesterday too, iirc 16:38:42 <Yexo> didn't you retrigger it yesterday already? 16:39:30 <Yexo> hmm, apparently not 16:42:52 <Brot6> nml: update from r607 to r631 done - http://bundles.openttdcoop.org/nml/nightlies/r631 16:42:59 <Brot6> Following repos didn't need a nightlies update: 2cctrainset (r573), 32bpp-extra (r38), airportsplus (r52), basecosts (r10), comic-houses (r71), firs (r1098), fish (r386), grfcodec (r188), heqs (r371), metrotrackset (r40), newgrf_makefile (r124), nforenum (r420), nutracks (r90), ogfxplus (r41), opengfx (r469), openmsx (r91), opensfx (r97), snowlinemod (r15), swedishrails (r140), transrapidtrackset (r0), worldairlinersset (r659) 16:43:46 <Brot6> ogfxplus: compile of r41 failed - http://bundles.openttdcoop.org/ogfxplus/nightlies/ERROR/r41 16:44:14 <Brot6> swedishrails: compile of r140 failed - http://bundles.openttdcoop.org/swedishrails/nightlies/ERROR/r140 16:44:35 <Ammler> maybe it was worth a retrigger ^ 16:48:38 <Yexo> yep, certainly :) 16:51:01 <Ammler> is that again a setup.py issue? 16:51:40 <Yexo> no 16:51:51 <Brot6> NewGRF Meta Language - Revision 632:5d525be7db15: Fix (r616): rename all instance where Action2.w... (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/5d525be7db15 16:55:53 <Brot6> feed NewGRFs had 13 updates, showing the latest 10 16:55:53 <Brot6> TransRapid Track Set - Code Review #1184 (Closed): backup.push to the same repo :-P (foobar) @ http://dev.openttdcoop.org/issues/1184#change-2994 16:55:53 <Brot6> TransRapid Track Set - Bug #1179 (Closed): railtypes construction buttons (foobar) @ http://dev.openttdcoop.org/issues/1179#change-2995 16:55:53 <Brot6> TransRapid Track Set - Bug #1180 (Closed): fences not removed by default if railtypes (foobar) @ http://dev.openttdcoop.org/issues/1180#change-2996 16:55:54 <Brot6> TransRapid Track Set - Bug #1182 (Closed): parameters don't do what they should do (foobar) @ http://dev.openttdcoop.org/issues/1182#change-2998 16:55:57 <Brot6> TransRapid Track Set - Feature #1185 (Closed): minimum openttd version (foobar) @ http://dev.openttdcoop.org/issues/1185#change-2997 16:56:00 <Brot6> TransRapid Track Set - Bug #1191 (Closed): no need to include bridges twice (foobar) @ http://dev.openttdcoop.org/issues/1191#change-3000 16:56:03 <Brot6> TransRapid Track Set - Bug #1192 (Closed): no need to include depots twice (foobar) @ http://dev.openttdcoop.org/issues/1192#change-3001 16:56:06 <Brot6> TransRapid Track Set - Bug #1193 (Closed): no need to include overlay tracks twice either (foobar) @ http://dev.openttdcoop.org/issues/1193#change-3002 16:56:09 <Brot6> TransRapid Track Set - Bug #1181 (Closed): stations missing (foobar) @ http://dev.openttdcoop.org/issues/1181#change-3003 16:56:14 <Brot6> TransRapid Track Set - Bug #1187 (Closed): non-railtypes construction buttons (foobar) @ http://dev.openttdcoop.org/issues/1187#change-2999 16:57:20 <Ammler> FooBar: you might like to cleanup the bitbucket repo... 16:57:35 <FooBar> I guess I have to strip to r40 there 16:57:43 <FooBar> glad you reminded me :) 16:58:04 <Ammler> yes, because I use hg push -f for the backup script 16:58:26 <Ammler> so we push everything what is on the server 17:00:08 <Brot6> NewGRF Meta Language - Revision 633:58a281b39cb5: Codechange: Allow setting Action0 properties fo... (Hirundo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/58a281b39cb5 17:00:08 <Brot6> NewGRF Meta Language - Revision 634:d9bffa27bec7: Feature: Allow setting base costs in nml, using... (Hirundo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/d9bffa27bec7 17:00:33 <Hirundo> Ammler: here you go ^^ 17:01:06 <FooBar> no that that's settled, I'm going to create dinner :) 17:01:07 <Hirundo> Parametrized stuff like your base cost grf doesn't (yet) work, though 17:01:28 <Brot6> NewGRF Meta Language - Revision 635:3f76884d45a3: Fix (r616): duplicate name 'write' for VarActio... (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/3f76884d45a3 17:03:07 <Rubidium> nice... 167 nutracks warnings eradicated :) 17:03:52 <Brot6> NewGRF Meta Language - Revision 636:8653278c110c: Fix: also pre-process items that are nested in ... (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/8653278c110c 17:05:25 <Yexo> Ammler: could you trigger another rebuild? 17:05:46 <Ammler> I just retrigger whole nightly rebuild 17:06:35 <Brot6> nml: update from r631 to r636 done - http://bundles.openttdcoop.org/nml/nightlies/r636 17:07:05 <Brot6> transrapidtrackset: update from r0 to r11 done (2 errors) - http://bundles.openttdcoop.org/transrapidtrackset/nightlies/r11 17:07:07 <Brot6> Following repos didn't need a nightlies update: 2cctrainset (r573), 32bpp-extra (r38), airportsplus (r52), basecosts (r10), comic-houses (r71), firs (r1098), fish (r386), grfcodec (r188), heqs (r371), metrotrackset (r40), newgrf_makefile (r124), nforenum (r420), nutracks (r90), ogfxplus (r41), opengfx (r469), openmsx (r91), opensfx (r97), snowlinemod (r15), swedishrails (r140), worldairlinersset (r659) 17:07:53 <Brot6> ogfxplus: rebuild of r41 done (Diffsize: 1) - http://bundles.openttdcoop.org/ogfxplus/nightlies/r41/log 17:08:28 <Brot6> swedishrails: rebuild of r140 done (Diffsize: 8) - http://bundles.openttdcoop.org/swedishrails/nightlies/r140/log 17:10:32 <Ammler> new md5 for ser 17:14:14 <Brot6> NFORenum - Revision 421:ef8fdc959867: Fix: action3 'cargo-type' checking for railtypes was off-by... (yexo) @ http://dev.openttdcoop.org/projects/nforenum/repository/revisions/ef8fdc959867 17:15:54 <Rubidium> woopsie 17:16:44 <Rubidium> how did you manage to find that so quick? Review of my diff? 17:17:58 <Brot6> NewGRF Meta Language - Revision 637:110fad45f8dc: Fix: Also write set the num_ids of an actino0 t... (Hirundo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/110fad45f8dc 17:19:06 <Yexo> transrapid triggered that warning 17:29:11 <Rubidium> ah, okay 17:34:41 <Brot6> NewGRF Meta Language - Revision 638:15b99be3cc15: Feature: Allow the value of a base cost to be a... (Hirundo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/15b99be3cc15 17:34:41 <Brot6> FIRS Industry Replacement Set - Bug #1196 (New): Settings GUI support missing in r1098 (andythenorth) @ http://dev.openttdcoop.org/issues/1196 17:38:21 *** andythenorth has joined #openttdcoop.devzone 18:19:05 <Brot6> Base Costs Mod - Revision 11:15b2471fb056: [lib] rev number for a14 revision (Ammler) @ http://dev.openttdcoop.org/projects/basecosts/repository/revisions/15b2471fb056 18:19:05 <Brot6> Base Costs Mod - Revision 12:c3534e58d950: Feature: add a14, looks like a full rewrite, but no ne... (Ammler) @ http://dev.openttdcoop.org/projects/basecosts/repository/revisions/c3534e58d950 18:19:05 <Brot6> Base Costs Mod - Revision 13:5e1149238b2b: Fix (r12): parameter description file (Ammler) @ http://dev.openttdcoop.org/projects/basecosts/repository/revisions/5e1149238b2b 18:19:08 <Brot6> Base Costs Mod - Revision 14:c24ee15aac01: Feature: allow 22 pairs now (Ammler) @ http://dev.openttdcoop.org/projects/basecosts/repository/revisions/c24ee15aac01 18:19:11 <Brot6> Base Costs Mod - Revision 15:d1433a7c8a04: Workaround: Action14 does set unset parameters to 0, s... (Ammler) @ http://dev.openttdcoop.org/projects/basecosts/repository/revisions/d1433a7c8a04 18:23:14 <Brot6> Base Costs Mod - Revision 16:4b6ba0565b57: Change: use lib/buildgrf (Ammler) @ http://dev.openttdcoop.org/projects/basecosts/repository/revisions/4b6ba0565b57 18:23:14 <Brot6> Base Costs Mod - Revision 17:32ef0f22f652: Fix (r15): skitp if not null, of course (Ammler) @ http://dev.openttdcoop.org/projects/basecosts/repository/revisions/32ef0f22f652 18:25:03 <Alberth> Ammler is going for as many revisions as possible :) 18:25:54 <Ammler> that is quite much all 18:25:58 <Ammler> at least with nfo 18:26:08 <Ammler> hmm, the release tag 18:26:26 <Ammler> that grf is 3000 lines nfo 18:56:26 *** Yexo_ has joined #openttdcoop.devzone 19:02:44 *** Yexo has quit IRC 19:07:50 <Brot6> transrapidtrackset: update from to 0.9.0-beta done (2 errors) - http://bundles.openttdcoop.org/transrapidtrackset/releases/0.9.0-beta 19:08:13 <Brot6> TransRapid Track Set - Revision 12:2a21b09378e2: Update: readme and changelog for release (foobar) @ http://dev.openttdcoop.org/projects/transrapidtrackset/repository/revisions/2a21b09378e2 19:08:14 <Brot6> TransRapid Track Set - Revision 13:9b8481a44b28: Release: 0.9.0-beta (foobar) @ http://dev.openttdcoop.org/projects/transrapidtrackset/repository/revisions/9b8481a44b28 19:09:27 *** Yexo_ is now known as Yexo 19:11:27 <Ammler> FooBar: I would wrap the readme at around 80 chars 19:11:53 <FooBar> then configure your text editor to do so ;) 19:12:11 <Ammler> hmm, I don't use a Editor to read a readme 19:12:22 <FooBar> what do you use then? 19:12:31 <Ammler> in that case, I used Firefox 19:12:41 <Ammler> http://bundles.openttdcoop.org/transrapidtrackset/releases/0.9.0-beta/readme.txt 19:12:59 <FooBar> hmmm... in browser it is indeed crappy :( 19:13:15 <FooBar> for next release then 19:13:21 <Ammler> my editor has a "autowrap" function 19:14:34 <FooBar> mine too, that's why I didn't realise it was crappy in browser 19:14:57 <Ammler> I meant, it does add newlines automatically once 19:15:07 <FooBar> Actually, Firefox should word-wrap. If it was html, it would do so too 19:15:13 <Rubidium> http://rbijker.net/openttd/fits-easily.png <- but... the lines fit in my browser! 19:15:37 <FooBar> well, at that zoomlevel :P 19:17:03 <Brot6> TransRapid Track Set - Feature #1197 (New): wordwrap readme (foobar) @ http://dev.openttdcoop.org/issues/1197 19:18:20 <FooBar> I found that my editor also has an autowrap function, but that seems to like removing line endings in the process 19:18:50 <Rubidium> you probably need two newlines to stop that 19:19:59 <Ammler> Rubidium: that is like reading the songlist in the ingame midi player 19:19:59 <FooBar> I have three in some places, after wrap it's just one :S 19:20:08 <FooBar> I might need to google why that is 19:21:04 <Ammler> maybe there is kate also for windows? 19:24:20 <FooBar> I could also run it through PHP 19:25:37 <FooBar> also, I could just get kate on linux, as I already have linux sitting here anyways 19:30:13 <FooBar> darn, how large is that? 19:30:33 <FooBar> I would expect a text editor to download in a few seconds, it's more like minutes now 19:33:33 <FooBar> that works much better, although it did kill my table... 19:48:05 <Brot6> TransRapid Track Set - Feature #1198 (New): buffer stops (foobar) @ http://dev.openttdcoop.org/issues/1198 19:49:07 <Ammler> with the versioning, not possible to laod a older version anymore? 19:50:36 <Rubidium> no clue question is 19:53:16 <Ammler> well, maybe it is an idea to have different GRFID for release and development 20:00:31 <Yexo> Ammler: you can enable the setting to also show older versions in the gui 20:02:55 <Ammler> Yexo: thanks, found 21:00:56 <Brot6> basecosts: update from 3.0 to 3.1 done - http://bundles.openttdcoop.org/basecosts/releases/3.1 21:01:49 <Brot6> Base Costs Mod - Revision 18:8b946b18a3b5: Change: update description a bit (Ammler) @ http://dev.openttdcoop.org/projects/basecosts/repository/revisions/8b946b18a3b5 21:01:49 <Brot6> Base Costs Mod - Revision 19:bd5740bae997: Added tag 3.1 for changeset 8b946b18a3b5 (Ammler) @ http://dev.openttdcoop.org/projects/basecosts/repository/revisions/bd5740bae997 21:31:45 <Brot6> TransRapid Track Set - Feature #1197 (Closed): wordwrap readme (foobar) @ http://dev.openttdcoop.org/issues/1197 21:31:45 <Brot6> TransRapid Track Set - Revision 14:bdfcb5027701: Feature: wordwrap readme.txt (closes #1197) (foobar) @ http://dev.openttdcoop.org/projects/transrapidtrackset/repository/revisions/bdfcb5027701 21:31:45 <Brot6> TransRapid Track Set - Revision 15:8d625441a707: Feature: Action 14 parameter description (closes... (foobar) @ http://dev.openttdcoop.org/projects/transrapidtrackset/repository/revisions/8d625441a707 21:31:48 <Brot6> TransRapid Track Set - Feature #1194 (Closed): include action 14 (foobar) @ http://dev.openttdcoop.org/issues/1194#change-3005 21:31:51 <Brot6> TransRapid Track Set - Feature #1197 (Closed): wordwrap readme (foobar) @ http://dev.openttdcoop.org/issues/1197#change-3004 21:36:51 <Ammler> people which add TTDP skip prove that they don't test it on TTDP ;-) 21:41:52 *** Alberth has left #openttdcoop.devzone 21:42:12 <Yexo> or (like me) they add the action9 first and after that test on TTDP 21:42:25 <Yexo> has anyone reported it already as a bug in ttdpatch? 21:43:12 <frosch123> http://devs.openttd.org/~frosch/diffs/action14.diff <- maybe they just patched it :p 21:44:02 <frosch123> i guess i'll ask lakie next time he is around 21:44:06 <Rubidium> if only some dev were to commit that :) 21:45:18 <frosch123> maybe i should try to get a compile environment for ttdp 21:47:11 <Rubidium> does a virtual machine suffice? 21:49:34 <Ammler> [23:42] <Yexo> has anyone reported it already as a bug in ttdpatch? <-- how? 21:49:45 <Rubidium> they bug tracker! 21:49:54 <Yexo> they have a bug tracker somewhere 21:49:58 <Rubidium> http://wiki.ttdpatch.net/tiki-view_tracker.php?trackerId=1&sort_mode=lastModif_desc 21:50:04 <Ammler> the ml? 21:51:30 <Rubidium> no, that's not the mailing list 21:52:30 <Ammler> hmm, what is now the bug, that it doesn't skip unknown actions, or that action9 doesn't work with unknwon actions? 21:52:57 <Rubidium> both? 21:53:07 <Rubidium> although... there's a Lakie in #openttd! 22:43:09 <FooBar> Ammler: if you was referring to my action9... no I don't test on TTDP :P I just assume it works and if it doesn't I assume someone will complain ;) 22:44:12 <Ammler> it isn't "decided" yet, how to handle Action14 in patch 22:44:36 <Ammler> currently, those newgrfs crash 22:45:14 <Ammler> you can count the newgrf players with one hand, so you will never really become feedback 22:46:32 <Ammler> did you ever? 22:46:49 <FooBar> if that is the case, then it isn't really necessary to make it work on ttdp... 22:47:41 <Ammler> well, depends on how much it "costs" :-) 22:48:11 <Ammler> I run a ttdp and also have once converted ogfx to patch 22:50:12 <FooBar> I think it is because I get nothing in return for it, that I don't test on patch 22:50:58 <Rubidium> what? You're completely ignoring the 342 downloads of TTDPatch nightlies over the last two weeks? 22:50:59 <Ammler> with Action14 it is the first time, openttd supports a action, which ttdpatch doesn't 22:51:35 <Ammler> so they didn't have to handle that yet 22:51:52 <Rubidium> OpenTTD had 855 last week, so that's "only" 5 times more 22:52:07 <Ammler> Rubidium: you can't count like that 22:52:18 <Ammler> openttd has daily nightly 22:52:26 <Ammler> ttdp maybe monthly? 22:52:46 <Rubidium> 4 in the last month 22:52:48 <Ammler> or did you count all nightlies? 22:53:06 <Rubidium> yes, I did count just nightly downloads regardless of version 22:53:16 <Rubidium> but you've got a valid point there 22:53:18 <Ammler> ok, then it is ineed not many 22:53:25 <FooBar> I think patch will be able to ignore Action 14 reasonably soon 22:53:29 <Rubidium> 4 nightlies vs 14 nightlies over the last 2 weeks 22:53:32 <Rubidium> so... 22:53:38 <Rubidium> @calc 5*4/14 22:53:38 <Webster> Rubidium: 1.42857142857 22:53:56 <Rubidium> only 1.4 times as many OpenTTD nightly users than TTDPatch nightly users 22:54:00 <Ammler> FooBar: that depends on the lack of devs :-) 22:54:27 <FooBar> well, future of TTDPatch is in their hands anyways 22:55:13 <Ammler> if ever will a patch player complain, you could quite easy build a ttdp version 22:55:38 <FooBar> sure, just comment out two sprites 22:56:13 <Ammler> Rubidium: also respect, that openttd has a stable release, ttdp doesn't 22:56:33 * FooBar thinks comparing nightly downloads doesn't say anything 22:57:07 <Rubidium> Ammler: no, TTDPatch has a stable release as well 22:57:12 <Rubidium> and betas! 22:57:17 <Ammler> lol 22:57:36 <Ammler> what is the last stable? 5 years ago? 22:57:44 <FooBar> comparing grf downloads might be more useful. Manually downloaded grfs will be mostly TTDPatch users, while OpenTTD users will mostly download via bananas 22:58:20 <Rubidium> Ammler: http://saveie6.com/compare.php :) 22:58:21 <Webster> Title: SaveIE6: Help us save the best browser around (at saveie6.com) 23:04:41 <Ammler> hehe, nice stat 23:07:53 <FooBar> I don't think the downloadlog on bundles works properly any more 23:08:23 <Ammler> yes, since April 1 23:08:40 <FooBar> is that a joke? :P 23:08:57 <Ammler> no openttd 1.0.0 shut down our page 23:09:28 <Ammler> and I completely forgot about reenabling it again 23:09:59 <FooBar> ah 23:10:17 <Ammler> http://bundles.openttdcoop.org/stats/ 23:10:41 <Ammler> sine we switched to nginx, those stats might be wrong.... 23:12:15 <FooBar> hmmm, that doesn't really give me what I was looking for; mainly downloads of metrotrackset of past few days 23:14:07 <Ammler> 44 today 23:16:14 <Ammler> 28 yesterday 23:16:32 <Ammler> since 25. 23:17:08 <Ammler> that is simply grepping of the access logs 23:17:16 <FooBar> all I need 23:17:44 <FooBar> compare that to 935 bananas downloads 23:17:51 <Ammler> I am not sure, if we shall enable the download stats script again 23:18:09 <Ammler> or maybe make a nightly log analyzer 23:18:30 <FooBar> well, if you don't mind me asking every now and then, you can leave it disabled 23:18:30 <Ammler> which simply does count the zips 23:18:41 <Ammler> :-P 23:19:00 <Ammler> I know, you like stats :-D 23:19:06 <FooBar> :) 23:19:53 <FooBar> it makes me happy if I see that a lot of people download the stuff that I worked on 23:20:07 <FooBar> should be /some/ indication that they like it 23:21:05 <Rubidium> FooBar: http://pastebin.com/V6UJ8nwT 23:21:48 <FooBar> I should make a graph of that... 23:22:25 <Rubidium> http://rbijker.net/openttd/stats.pdf page 4 :) 23:24:38 <FooBar> that's quick 23:25:43 <Rubidium> that's just all bananas downloads 23:25:50 <Rubidium> (and openttd binaries) 23:26:03 <Ammler> there you see the peak with openttd 1.0 23:26:38 <Rubidium> blue = downloads, yellow = 30 day average of downloads and orange = download size in MiB 23:26:49 <Ammler> I would quite much like that time again with nginx 23:26:50 <Rubidium> so currently a bit less than 20 GiB per day 23:27:12 <FooBar> I think my hosting package allows that per month... 23:27:30 <Rubidium> the highest peak was (IIRC) the day we got on slashdot's front page 23:28:19 <FooBar> neat 23:29:24 <Ammler> 6 or 7 of april 23:30:08 <Ammler> we have around 100GB/month 23:30:22 <Ammler> peak was 500 23:30:23 <Rubidium> the major problem of the slashdot was that the 15 minute load exceeded 4.0 that day during the compile farm run when it usually stays below 3.5 23:31:08 <Rubidium> more than 1 TiB and then we started to employ the mirrors and it reduced to 400 GiB/month (0.7.0 release level) 23:32:04 <FooBar> here, graph of metrotrack downloads: http://www2.jaspervries.nl/graph.png 23:32:15 <FooBar> the pattern over the days is interesting 23:33:52 <Ammler> he, now you could handle it again with one server :-) 23:34:51 <Ammler> from marketing aspect, you should release OpenTTD 2.0 next year :-P 23:35:23 <FooBar> I don't think there's much marketing involved in OpenTTD... 23:35:31 <Yexo> and the year after that "openttd 2012" ? 23:35:38 <FooBar> :) 23:35:47 <Rubidium> what? 23:35:53 <FooBar> no, that would be openttd 3.11 23:36:11 <FooBar> and then openttd NT 4.0 23:36:21 <FooBar> with a different map array :P 23:36:30 <Rubidium> (<year> / 10) % 10.(<year> %10).(month - 4)/2 isn't sufficient? 23:36:53 <Rubidium> no! 23:36:59 <Rubidium> 3.11 for workgroups! 23:37:24 <FooBar> I skipped that, as there already is a workgroup feature 23:38:14 <FooBar> I think your formula might be flawed, as year%10 is 0 at the moment... 23:38:48 <Ammler> 201%10 23:39:10 <FooBar> second one 23:39:14 <Yexo> FooBar: so? we're at version 1.0.3 now, so it fits the formula 23:39:15 <Ammler> 1.0 23:39:18 <Rubidium> the last bit is flawed in any case, although it's somewhat what we aim for 23:39:45 <FooBar> oh thats meant to be a period? I thought multiplication... 23:39:54 <FooBar> then I haven't said anything :P 23:40:39 <FooBar> I always get annoyed when the use a low period for multiplication on exams, but I guess you get used to it 23:40:54 <Rubidium> in any case... either your graph hasn't enough resolution or it's because it's weekend, but I would've expected a less steep line before it becomes really steep 23:42:54 <FooBar> note that very steep means no downloads in that graph 23:43:12 <FooBar> it's a bit the other way round, but I couldn't be bothered to change that 23:45:05 <Ammler> you need to turn your pc screen and and a mirror 23:46:49 <Rubidium> that I figured, I would've expected more of a download peek at evening time, like OpenTTD (see the download stats) 23:48:25 <FooBar> I think my fans are in a different timezone :P 23:48:33 <FooBar> but then, it could be the weekend 23:49:16 <Rubidium> yeah, that might very well be it; I've never looked at the hourly stats on a per-day-of-week manner 23:51:25 *** KenjiE20 has quit IRC 23:52:30 <FooBar> if I remember, I'll ask you the hourly stats again next week, then we can see what the graph does with that 23:53:24 <FooBar> apart from that, it's way past my bedtime, so good night all! 23:53:28 <Rubidium> then remember 1094 23:56:40 *** FooBar has quit IRC