Times are UTC Toggle Colours
00:54:58 <Brot6> NFO Meta Language - Feature #984: regression test (planetmaker) @ http://dev.openttdcoop.org/issues/984#change-2624 01:01:29 <Brot6> NFO Meta Language - Feature #984: regression test (planetmaker) @ http://dev.openttdcoop.org/issues/984#change-2624 01:10:09 <Brot6> NFO Meta Language - Feature #984: regression test (planetmaker) @ http://dev.openttdcoop.org/issues/984#change-2624 01:24:50 <Brot6> NFO Meta Language - Feature #984: regression test (planetmaker) @ http://dev.openttdcoop.org/issues/984#change-2624 01:24:50 <Brot6> NFO Meta Language - Revision 311:68a0d95731b5: Add: Regression test for templates and TTD sprite ... (planetmaker) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/68a0d95731b5 01:45:37 <Brot6> NFO Meta Language - Revision 312:5026bcf32ec6: Add: Regression test for livery override (planetmaker) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/5026bcf32ec6 01:46:58 <Brot6> NFO Meta Language - Feature #984: regression test (planetmaker) @ http://dev.openttdcoop.org/issues/984#change-2624 03:44:31 <Brot6> Redmine - Revision 3782:0aa282c6f7fd: Updated the project calendar for greater accessibility. (edavis10@e93f8b46-1217-0410-a6f0-8f06a7374b81) @ http://dev.openttdcoop.org/projects/redmine/repository/revisions/0aa282c6f7fd 06:12:50 *** ODM has joined #openttdcoop.devzone 07:14:41 *** Yexo_ has joined #openttdcoop.devzone 07:17:58 *** Yexo has quit IRC 10:17:08 *** KenjiE20 has joined #openttdcoop.devzone 11:17:21 *** Yexo_ is now known as Yexo 11:37:06 <Brot6> NFO Meta Language - Revision 313:200ae4d60ec8: Codechange: make all expression classes a subclass... (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/200ae4d60ec8 11:37:06 <Brot6> NFO Meta Language - Revision 314:82034e316235: Codechange: make reduce_constant a member function... (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/82034e316235 11:53:41 <Brot6> NFO Meta Language - Revision 315:b9eecaff36f8: Feature: support for ternary operator (only in act... (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/b9eecaff36f8 11:54:45 <planetmaker> Yexo, could you have a look at swedishrails project? 11:54:51 <Yexo> sure 11:54:53 <planetmaker> If you get the current checkout, it compiles fine 11:55:18 <planetmaker> if you open railtypes.pnml and comment out the if (param[0x9D]) { 11:55:28 <planetmaker> s/comment out/comment in/ 11:55:40 <planetmaker> I get a syntax error I don't understand. 11:55:56 <planetmaker> (also comment in the corresponding } at the end of the file) 11:56:09 <Yexo> I think that's because you can't skip spriteblocks 11:56:21 <planetmaker> oh? 11:56:23 <planetmaker> I'll try 11:56:50 <planetmaker> yes, that's true 11:56:57 <planetmaker> thank you, that was quick :-) 11:57:15 <Yexo> header.pnml can also be simplified a lot now :) 11:57:22 <planetmaker> yes, I know :-) 11:57:26 <Yexo> param[11] = param[0x83] == 0; 11:57:52 <planetmaker> how should one deal with these global vars 11:58:00 <planetmaker> should they get their own functions and constants? 11:58:25 <Yexo> yes, there should be constants for them 11:58:26 <planetmaker> if (climate() == CLIMATE_TROPICAL) { 11:58:33 <planetmaker> maybe even? 11:58:41 <Yexo> or just if (climate == CLIMATE_TROPICAL) 11:58:53 <planetmaker> hm, yes :-) 11:59:16 <planetmaker> I toyed around... what kind of constant would do for that case? 11:59:43 <planetmaker> global_vars = { climate: 'param[0x83]', } won't do 11:59:47 <Yexo> something in const_table, but that isn't possible atm because there are only numbers in there 12:00:33 <planetmaker> hm, ok... 12:01:23 <planetmaker> it's certainly feasable currently to achieve the same end by means of pre-processing 12:01:44 <planetmaker> but... that's a hack in my eyes. 12:01:58 <Yexo> I'll work on it now 12:02:11 <planetmaker> :-D 12:02:21 * KenjiE20 hacks planetmaker's eyes 12:02:30 <planetmaker> :`-( 12:02:49 <Yexo> http://paste.openttd.org/225946 it's code like this 12:02:49 <KenjiE20> now I want to watch GITS again, thanks 12:16:06 <planetmaker> expr.reduce([const_table, (global_parameters, param_from_num)]) <-- nml doesn't quite like that 12:35:13 *** welshdragon has quit IRC 12:39:58 <Yexo> planetmaker: "param[0] = (climate == CLIMATE_TROPICAL) ? 3 : 5;" <- that is now valid nml 12:40:23 <planetmaker> nice! :-) 12:40:40 <planetmaker> hm, the logical operators are & and | and not && and ||, right? 12:40:47 <Brot6> NFO Meta Language - Revision 316:89575b108d27: Fix (r315): argument to reduce should be id_dicts,... (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/89575b108d27 12:40:47 <Brot6> NFO Meta Language - Revision 317:cde5ad2c5f10: Fix (r299): equal operator was broken (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/cde5ad2c5f10 12:40:47 <Brot6> NFO Meta Language - Revision 318:3470321e4738: Feature: constants for several useful parameters (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/3470321e4738 12:41:00 <Yexo> there are no logical operators, only binary operators 12:41:13 <Yexo> ==, !=, < and > return either 0 or 1 12:41:21 <planetmaker> ok, and they are & and | ? 12:41:31 <planetmaker> additional to what you quoted? 12:41:33 <Yexo> but (2 == 2) & 2 would be 0 12:41:34 <Yexo> yes 12:41:46 <Yexo> as 2 == 2 returns 1, then 1 & 2 is 0 12:41:58 <planetmaker> hm 12:42:10 <planetmaker> ok, but 1 & 1 --> 1 :-) 12:42:15 <Yexo> yes :) 12:42:27 <planetmaker> but 1 | 0 = ?? 12:42:29 <Yexo> it's just something to keep in mind if you use them on bool + integer 12:42:36 <Yexo> 1 | 0 = 1 12:42:39 <planetmaker> should ^ 12:42:49 <planetmaker> ok...1 & 0 = 0 12:42:57 <planetmaker> ok, then it works as I like :-) 12:43:04 <Yexo> as long as all values are either 1 or 0 it works as expected 12:43:18 <planetmaker> let's simplify swedishrails code a bit :-) 12:44:55 <planetmaker> does <> work? 12:45:06 <Yexo> <>? as in not equal? use != for that 12:45:11 <planetmaker> oh, right :-) 12:48:10 <planetmaker> Yexo, difficulty_level is not useful :-P 12:48:16 <Brot6> NFO Meta Language - Feature #968: Add a way to check some global variables, like ttdpatch flags (... (yexo) @ http://dev.openttdcoop.org/issues/968#change-2625 12:48:42 <Yexo> planetmaker: I'm quite sure I read a few newgrf authors used it 12:49:15 <planetmaker> yes, I read that, too :-) 12:49:28 <planetmaker> I'd like to abolish / deprecate that though ;-) 12:49:55 <planetmaker> (if I have my way with re-structuring settings / options / user preferences) 12:50:12 <planetmaker> it's meaningless anyway as it is now 12:50:44 <planetmaker> and yes, this is definitely no argument to not have it in NML ;-) 12:51:36 <Yexo> it is somewhat 12:51:50 <Yexo> not having it = not documenting that is exists = newer authors won't try to use it 12:52:06 <planetmaker> :-D 12:52:25 <planetmaker> authors might want to use it for TTDP :-P 12:52:28 <Yexo> done 12:52:39 <planetmaker> :-D 12:52:46 <Yexo> they'll have to use param[0xA2] in that case :p 12:52:56 <planetmaker> true. Still feasable 12:54:22 <Brot6> NFO Meta Language - Revision 319:bbb68caf568d: Change: remove difficulty level constant as it's u... (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/bbb68caf568d 13:05:11 <planetmaker> ha, nice, only two unused tokens :-) 13:07:19 <Yexo> now only 1 :) 13:07:33 <planetmaker> :-) You surely deserve apple pie ;-) 13:07:42 <Brot6> NFO Meta Language - Revision 320:0034e74e7577: Fix: remove token 'DOT' as there are no plans to u... (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/0034e74e7577 13:08:17 <Yexo> :) 13:12:05 <Brot6> Swedish Rails - Revision 30:c2677049963a: Change: Activate rail types only for OpenTTD (planetmaker) @ http://dev.openttdcoop.org/projects/swedishrails/repository/revisions/c2677049963a 13:16:44 <Yexo> planetmaker: there is still param[0x9D] in railtypes.pnml 13:16:49 <planetmaker> drat 13:17:27 <Yexo> and param[10] always contains 0 or 1, so you don't have to check param[10]==1 in with_ground.pnml 13:17:40 <Yexo> if ((climate == CLIMATE_TEMPERATE) & param[10]) { <- that works just fine 13:18:25 <Yexo> in this case I'd even propose to add #define USE_TTD_GROUND_SPRITES param[10] 13:18:28 <Yexo> or something like that 13:18:34 <planetmaker> yes, I know. But for clearity and possible extension of param[10] I used the direct comparison 13:18:48 <Yexo> ok :) 13:19:03 <planetmaker> yeah, such #define might nevertheless be useful 13:20:23 <planetmaker> there *might* be the possibility to provide no graphics for tunnels, thus allowing another base set than OpenGFX 13:20:34 <planetmaker> Which might be 2 for param[10] 13:21:10 <Yexo> ah, that sounds useful 13:58:25 <Ammler> Terkhen: is watching TV? 13:58:32 <Ammler> (I am sorry :-P 13:58:36 <Terkhen> sorry? 13:58:58 <Ammler> I hope so, yes :-) 13:59:03 *** welshdragon has joined #openttdcoop.devzone 13:59:38 <Terkhen> I might be the only person in Spain not watching TV right now, yes 13:59:48 <Ammler> oh :-) 14:00:16 <Ammler> the bet quote is around 1:10 14:06:56 <planetmaker> Ammler: what are the bets of you coming here? :-) 14:07:16 <Brot6> NFO Meta Language - Revision 321:6f2f191b5b76: Codechange: don't write useless actions for an if-... (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/6f2f191b5b76 14:07:16 <Brot6> NFO Meta Language - Revision 322:7b78e228f923: Codechange: change the position where the type of ... (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/7b78e228f923 14:07:16 <Brot6> NFO Meta Language - Revision 323:ee0cb774ba26: Codechange: refactor action7/9 code (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/ee0cb774ba26 14:07:17 <Brot6> NFO Meta Language - Revision 324:d6d4479114e8: Change: optimize action7/9 code, generate a lot le... (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/d6d4479114e8 14:07:19 <Ammler> not that worse :-) 14:07:31 <planetmaker> \o/ 14:10:07 *** KenjiE20 has quit IRC 14:17:39 <Yexo> planetmaker: any features you need for swedishrails (or other projects)? 14:18:19 <planetmaker> airport tiles for OpenGFX+, if I want to include your ground-sensitive airports there (which I'd like to) 14:18:42 <planetmaker> I fear that I'll end up with a random assortement of things, but... small and nice :-) 14:18:53 <planetmaker> if not... it's a conversion of that set to NML ;-) 14:19:31 <planetmaker> Swedish rails... dunno right now. I need version checks, I guess. But that's a general need rather 14:19:38 <planetmaker> but it's already feasable 14:20:01 *** KenjiE20 has joined #openttdcoop.devzone 14:20:06 <Yexo> you could do version checks already, although not in a nice way 14:20:20 <planetmaker> the 'traditional' way ;-) 14:20:27 <Yexo> yes :) 14:20:49 <planetmaker> checking for other newgrf works already, too, if I look at regression tests, right? 14:21:28 <Yexo> dunno, I've written some support for that quite some time ago but never tested it that well 14:21:38 * Ammler wonders, if I shall make Feature request for nml to support townname lists >255 14:21:43 <Yexo> judging from the ttdptach wiki that code might crash ttdpatch 14:21:52 <planetmaker> I might need that for the swedish rails, too. Irwe likes to make it TTDP-compatible a lot, thus I need to provide different level crossings depending upon other grs 14:21:56 <planetmaker> *grfs 14:22:07 <Ammler> or still doing it via bash 14:22:45 <Yexo> Ammler: nml should support that 14:23:08 <Yexo> I've been thinking on how to implement it, but haven't done that so far 14:23:22 <planetmaker> Another thing of importance is the CTT. 14:23:23 <Ammler> Yexo: no need to split it into 255er groups anymore? 14:23:54 <Yexo> Ammler: what I ment was: "that's not supported yet, but I agree that it would be very nice to do so in the future" 14:23:55 <Ammler> hmm, I should test it then 14:24:20 <Ammler> ah :-) 14:24:30 <Ammler> we had quite luck :-P 14:25:01 <Ammler> ok, go CH go :-) 14:26:31 <Ammler> easiest might be, I create the nml already and then request the feature with it? 14:27:15 <planetmaker> of course 14:27:17 <Yexo> easiest for you would be to request the feature directly :) 14:27:29 <planetmaker> it might be a regression test then straight away 14:27:39 <Yexo> doesn't matter much, it's easy to test if it works anyway 14:27:53 <Yexo> and very easy to write a large testcaes if you have a small one 14:28:18 <Ammler> is it btw. possible to chose a name manually? 14:28:54 <Yexo> a name for the town_names block? 14:28:57 <Yexo> or for what? 14:29:07 <Ammler> no, in OpenTTD, if I create a town 14:29:18 <Yexo> in the scenario editor, yes 14:29:24 <Yexo> I think also in-game if you enable that option 14:29:45 <Yexo> oh, you can't chose a name from the newgrf, only write one yourself 14:30:00 <Yexo> (which can be the same as a name the newgrf can generate) 14:30:46 <Ammler> well, that is like renaming 14:30:52 <Ammler> so not what I meant :-) 14:31:07 <Yexo> ok, then "no, that's not possible" 14:31:12 <Ammler> :-P 14:32:36 <Ammler> dangerous game 14:33:11 <Ammler> (football, not openttd) :-) 14:35:22 <Ammler> I should switch off TV, not good for my nerves 14:35:58 <planetmaker> he. I bet on a goal somewhen soon :-) 14:36:14 <Ammler> yes, soon 0:1 14:36:57 <Ammler> hmm, still 10 mins 14:39:50 <Brot6> NFO Meta Language - Revision 325:36718dc3a48d: Feature: airport tiles properties/variables (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/36718dc3a48d 14:45:19 *** welshdragon has quit IRC 14:46:30 <Ammler> he one half gone and we are still alive :-) 14:47:08 <planetmaker> quite a good defence usually :-) 15:05:54 <Brot6> Swedish Rails - Revision 31:e0a648c235cf: Change: Name the values for the ground sprite usage par... (planetmaker) @ http://dev.openttdcoop.org/projects/swedishrails/repository/revisions/e0a648c235cf 15:05:54 <Brot6> NFO Meta Language - Revision 326:4cbf6b6a6f33: Fix: Identifier.reduce should return self if an un... (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/4cbf6b6a6f33 15:07:05 <Brot6> repository /home/ottdc/hg-repos/townnames registered in Redmine with url /home/ottdc/hg-repos/townnames 15:07:05 <Brot6> repository /home/ottdc/hg-repos/townnames created 15:08:30 <planetmaker> congratz, Ammler :-) 15:08:34 <Ammler> so GEIL 15:08:40 <planetmaker> aber hallo! 15:09:20 <Yexo> that was an unexpected goal :p 15:09:33 <Ammler> indeed, should I care? 15:09:54 <Yexo> heh, not really :) congratz 15:10:14 <Ammler> well, I fear the game isn't done 15:10:21 <planetmaker> it isn't done by far 15:10:25 <Ammler> :-P 15:10:36 <Yexo> it'll only be better to watch now :) 15:10:43 <planetmaker> now it'll ... ^ 15:10:46 <Ammler> horrible for me 15:11:05 <Ammler> I guess, I switch off 15:16:25 <planetmaker> doesn't matter. you'll have surround sound probably anyway from all the neighbours ;-) 15:17:37 <planetmaker> a good performance show for the Swiss goal keeper :-) 15:19:08 <Ammler> well, he has Bundesliga practice :-) 15:20:08 <planetmaker> yeah. They told he plays just 30minutes from here 15:20:19 <Ammler> Wolfsburg 15:20:24 <planetmaker> ^ 15:20:43 <planetmaker> Volkswagen town ;-) 15:26:07 <Brot6> 2cc train set - Revision 546:7db685180adb: fix: Aligmentbug in enginestyle EMUS (DJNekkid) @ http://dev.openttdcoop.org/projects/2cctrainset/repository/revisions/7db685180adb 15:26:07 <Brot6> 2cc train set - Revision 547:da3ed83ae3f2: Merge heads (DJNekkid) @ http://dev.openttdcoop.org/projects/2cctrainset/repository/revisions/da3ed83ae3f2 15:26:57 <Ammler> would be the first win for us against Spain 15:29:03 <Ammler> DJNekkid: merge for one commit is stupid :-) 15:30:36 <DJNekkid> i know 15:30:42 <DJNekkid> but i didnt realize there had been an update :) 15:30:44 <Terkhen> I can hear the commentators going crazy with each opportunity :P 15:30:50 <Ammler> just rollback, pull and commit again 15:30:59 <DJNekkid> omg! 15:31:03 <DJNekkid> that were ALMOST 2-0 15:31:12 <Ammler> yeah :-D 15:31:40 * Yexo has about 20 seconds lag :o 15:31:51 <DJNekkid> web tv? 15:31:54 <Yexo> yes 15:31:57 <planetmaker> http://paste.openttd.org/225947 <-- would something like that work, Yexo ? 15:31:57 <Ammler> I have my own stream :-) 15:32:05 * planetmaker uses webTV, too 15:32:12 <DJNekkid> i have ... ehm ... sattelite dish :) 15:32:13 <Yexo> planetmaker: no 15:32:15 <Ammler> tvbox with vlc 15:32:27 <planetmaker> so only with if ... then ... else? 15:32:29 <DJNekkid> and tuner on a server-thingy? 15:32:29 <Yexo> switch is an action2 block, not a swtich statement like in other languages 15:32:37 <planetmaker> :-) 15:32:46 <planetmaker> Might have been that you generalized it ;-) 15:32:52 <Terkhen> I hope we win, I don't want any of my teachers in a bad mood this week :/ 15:32:59 <planetmaker> :-P 15:33:00 <Ammler> hehe 15:33:10 <DJNekkid> Terkhen: spaninsh or swizz? 15:33:12 <planetmaker> Terkhen: I wouldn't bet on a win anymore 15:33:12 <Ammler> Terkhen: I already excused :-P 15:33:29 <DJNekkid> *spanish 15:33:42 <Terkhen> DJNekkid: spanish 15:34:55 <DJNekkid> oki :) 15:35:35 <Ammler> btw. do the dutchies have time for party on sat evening? 15:35:50 <Yexo> yes, we leave on sunday 15:36:20 <Ammler> when do you arrive? 15:36:30 <Yexo> around 1300 15:37:28 <Ammler> I would arrive at 1500, if I take earliest train :-) 15:38:49 <planetmaker> that shall be fine 15:38:52 <Yexo> netherlands - japan is sat 13:30 15:39:03 <planetmaker> I'll reserve cake for you, Ammler :-) 15:39:12 <planetmaker> apple pie by any chance? ;-) 15:39:22 <Ammler> do trains have power cable for notebooks nowaday? 15:39:32 <planetmaker> ICE trains: yes 15:39:37 <planetmaker> not everywhere but at tables 15:39:38 <Ammler> my Akku is quite bad 15:39:49 <DJNekkid> whats happening in saturday? 15:39:50 <planetmaker> IC have it, too in some places 15:39:53 <DJNekkid> r20k party? 15:39:54 <planetmaker> DJNekkid: r20k party 15:40:05 <DJNekkid> yea, i saw that post :) 15:40:14 <planetmaker> wanna come? :-) 15:40:26 <Ammler> aren't your responsible for party sound? 15:40:31 <DJNekkid> i _want_ to come :) 15:41:06 <Ammler> 10 mins left... 15:41:41 <DJNekkid> but on saturday, from around 3pm am i on the beach on Krethe :) 15:41:50 <DJNekkid> or whatever the english name for that island is 15:42:09 <planetmaker> ha :-) sounds good, too 15:42:31 <Ammler> hmm, you could make a trip break 15:42:41 *** welshdragon has joined #openttdcoop.devzone 15:42:46 <DJNekkid> a middle landing? :P 15:42:52 <Ammler> yes :-P 15:43:25 <DJNekkid> well, at some point are we BOUND to fly over germany 15:43:48 <DJNekkid> so, i can imagine to be there... 15:44:10 <Ammler> we can listen some mp3 from your server :-) 15:44:44 <Ammler> 5 mins 15:44:52 <DJNekkid> i can update my list... 15:45:08 <DJNekkid> or even make a mixtape 15:45:13 <DJNekkid> Yexo: do you like dirty dutch? 15:45:14 <Ammler> include some ttdish sounds :-P 15:45:17 <DJNekkid> (the house genre) 15:45:32 <Yexo> occasionally :p 15:45:45 <Yexo> (after a lot of beer on a party, yes, otherwise, no) 15:45:54 <DJNekkid> oki... :) 15:46:06 <Ammler> Yexo: same with me :-) 15:46:40 <Yexo> and I won't be drinking much saterday, I've got exams on monday 15:46:50 <DJNekkid> perhaps i'll make a quick dirty dutch mixtape, and post it to you :) 15:47:21 <Ammler> 90+ 15:47:41 <Ammler> :-o 15:47:42 <DJNekkid> 90+? 15:47:45 <Ammler> 5 mins! 15:47:52 <Ammler> that is cheating! 15:48:01 <DJNekkid> ahh... 15:48:18 <Yexo> lol 15:48:58 <DJNekkid> "we" (my local team) had a 1-0 lead a few months ago 15:49:48 <DJNekkid> and when there were like 7-8 mins left of the game, a dude managed to get two yellows for pulling out the time on a throw-in 15:50:03 <DJNekkid> and then he did spend like 3 minutes leaving the field 15:50:12 <DJNekkid> it were +7mins in the end 15:50:52 <Ammler> just no 11m please 15:51:19 <DJNekkid> do you remember 15:51:46 <DJNekkid> there were a WC in USA ca 1996... 15:52:02 <DJNekkid> and there someone did shoot so hard that one of the poles on a goal did break 15:52:11 <DJNekkid> there were around +30 mins :) 15:52:15 <Ammler> now the refer goes crazy 15:52:54 * DJNekkid high-fives Ammler 15:52:57 <Ammler> \o/\o/\o/\o/\o/\o/\o/\o/\o/\o/\o/\o/\o/\o/\o/\o/\o/\o/\o/\o/\o/ 15:53:06 <planetmaker> hey ho, congratz :-) 15:53:08 <planetmaker> have a beer! :-) 15:53:11 * DJNekkid brings Terkhen a beer/scotch/<whatever> 15:53:21 <Terkhen> :P 15:53:22 <Yexo> congratz Ammler :) 15:53:26 <DJNekkid> bottle of vodka? 15:53:40 <DJNekkid> pitcher of sangria? (with more vodka) 15:54:04 <Terkhen> you would only notice the vodka then :) 15:54:21 <Ammler> awesome :'-) 15:55:23 <DJNekkid> i know the feeling of beating spain :P We had a win against them ... YEARS ago! :D 15:55:53 <DJNekkid> but with that win, and two equals we didnt even get to the quarters 15:56:14 <DJNekkid> the other teams had better goal-diff 15:56:55 <DJNekkid> it were one of the few times in history where 4 points in the group-play didnt proceed :) 15:57:00 <DJNekkid> btw, Kristine saies hi :D 15:57:12 <DJNekkid> *afk, make taco* 16:07:28 <Ammler> well, I see us qualified :-) 16:07:48 <Ammler> most probably as group leader 16:11:29 <planetmaker> :-) 16:12:47 <Ammler> at least, I set my bet that way, today was luck, next tips are true 16:19:01 <Brot6> 2cctrainset: update from r545 to r547 done (103 errors) - http://bundles.openttdcoop.org/2cctrainset/nightlies/r547 16:19:41 <Brot6> nml: update from r300 to r326 done - http://bundles.openttdcoop.org/nml/nightlies/r326 16:21:07 <Brot6> swedishrails: update from r25 to r31 done (4 errors) - http://bundles.openttdcoop.org/swedishrails/nightlies/r31 16:21:09 <Brot6> Following repos didn't need a nightlies update: 32bpp-extra (r36), airportsplus (r50), bros (r12), comic-houses (r70), firs (r910), fish (r375), heqs (r320), newgrf_makefile (ERROR r99), nmts (r16), nutracks (r69), ogfxplus (r27), opengfx (r459), openmsx (r57), opensfx (r94), snowlinemod (r12), test (ERROR r47), worldairlinersset (r643) 16:27:34 *** Seberoth has joined #openttdcoop.devzone 16:36:40 <Brot6> 2cc train set - Revision 548:555d9d62b99d: Fix: Should fix the bug with single unit metros can at... (DJNekkid) @ http://dev.openttdcoop.org/projects/2cctrainset/repository/revisions/555d9d62b99d 16:36:40 <Brot6> 2cc train set - Revision 549:6a903b4d635b: Fix: Part 3 of 999 (DJNekkid) @ http://dev.openttdcoop.org/projects/2cctrainset/repository/revisions/6a903b4d635b 16:36:40 <Brot6> 2cc train set - Revision 550:87b06d45669f: Fix: Part 2 of 999 (DJNekkid) @ http://dev.openttdcoop.org/projects/2cctrainset/repository/revisions/87b06d45669f 16:39:56 <Ammler> DJNekkid: release beta2? 16:40:09 <Brot6> Swedish Rails - Revision 32:dac3278ce155: Add: Tunnel sprites in OpenGFX style (planetmaker) @ http://dev.openttdcoop.org/projects/swedishrails/repository/revisions/dac3278ce155 16:40:17 <planetmaker> release 0.1.0 ;-) 16:40:26 <Ammler> oh :-) 16:40:46 <Ammler> now, I did so ugly hacks to support "-" in revision :-P 16:44:00 *** frosch123 has joined #openttdcoop.devzone 16:51:16 <Yexo> planetmaker: http://paste.openttd.org/225948 this makes the runway of the small airport climate aware 16:58:16 <Ammler> planetmaker: how do you detect opengfx? 17:15:37 <Ammler> you have no regression test with png? 17:46:10 <planetmaker> Ammler: I don't detect OpenGFX 17:52:20 <planetmaker> Ammler: I assume by default that I can use OpenGFX ground sprites. 17:52:36 <Ammler> did you try to check for the GRFID? 17:52:42 <Ammler> or is that not supported by nml? 17:52:50 <planetmaker> One can activate TTD ground sprites by the first parameter = 1. Or de-activate any use of ground sprites by parameter 1 = 2 17:53:07 <planetmaker> Ammler: That must be forbidden. 17:53:14 <Ammler> he :-o 17:53:17 <planetmaker> NML allows already checking for grfIDs 17:53:27 <planetmaker> But newgrfs MUST NOT know the base set being used 17:53:48 <Ammler> I don't see any issue for ActionA 17:53:53 <planetmaker> or I could create the nicest of desyncs by diverging action2 17:54:08 <planetmaker> yes, for that purpose. But OpenTTD has no control how I use that information 17:54:17 <Ammler> why do you care? 17:54:31 <Ammler> as long as you respect the rules for static grfs 17:54:34 <planetmaker> it'd be a bug in OpenTTD. As such I'd care :-) 17:54:52 <Ammler> it would be a bug, if you can't autodetect the base set 17:55:01 <planetmaker> nope 17:55:05 <Ammler> :-P 17:55:26 <planetmaker> And I don't want to start to play it that way ;-) 17:55:40 <Ammler> hmm, that is silly 17:55:51 <planetmaker> nope, it'd get abused 17:56:10 <Ammler> you think, that is the only thing, you can abuse? 17:56:13 <planetmaker> And I'm quite sure that one cannot test for grfIDs of FFxxxxxx 17:56:37 <planetmaker> Ammler: not. But desyncs are a pain. And it'd open the flood gates for them 17:56:39 <Ammler> then we should report that as bug :-) 17:57:08 <planetmaker> I won't report that as a bug 17:57:11 <Ammler> planetmaker: then you should disallow static grfs 17:57:15 <planetmaker> no 17:57:17 <Yexo> and guess how that would be fixed? by disallowing to check for FFxxxxxx ids 17:57:25 <Yexo> if it's not already disallowed 17:57:27 <Ammler> Yexo: quite ugly :-P 17:57:30 <planetmaker> Yexo: I guess it is 17:57:47 <Ammler> Yexo: why won't you allow that for static grfs? 17:57:53 <Ammler> I seriously don't get that. 17:58:00 <Yexo> oh, for static grfs it could work 17:58:02 <planetmaker> Ammler: there's no way to check for static-ness of newgrfs 17:58:10 <planetmaker> at least not that I know 17:58:18 <planetmaker> besides swedish rails is not a static newgrf 17:58:22 <Ammler> planetmaker: try to load a non-static grf as static 17:58:31 <planetmaker> Ammler: tell me 17:58:36 <Yexo> Ammler: the grf itself doesn't know if it's loaded as static or normally 17:58:40 <Ammler> I know, it does remove automatically 17:58:46 <Ammler> openttd is able to detect that 18:02:38 <Ammler> planetmaker: it doesn't work with parameter 18:02:50 <Ammler> or how will you support MP? 18:03:23 <Ammler> I think, that is worth the possible desyncs :-) 18:03:44 <Yexo> for the newgrf author yes, for an openttd developer not 18:04:51 <Brot6> test: abort: push creates new remote heads on branch 'default'! 18:04:59 <Ammler> Yexo: for the player :-) 18:05:23 <Yexo> same as newgrf dev, yes :) 18:05:46 <Yexo> but neither player nor the grf dev has to deal with the bugreports about those desyncs 18:06:17 <Ammler> Yexo: you already complain about something not even tried :-( 18:07:03 <Yexo> trying to find why a desync happens is one of the worst kinds of debugging 18:07:23 <Yexo> even though it got slightly better with the new desync log, it's still a pain to do 18:08:07 <Ammler> yes, in this case, you don't need to search for it 18:08:29 <Ammler> it might be a pain to find those, but in this case, you would know about 18:08:30 <Yexo> only when you know it's caused by this, otherwise you have to verify that for every desync bug report 18:08:31 <planetmaker> Ammler: It will somewhat glitch for either OpenGFX or TTD base set users 18:08:36 <planetmaker> But only for tunnel entrances 18:08:41 <Ammler> planetmaker: unacceptable, imo 18:08:54 <Ammler> if so easy fixeable 18:09:00 <planetmaker> I plan to try to use the tunnel overlays. But I'm not convinced they're very nicely usable 18:09:13 <planetmaker> it needs usually two sprites for tunnels... 18:09:52 <planetmaker> hm... I shall ask Irwe for sprites which don't require that :-) 18:10:06 <planetmaker> hm... though I wonder whether it's possible 18:10:56 <Ammler> Yexo: how many times did you hunt desyncs from games with newgrfs? 18:11:15 <Yexo> only a few times, but that was more then enough 18:11:26 <Ammler> those are the easiest to find, weren't? 18:11:36 <Yexo> no, not really 18:11:39 <Ammler> hmm 18:11:41 <Yexo> actually the hardest 18:12:02 <Yexo> as you have all the normal reasons the game could desync (bug in DoCommand code usually) + a possible bug in the newgrf code 18:12:07 <Ammler> maybe not the easiest to fix :-P 18:12:51 <Yexo> of course when you know the desync happens only with one grf that makes it already a lot easier 18:13:12 <Ammler> anyway, I have no idea, how differnt ActionA can cause desyncs 18:13:50 <Brot6> Swedish Rails - Revision 33:75307fdd9d52: Doc: Parameter usage and known bugs / missing features (planetmaker) @ http://dev.openttdcoop.org/projects/swedishrails/repository/revisions/75307fdd9d52 18:14:30 <Yexo> Ammler: it can't, but then there will be a newgrf dev that abuses such a value and uses it in a varaction2 where it _can_ cause desyncs 18:14:40 <planetmaker> Ammler: I understand very well that I wouldn't want to allow this highway to desync hell 18:14:55 <planetmaker> I can imagine at least two authors who will abuse it. 18:14:57 <Ammler> hmm, that is above my scope then 18:15:18 <Ammler> and why not for example disallow it for action2? 18:15:28 <Yexo> that's not really possible 18:15:45 <Yexo> if it can be checked by an action7/9 it can be used to set a parameter ,which can be checked in action2 18:17:44 <planetmaker> Ammler: http://img.openttdcoop.org/images/policebqb.png 18:18:03 <planetmaker> http://img.openttdcoop.org/images/policekzk.png 18:18:07 <planetmaker> find the differences 18:18:13 <planetmaker> one is "wrong" 18:18:46 <planetmaker> not that bad, though visible 18:19:52 <Ammler> the first does glitch 18:20:28 <planetmaker> actually the 2nd does 18:20:29 <Yexo> planetmaker: and the same graphics with ttd baseset? 18:20:46 <Ammler> planetmaker: I like the 2nd more 18:20:46 <Yexo> hmm? I thought too that bqb glitches 18:21:18 <planetmaker> bqb glitches IMHO 18:21:22 <planetmaker> oh... sorry :-) 18:21:26 <planetmaker> mixed up 18:21:32 <Ammler> planetmaker: is it worth to supply both versions 18:21:37 <planetmaker> Ammler: I do 18:21:50 <planetmaker> everyone is free to switch that parameter 18:22:03 <Ammler> not really, if you use it on MP 18:22:12 <planetmaker> then two versions don't help you either 18:22:31 <Ammler> it would, if you use action9 to switch :-) 18:22:38 <planetmaker> ? 18:22:41 <Yexo> for MP nothing is failsafe, grahpics will always fit better with original or opengfx 18:22:59 <planetmaker> Ammler: so you still argue a switch based upon base set? 18:23:30 <Ammler> either use only one version 18:23:38 <Ammler> or switch with autodetection 18:24:08 <planetmaker> I don't understand why for the first and cannot do the latter 18:24:42 <Ammler> because then the half will complain, why the map creator didn't set the right tunnels 18:25:23 <planetmaker> only 1/3 18:25:28 <Ammler> :-P 18:25:32 <planetmaker> :-D 18:25:43 <Ammler> and what if the map creator is a original fan? 18:25:45 <frosch123> unless someone already wrote: if a non-static newgrf checks for a static grf, the static grf is disabled 18:26:15 <planetmaker> interesting 18:26:25 <Ammler> I would make the tunnel grass so it doesn't look glitchy with both 18:26:30 <frosch123> and yes, there was at least one desync due to that 18:26:43 <planetmaker> he, I can imagine. 18:26:48 <Ammler> frosch123: canada stations and dutch cats 18:26:48 <frosch123> some set disabled itself due to presence of some other grf, which was static 18:27:06 <planetmaker> silly 18:27:30 <Brot6> Swedish Rails - Revision 34:bc8e4021d89f: Fix: arctic non-snow tunnels weren't switchable anymore... (planetmaker) @ http://dev.openttdcoop.org/projects/swedishrails/repository/revisions/bc8e4021d89f 18:27:58 <planetmaker> Ammler: so... I just push a tag and I get a release? 18:28:04 <Ammler> yep 18:28:10 <planetmaker> let's see 18:28:14 <Ammler> hmm, if enabled :-P 18:28:22 <planetmaker> meh 18:28:44 <Ammler> but it is for swedish rails 18:28:46 <planetmaker> seems like 18:28:50 <planetmaker> :-) 18:33:49 <Brot6> Swedish Rails - Revision 35:780e463cc364: Added tag 0.1.0 for changeset bc8e4021d89f (planetmaker) @ http://dev.openttdcoop.org/projects/swedishrails/repository/revisions/780e463cc364 18:35:09 <Ammler> hmm 18:35:11 <Brot6> swedishrails: update from to 0.1.0 done (4 errors) - http://bundles.openttdcoop.org/swedishrails/releases/0.1.0 18:39:43 <planetmaker> wonderful. md5sums are different :S 18:39:55 <Ammler> oh :-( 18:41:36 <planetmaker> ah. wait 18:41:42 <planetmaker> I built tip, not 0.1.0 18:41:53 <planetmaker> beginner error :-P 18:42:11 <Ammler> just liked to ask 18:42:37 <Ammler> another advantage of server building :-P 18:42:52 <Ammler> if it works, it is better 18:43:05 <Ammler> and you don't need to update to tip again 18:45:22 <Ammler> http://bundles.openttdcoop.org/swedishrails/releases/LATEST/readme.txt <-- the readme link I suggest for publication 18:47:18 <Ammler> well, I am happy, the first automatic release worked :-P 18:47:45 <planetmaker> looks fine. md5sums match 18:48:01 <planetmaker> congratz, Ammler :-) 18:48:23 <Yexo> is the version of nml logged anywhere? 18:48:33 <Yexo> using anothre version of nml might result in another md5sum 18:48:36 <Ammler> Yexo: yes in the build log 18:48:42 <Yexo> ok :) 18:49:10 <Ammler> "installing nml-r326-suse1120" 18:53:07 <Ammler> but if another nml version produces another md5sum, wouldn't that be like a regression fail? 18:54:14 <Ammler> I thought about, that we "force" a rebuild of a nml project on nml update, which just checks the md5sums 18:54:23 <Yexo> sometimes, but better optimalization can result in less actions needed 19:01:03 <Ammler> well, we think about that, if the first time a update will fail because of that :-) 19:02:19 <Yexo> if you had implemented it today would be such a day 19:02:53 *** Alberth has joined #openttdcoop.devzone 19:05:33 *** Alberth1 has joined #openttdcoop.devzone 19:05:33 *** Alberth is now known as Guest222 19:05:33 *** Alberth1 is now known as Alberth 19:07:46 <frosch123> someone uses a tabwidth of 4 19:08:19 <Alberth> eclipse editor does 19:08:36 <Yexo> I use that too, why? 19:08:51 <frosch123> the author of swedish rails readme does to :) 19:08:59 <frosch123> +o 19:09:05 <Yexo> planetmaker: 19:09:13 <Ammler> planetmaker: thanks for the flowers on the readme :-P 19:10:11 <Ammler> also don't forget to manually wrap the lines 19:11:32 *** Guest222 has quit IRC 19:16:37 <planetmaker> you mean the readme alignment? yes, I noticed :S 19:20:23 <Brot6> 2cc train set - Revision 551:72ae1e6b79f1: Fix: Some metros didnt have p-list texts (DJNekkid) @ http://dev.openttdcoop.org/projects/2cctrainset/repository/revisions/72ae1e6b79f1 19:20:23 <Brot6> 2cc train set - Revision 552:5793dbcd2ebb: Fix: were a shitload of new string definitions, added ... (DJNekkid) @ http://dev.openttdcoop.org/projects/2cctrainset/repository/revisions/5793dbcd2ebb 19:23:23 <planetmaker> Ammler: can the logs from building be moved into their own sub-dir? 19:23:38 <planetmaker> I assume that many newbies would be confused by those files 19:24:03 <planetmaker> e.g. mkdir log && mv *.log log 19:24:03 <Ammler> hmm, the changelog is missing 19:24:08 <planetmaker> no? 19:24:25 <planetmaker> there's one: http://bundles.openttdcoop.org/swedishrails/releases/LATEST/ 19:24:28 <planetmaker> or where? 19:24:57 <Ammler> ah indeed 19:25:16 <planetmaker> it's a bit useless, though for a 1st release ;-) 19:30:31 <Brot6> #openttdcoop - Revision 67:7c96437913d8: [Compiler] Feature: own subfolder for logs (pm) (Ammler) @ http://dev.openttdcoop.org/projects/home/repository/revisions/7c96437913d8 19:33:57 <planetmaker> hm, I wonder how much the average internet usage increases due to all the people using video streaming of the worldcup ;-) 19:34:54 <Yexo> probably not much 19:35:08 <Brot6> NFO Meta Language - Revision 327:046037acec28: Codechange: Rename action6 variable to act6. (Alberth) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/046037acec28 19:35:10 <Yexo> during the game of the netherlands monday there was less internet traffic then usual 19:35:19 <Yexo> even though the nos predicted a heavy spike 19:35:43 <Ammler> planetmaker: don't think, you should link to the releases from bananas 19:35:46 <Yexo> probably caused by a lot more people watching tv and not usin gthe internet 19:35:56 <Ammler> as you have there already a dwonload 19:36:40 <Ammler> Yexo: less usage but maybe more traffic? 19:36:53 <planetmaker> you're right, Ammler. Thanks 19:36:57 <Ammler> as everyone is watching stream instead browsing 19:37:52 <Yexo> Ammler: no, less traffic 19:38:14 <Ammler> silly, I would also have guessed, there is more traffic :-) 19:47:02 <Brot6> 2cc train set - Revision 553:485cff7ab492: Fix: Y2 had a slight alignmentproblem in one view (DJNekkid) @ http://dev.openttdcoop.org/projects/2cctrainset/repository/revisions/485cff7ab492 19:48:33 <Ammler> planetmaker: why do you tar a single grf? 19:48:41 <Ammler> that is quite silly 19:49:02 <Ammler> for patch users specially 19:49:04 <planetmaker> I tar it with the docs 19:49:19 <Ammler> and bananas does support that? 19:49:22 <planetmaker> zip: docs + tar; tar = docs+grf 19:49:28 <planetmaker> no, bananas got the tar 19:49:42 <Ammler> again, why tar? 19:50:06 <planetmaker> I know that a certain person from Switzerland argued for this ;-) 19:50:22 <planetmaker> As such the documentation is passed along with the grf, even if the thing is unzipped 19:50:31 <Ammler> yes 19:50:37 <Ammler> the zip with tar is fine 19:50:43 <Ammler> s/tar/doc/ 19:51:01 <Ammler> but I see no reason for taring a single grf 19:51:17 <Ammler> I asked you to tar opengfx grfs 19:51:17 <planetmaker> as said: the tar contains (againg) the docs, too 19:51:48 <planetmaker> thus the tar is sufficient. In principle 19:51:56 <Ammler> it is useless 19:51:57 <planetmaker> the tar has always everything 19:52:12 <planetmaker> it avoids people posting grfs. maybe 19:52:32 <Alberth> Yexo: why do you introduce new cycles? 19:52:33 <Ammler> I liked to test the grf with patch 19:53:05 <Ammler> I don't think, the patch has tar support 19:53:11 <Alberth> import nml.ast in actionD.py 19:53:53 <Ammler> I see, you got me wrong, as I asked for taring the opengfx grfs :-( 19:54:04 <Yexo> Alberth: didn't see an easy way around it 19:54:42 <Ammler> if that is required, I would then prefer the opengfx untared 19:59:47 <Brot6> 2cctrainset: update from 2.0-beta1 to Beta2 done (4 errors) - http://bundles.openttdcoop.org/2cctrainset/releases/Beta2 19:59:57 <Ammler> :'-( 20:00:25 <Ammler> DJNekkid: it isn't Beta2 20:00:27 <Brot6> 2cc train set - Revision 554:0bdca99abc6b: Added tag Beta2 for changeset 485cff7ab492 (DJNekkid) @ http://dev.openttdcoop.org/projects/2cctrainset/repository/revisions/0bdca99abc6b 20:00:39 <Ammler> it is 2.0-beta2 20:02:27 <Alberth> new test for red mine :p 20:03:03 <Ammler> Alberth: first the current test should work :-P 20:03:30 <DJNekkid> i thought it were 2.0 "in the bottom" ? 20:03:36 <DJNekkid> but i'll retag :) 20:03:38 <Brot6> NFO Meta Language - Revision 328:b633f93f9440: Codechange: Import modules only in action0. (Alberth) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/b633f93f9440 20:03:38 <Brot6> NFO Meta Language - Revision 331:997f8a279f64: Codechange: Import modules only in actionB. (Alberth) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/997f8a279f64 20:03:39 <Brot6> NFO Meta Language - Revision 330:e584afe9ec99: Codechange: Import modules only in action7. (Alberth) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/e584afe9ec99 20:03:40 <Brot6> NFO Meta Language - Revision 329:7fec05845669: Codechange: Import modules only in action3. (Alberth) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/7fec05845669 20:03:50 <Ammler> DJNekkid: just change .hgtags 20:04:09 <Ammler> hmm 20:04:21 <Alberth> ha, it failed :) 20:04:38 <Ammler> oh 20:04:57 <DJNekkid> and then what? 20:05:34 <DJNekkid> needs more to push? 20:06:06 <Ammler> DJNekkid: I guess, you need a new tag 20:06:26 <Ammler> as else the hash doesn't change and the compiler wouldn't trigger a new build 20:06:49 <Ammler> anyway, try it 20:07:05 <Ammler> Alberth: import was successful 20:07:13 <Ammler> the view is wrong this time 20:07:45 <Ammler> but you made 3 commits in same second? 20:08:17 <Alberth> command line scripts are pretty fast :p 20:09:04 <Ammler> well, I will bugreport it :-) 20:09:27 <Ammler> it could simply use revision as 3rd sort part 20:10:17 <Alberth> or better only use the revision, perhaps 20:10:29 <Ammler> that wouldn't work with git 20:10:50 <Alberth> hmm, that would also fail with issues and other changes 20:14:05 <Brot6> Example NewGRF Project - Feature #897 (Resolved): make bundle in a subdir (Ammler) @ http://dev.openttdcoop.org/issues/897#change-2626 20:18:07 <Brot6> 2cc train set - Revision 555:9c6ee251ed80: Changed hgtags (DJNekkid) @ http://dev.openttdcoop.org/projects/2cctrainset/repository/revisions/9c6ee251ed80 20:18:07 <Brot6> 2cc train set - Revision 556:e8e92dd1c410: Added tag 2.0-Beta2 for changeset 0bdca99abc6b (DJNekkid) @ http://dev.openttdcoop.org/projects/2cctrainset/repository/revisions/e8e92dd1c410 20:18:07 <Brot6> Example NewGRF Project - Feature #1017 (New): Don't tar a single GRF (Ammler) @ http://dev.openttdcoop.org/issues/1017 20:18:07 <Brot6> 2cc train set - Revision 557:424a2b528c89: Merge (DJNekkid) @ http://dev.openttdcoop.org/projects/2cctrainset/repository/revisions/424a2b528c89 20:18:32 <DJNekkid> yes i know! 20:18:37 <Ammler> DJNekkid: why did you change .hgtags and tag? 20:18:50 <Brot6> 2cctrainset: update from Beta2 to 2.0-Beta2 done (4 errors) - http://bundles.openttdcoop.org/2cctrainset/releases/2.0-Beta2 20:19:11 <Ammler> now, I don't know, if it would have worked :-( 20:19:33 <DJNekkid> i tried to change .hgtags, but it would not commit/push 20:20:26 <Ammler> yes, you need to commit the change 20:20:31 <Ammler> that is why you needed to merge 20:22:00 <Brot6> Swedish Rails - Revision 36:dd1ee04c0ac3: Change: Move railtypes sprite sets to templates (planetmaker) @ http://dev.openttdcoop.org/projects/swedishrails/repository/revisions/dd1ee04c0ac3 20:22:01 <Brot6> Swedish Rails - Revision 37:f55e12b4f40e: Change: Apply a bit coding stlye to railtypes file (planetmaker) @ http://dev.openttdcoop.org/projects/swedishrails/repository/revisions/f55e12b4f40e 20:22:01 <Brot6> NFO Meta Language - Revision 332:e5fdfda787d3: Codechange: Import modules only in actionE.py. (Alberth) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/e5fdfda787d3 20:24:16 <Ammler> and DJNekkid, if you need to merge yourself, you really shouldn't hesitate to ask 20:24:21 <Brot6> Swedish Rails - Revision 38:ec4944a9053c: Change: Move comments to proper position in file (planetmaker) @ http://dev.openttdcoop.org/projects/swedishrails/repository/revisions/ec4944a9053c 20:25:37 <Ammler> for example NFO has 3-4 different devs but there is almost no merge, if any. 20:25:51 <Ammler> nml* 20:28:10 <DJNekkid> dont want to bother you other guys too much 20:28:45 <Ammler> you bother me a lot more if you create such a ugly repo 20:31:18 <Ammler> also merge is complicater than rollback, imo. 20:32:51 <DJNekkid> i tried hg rollback 20:33:01 <DJNekkid> probably why i needed to merge 20:33:20 <Ammler> as I suggested to edit .hgtags, I meant a simple change of Beta2 to 2.0-beta2 20:34:06 <Ammler> no, you changed .hgtags, then hg tag, then hg push 20:35:16 <DJNekkid> i guess we can conclude, that i am no expert in hg/mecurial :) 20:36:16 <Alberth> hg rollback is only useful before a push, when you own the only repo with the change 20:36:30 <Ammler> and you don't care about help :-P 20:37:04 <Ammler> Alberth: of course 20:37:05 <Brot6> FIRS Industry Replacement Set - Revision 911:cf5b223a160e: Change: partial update to Aluminium Plant (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/cf5b223a160e 20:37:34 <Ammler> Alberth: but that is exactly what happen if you try to push a new head 20:37:48 <Ammler> or would you use -f then? 20:38:21 <Ammler> so in this case, you can rollback your commit, pull the changes and commit your change again 20:38:55 <Ammler> the same when you commit something before you updated to tip 20:39:16 <Ammler> merge is not always the nicest "fix" ;-) 20:42:41 <Brot6> NFO Meta Language - Revision 333:e4a0d6cf94c7: Codechange: Import modules only in action2var. (Alberth) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/e4a0d6cf94c7 20:45:47 <Ammler> DJNekkid: shall I remove the Beta? from http://bundles.openttdcoop.org/2cctrainset/releases/ 20:47:53 <planetmaker> Ammler: but a merge is also not bad 20:48:18 <Ammler> planetmaker: check the merges, DJNekkid did 20:48:30 <Ammler> and tell me, you would have done it that way too 20:49:06 <DJNekkid> Ammler: please do :) 20:49:34 <Ammler> DJNekkid: done :-) 20:50:40 <planetmaker> with this diff http://paste.openttd.org/225955 on current swedish rails I get this NML output: http://paste.openttd.org/225956 20:50:43 <planetmaker> any idea why? 20:50:52 <planetmaker> the constant is defined in the global constants file 20:51:09 <planetmaker> (concerning varaction2 usage) 20:53:12 <planetmaker> I need my personal NML expert, Yexo there ^ ;-) 20:54:55 <planetmaker> hm... it also doesn't accept a direct number there... 20:55:07 *** frosch123 has quit IRC 20:56:07 <Ammler> http://www.tt-forums.net/viewtopic.php?p=883790#p883790 <-- what roads does irwe use there? 20:56:08 <Webster> Title: Transport Tycoon Forums • View topic - Swedish Rails Set (at www.tt-forums.net) 20:56:32 <Alberth> planetmaker: ground_switch_underlay <-- if you align both uses, it gets easier to read the spec 20:56:34 <planetmaker> hm... maybe european road set? 20:57:20 <Ammler> hmm, btw, if you post screen on tt-forums, be sure to make those at max 800 20:57:26 <Ammler> else it does quite ugly resize 20:58:09 <planetmaker> is mine bigger? 20:58:10 <Brot6> NFO Meta Language - Revision 334:6715513d67a0: Codechange: Only module imports in actionA. (Alberth) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/6715513d67a0 20:58:10 <Brot6> FIRS Industry Replacement Set - Revision 912:3fc93c715451: Change: expanded Aluminium Plant (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/3fc93c715451 20:58:10 <Brot6> NFO Meta Language - Revision 335:c4c6c46031fb: Codechange: Last element of a list can be queried ... (Alberth) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/c4c6c46031fb 20:59:03 <Ammler> yes, around 812 and it hurts 20:59:16 <Ammler> it looks like a jpg now :-) 20:59:25 <planetmaker> hm 20:59:58 <planetmaker> Alberth: you mean in the graphics declaration or the switch declaration? 21:00:34 <Alberth> in the "graphics" block 21:00:45 <Yexo> planetmaker: that code works now 21:00:50 <planetmaker> :-D 21:01:28 <Yexo> Alberth pushed just before I did, so that took some extra time 21:02:11 <Yexo> switch(FEAT_RAILTYPES, PARENT <- only that doesn't work, is there a parent scope for railtypes? 21:02:14 <Brot6> NFO Meta Language - Revision 336:12ebe12221e2: Fix: allow use of global constants in varaction2 r... (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/12ebe12221e2 21:02:14 <Brot6> NFO Meta Language - Revision 337:5af1b6e3b1de: Fix: don't try to concatenate a ConstantNumeric to... (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/5af1b6e3b1de 21:02:20 <planetmaker> hm...it's SELF, right? 21:02:24 <Yexo> yes 21:02:56 <planetmaker> but actually... it still doesn't work :-( 21:03:12 <planetmaker> File "/Users/ingo/ottd/grfdev/nml/nml/actions/action2.py", line 10, in __init__ 21:03:14 <planetmaker> assert not name in action2_map 21:03:15 <planetmaker> AssertionError 21:03:50 <Alberth> assert name not in action2_map is so much nicer :) 21:04:00 <Yexo> yes 21:04:07 <Yexo> planetmaker: you can't reuse action2 names anywhere 21:04:10 <Yexo> you're reusing ground_switch_overlay 21:04:26 <planetmaker> oh. I missed the double usage. 21:04:40 <Alberth> we need a ScriptError there :) 21:05:04 <planetmaker> yes :-) 21:05:19 <planetmaker> thanks for spotting that, Yexo 21:05:20 <Yexo> already working on that 21:05:36 <planetmaker> I looked for that specifically... obviously I was blind 21:06:45 <Alberth> Yexo: should the parser also become a class? 21:07:15 <Yexo> same as with tokens.py, not needed but it would improve the quality of the code, so yes :) 21:07:59 <Brot6> NFO Meta Language - Revision 338:d1b0f9c8a337: Fix: don't assert when trying to reuse a name but ... (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/d1b0f9c8a337 21:11:28 <DJNekkid> thoose bundles made on the server cant be used on bananas :( 21:11:52 <Ammler> DJNekkid: already reported to pm 21:11:59 <Ammler> but you could use the tar in the zip 21:12:08 <planetmaker> ^ 21:13:35 <DJNekkid> "Unknown file in pack: gpl.txt" 21:14:42 <Ammler> hmm, how did you upload to bananas before? 21:14:50 <planetmaker> DJNekkid: license.txt 21:14:53 <planetmaker> not gpl.txt 21:15:06 <planetmaker> you can only upload readme.txt and license.txt and changelog.txt 21:15:10 <planetmaker> other names are not allowed 21:17:01 <Ammler> DJNekkid: I would remove gpl.txt from repo 21:17:28 <Ammler> I guess, that is another file which got back to repo due to your upper ugly fix of missing files :-P 21:18:19 <Ammler> it fight back ;-) 21:18:58 <DJNekkid> Ammler: i just upload the .grf 21:18:59 <Brot6> Swedish Rails - Revision 39:ddad18bd1bc7: Feature: Use snowy sprites above the snow line also for... (planetmaker) @ http://dev.openttdcoop.org/projects/swedishrails/repository/revisions/ddad18bd1bc7 21:19:17 <Ammler> no, gpl.txt is from pm 21:19:27 <Ammler> I guess, you never used the tar? 21:20:01 <DJNekkid> correctolini :) 21:20:09 <Ammler> I would remove gpl.txt 21:20:16 <Ammler> it is a copy of license.txt 21:20:33 <Ammler> but you might also need to fix Makefile.config 21:27:50 <Brot6> NFO Meta Language - Revision 339:1f6645cddd56: Codechange: Only import of modules in parser.py (Alberth) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/1f6645cddd56 21:33:26 *** ODM has quit IRC 21:34:05 <Brot6> NFO Meta Language - Revision 340:76700004dfb0: Codechange: remove one 'import *' from main.py (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/76700004dfb0 21:45:12 *** welshdragon has quit IRC 21:56:01 <DJNekkid> nn 21:56:41 <Brot6> NFO Meta Language - Revision 341:4e353ae33e8f: Codechange: Make the parser a class. (Alberth) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/4e353ae33e8f 21:56:59 <Yexo> Alberth: why exactly are cyclic imports to bad? 21:57:10 <Alberth> because the import fails then 21:57:11 <Yexo> from what I've read they're bad when you use "import *" but otherwise work fine 21:59:01 <Alberth> hmm, a simple test case works 22:00:18 <Yexo> http://paste.openttd.org/225959 22:00:22 <Alberth> well, I think it would be better if there is a clear sense of 'levels' in the imports. 22:00:48 <Yexo> of course, I agree we should clean up the imports, and getting rid of all "import *" is nice 22:01:02 <Yexo> but I don't think 1 or 2 cyclic imports will cause problems 22:01:06 <Yexo> as we have them now and they work fine 22:01:12 <Alberth> import * from B <-- that is not python :) 22:01:28 <Yexo> the other way around :p 22:01:31 <Yexo> from B import * 22:02:06 <Alberth> we have ast.py and actionD.py left now 22:02:48 <Yexo> I'll take care of actionD.py 22:06:29 <Alberth> http://paste.openttd.org/225960 it really does not work 22:07:05 <Yexo> if you added the code in b.py to a function it would work 22:07:28 <Yexo> whereas in my example that wouldn't make a difference (it still wouldn't work) 22:12:09 <Brot6> NFO Meta Language - Revision 342:85afcb44d7a9: Codechange: Only import of modules in actionD.py (yexo) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/85afcb44d7a9 22:21:18 <planetmaker> DJNekkid: update the title of your thread 22:24:24 <Yexo> pylint for main.py has improved to 6.42 :) 22:24:35 <planetmaker> good night 22:24:53 <Brot6> NFO Meta Language - Revision 343:f5cb118fce68: Fix (r342): Added a few action6 module prefixes to... (Alberth) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/f5cb118fce68 22:24:53 <Brot6> NFO Meta Language - Revision 344:e9ad686f02cb: Codechange: No more import * (Alberth) @ http://dev.openttdcoop.org/projects/nml/repository/revisions/e9ad686f02cb 22:28:02 <Brot6> NFO Meta Language - Feature #990 (Resolved): Remove 'import *' (Alberth) @ http://dev.openttdcoop.org/issues/990#change-2627 22:28:02 <Brot6> NFO Meta Language - Bug #991 (Resolved): Cyclic use of code from other modules (Alberth) @ http://dev.openttdcoop.org/issues/991#change-2628 22:28:35 <Alberth> hmm, last one is not entirely true 22:28:43 <Yexo> Alberth: "resolved" != "closed" 22:28:50 <Yexo> it's still displayed in the list of open issues 22:29:21 <Yexo> I did the same at first, but apparently "resolved" is for "fix added, needs testing" or something like that 22:30:15 <Alberth> my english/dutch dictionary says something else :p 22:30:21 <Alberth> but ok :) 22:30:29 <Yexo> mine too, but redmine doesn't agree 22:32:32 <Brot6> NFO Meta Language - Bug #991: Cyclic use of code from other modules (Alberth) @ http://dev.openttdcoop.org/issues/991#change-2629 22:33:22 <Alberth> let's keep #991 for a while then :) 22:33:40 <Alberth> good night 22:34:07 *** Alberth has left #openttdcoop.devzone 22:34:40 <Brot6> NFO Meta Language - Feature #990 (Closed): Remove 'import *' (Alberth) @ http://dev.openttdcoop.org/issues/990#change-2630 22:51:51 *** welshdragon has joined #openttdcoop.devzone 23:22:07 *** KenjiE20 has quit IRC 23:27:59 *** Seberoth has quit IRC