Times are UTC Toggle Colours
00:09:19 * Rubidium wonders how 'bad' it would be if I were to commit Zephyris' face sprites 00:09:51 <Rubidium> http://rbijker.net/openttd/faces.diff 00:10:11 <planetmaker> I'm barely awake... and hello :-) 00:14:31 <planetmaker> I guess I shouldn't mind. Actually I probably would mind, though ;-) 00:15:23 <Rubidium> http://rbijker.net/openttd/AfricanManagerFaces.tar <- there are the pcxes, including the 4 converted from png ones 00:15:50 <Rubidium> together with the diff above and hg adding them and hg removing trgir.pcx you should be able to commit it 00:26:07 <planetmaker> well... if you have that *everything* prepared already, there's no need for me to make that commit... 00:26:13 <planetmaker> looks fine 00:27:09 <planetmaker> Despite that I feel for irrational reasons annoyed :-( 00:29:16 <Rubidium> Feature: Add the female African faces (graphics by Zephyris and Ben_Robins_, closes #94) 00:29:24 <Rubidium> is that going to work? 00:31:39 <planetmaker> pro'ly 00:33:35 <planetmaker> I don't like force feeding the same as you. 00:33:59 <Rubidium> Warning: file_get_contents(http://mz.openttdcoop.org/bundles/opengfx/nightlies/REV): failed to open stream: Connection refused in /home/ottdc/public_html/opengfx/authors/script.php on line 27 00:34:11 <planetmaker> uh? 00:34:20 <Rubidium> on http://mz.openttdcoop.org/opengfx/authors/script.php?feature=objectives 00:36:03 <planetmaker> hm.. bundles.openttdcoop.org is acting up 00:36:05 <Rubidium> anyhow... tomorrow OGFX 0.2.0 time too? 00:36:13 <planetmaker> yup 00:36:19 <Brot6> ::DevZone:: OpenGFX - Revision 268: Feature: Add the female African faces (graphics by Zephyris and Ben_Robin... @ https://dev.openttdcoop.org/projects/opengfx/repository/revisions/268 (by Rubidium) 00:36:19 <Brot6> ::DevZone:: OpenGFX - Feature #94 (Closed): Sprites 912:989 (78) - African manager faces @ https://dev.openttdcoop.org/issues/94#change-1762 (by Rubidium) 00:38:08 <planetmaker> though it would need IMO at least another maglev commit 00:39:04 <planetmaker> the last one is missing some sprites... in the extra part, still using the old ones there, making it inconsistent. 00:40:49 <Rubidium> oh, reminds me: I think the 5th letter of the grf/nfo/pnfo filenames should be removed; it's totally useless and only links ogfx more closely to the original files than needed 00:42:00 <Ammler> I was working on salieri 00:42:02 <Ammler> sorry about 00:42:36 <Ammler> but now, image manipulating works again... 00:43:04 <Ammler> Rubidium: the letter is meant for ttdpatch users so they know how to replace the files. 00:44:40 <planetmaker> I think we had that discussion back then. FooBar and Ammler were strongly for that letter and I couldn't convince them :-P 00:45:28 * Rubidium wonders how many ttdp users are going to use it anyway 00:45:36 <Rubidium> with the massive lack of GUI sprites 00:45:52 <Ammler> well, back then we didn't talk about patch anyway. 00:46:18 <Ammler> Rubidium: there is no lack of the gui as you still use ttdpatchbase.grf 00:46:30 <Ammler> or how that is called. 00:46:33 <Rubidium> Ammler: and thus have something quite inconsistent 00:46:53 <Ammler> anyway, that wasn't the reason we kept it. 00:46:55 <Rubidium> wrong water for shiplocks etc. 00:47:33 <Rubidium> so what was the reason then? 00:47:41 <Ammler> at the start of ogfx, we had only those 00:47:52 <Ammler> planetmaker added the keywords 00:48:17 <Rubidium> so it's a hysterical raisin 00:48:30 <planetmaker> ah, right. The names are compromises... history and future combined 00:49:05 <Ammler> as said, the discussion about patch is quite young as I made that thread. 00:52:58 <Ammler> well, I don't care and foobar isn't around 00:53:10 <Ammler> so the decision is up2you guys :-P 00:53:35 <planetmaker> :-P 00:54:28 <planetmaker> hey guys, we have a FULLY WORKING OPENGFX! That's a good party reason! :-) 00:57:34 <Ammler> christmas party! 00:59:00 <Ammler> planetmaker: prepare 0.2? 00:59:09 <planetmaker> after sleeping 00:59:13 <Ammler> :-D 01:00:49 <planetmaker> and I'd like a 2nd look at some maglev wagons. That's in a kind of transient state as it's now 01:02:13 <planetmaker> or we call it 0.2.0 and deliver a 0.2.1 very soon. But... Not sure :-) Opinions? 01:03:06 <Ammler> well, I am not a big friend of that "fix" anyway ;-) 01:03:30 <Brot6> ::DevZone:: OpenGFX - Bug #77: town building misalignment @ https://dev.openttdcoop.org/issues/77#change-1763 (by Ammler) 01:03:37 <Ammler> I hoped, you don't commit it before 0.2 release 01:03:49 <Ammler> I added it to version 0.3 ;-) 01:06:05 <planetmaker> Too late for most maglev and some train wagons :-) 01:06:28 <planetmaker> anyway... past bedtime :-) 01:07:07 <Ammler> yeah, I know :-( 01:07:23 <Ammler> well, I really hope, it isn't that bad I imagine... 01:07:46 <Ammler> as I didn't saw a screen from the new waggons 01:08:03 <Ammler> and still don't have openttd installed :-) 01:08:35 <Ammler> good night planetmaker 01:09:11 <Ammler> hmm, the make tiny might need discussion, currently the fedora guy still does install manually. 01:11:12 <Ammler> if it would be a simple make and make install --INSTALLDIR="", it might help to push those guys in an other direction... 01:14:30 <Brot6> ::DevZone:: OpenGFX - Bug #579: use default behaviour for make targets @ https://dev.openttdcoop.org/issues/579#change-1764 (by Ammler) 01:18:53 <Brot6> ::DevZone:: OpenGFX - Bug #579: use default behaviour for make targets @ https://dev.openttdcoop.org/issues/579#change-1764 (by Ammler) 01:18:53 <Brot6> ::DevZone:: OpenGFX - Bug #579: use default behaviour for make targets @ https://dev.openttdcoop.org/issues/579#change-1765 (by planetmaker) 01:26:32 <Brot6> ::DevZone:: OpenGFX - Bug #579: use default behaviour for make targets @ https://dev.openttdcoop.org/issues/579#change-1766 (by Ammler) 01:51:57 <Ammler> Rubidium: shall I add the spec file from opensfx to the repo as well? 01:57:09 <Ammler> does catcodec have a "upstream url"? 02:12:23 *** KenjiE20|LT has joined #openttdcoop.devzone 02:12:51 *** KenjiE20 has quit IRC 02:13:19 <Brot6> ::DevZone:: Redmine - Revision 2990: Fixes that issue copy/move throws an error when status is not changed (#... @ https://dev.openttdcoop.org/projects/redmine/repository/revisions/2990 (by jplang) 02:22:21 <Ammler> make %{?_smp_mflags} REVISION="%{version}" <-- doesn't work anymore 02:33:50 <Brot6> Backup done! (Usage: 107M) 03:04:02 <Brot6> 2cctrainset: Backup push to ssh://hg@bitbucket.org/OpenTTD/2cctrainset/ initiated. 03:04:25 <Brot6> opengfx: Backup push to ssh://hg@bitbucket.org/OpenTTD/opengfx/ initiated. 03:06:11 <Brot6> ::DevZone:: OpenSFX - Bug #672 (New): rpm spec files @ https://dev.openttdcoop.org/issues/672 (by Ammler) 05:24:33 *** KenjiE20|LT has quit IRC 06:55:17 *** DJNekkid has quit IRC 08:05:57 *** andythenorth has joined #openttdcoop.devzone 08:07:42 *** andythenorth has quit IRC 08:15:40 *** ODM has joined #openttdcoop.devzone 08:27:55 <Rubidium> Ammler: use http://www.openttd.org/download-catcodec I'd say 09:25:47 *** andythenorth has joined #openttdcoop.devzone 09:25:49 *** andythenorth has left #openttdcoop.devzone 10:26:03 <Brot6> ::DevZone:: OpenGFX - Bug #579: use default behaviour for make targets @ https://dev.openttdcoop.org/issues/579#change-1767 (by planetmaker) 10:36:11 <Brot6> ::DevZone:: OpenGFX - Bug #579: use default behaviour for make targets @ https://dev.openttdcoop.org/issues/579#change-1769 (by planetmaker) 11:06:29 *** ODM has quit IRC 11:42:46 <Brot6> ::DevZone:: OpenSFX - Feature #672 (New): rpm spec files @ https://dev.openttdcoop.org/issues/672 (by Ammler) 11:42:46 <Brot6> ::DevZone:: OpenSFX - Feature #672: rpm spec files @ https://dev.openttdcoop.org/issues/672#change-1770 (by Ammler) 11:47:58 <Ammler> planetmaker: maybe still keep the target release-install and alias it to install 11:48:15 <planetmaker> ok, good idea. 11:51:54 <planetmaker> Ammler, wrt #672: "...the last tool to definite independence of OpenTTD" 11:52:24 <Ammler> oh well :-) 11:52:57 <Ammler> please suggest discriptions, don't use the catcodec 11:53:32 <Ammler> (you see, it is catcodec, not opensfx?) 11:53:41 <planetmaker> yes 11:54:18 <planetmaker> but then... why is it in opensfx and not as a patch for catcodec? 11:54:53 <Ammler> easier to manage for me :-) 11:55:04 <planetmaker> bugs.openttd.org is difficult? 11:55:34 <planetmaker> %description It does en- and decode sound replacement files and is the last tool to definitive independence of OpenTTD 11:55:55 <Ammler> ? 11:56:09 <Ammler> ah the missing v? 11:56:35 <Ammler> dunno, if that is a good description anyway 11:56:41 <Ammler> not very helpful, imo. 11:57:16 <planetmaker> Well... as it's not it is - independent of its usefulness incorrect English 11:57:32 <planetmaker> arg. Well... as it's now it is - independent of its usefulness - incorrect English 11:57:46 <Ammler> the last tool... doesn't really describe _what_ it does. 11:58:31 <planetmaker> Yes. Just skip the entire sentence 11:58:43 <Ammler> http://download.opensuse.org/repositories/home:/openttdcoop/ 11:59:02 <Ammler> I configured a "generic" obs account 11:59:25 <Ammler> https://build.opensuse.org/project/show?project=home%3Aopenttdcoop 11:59:35 <planetmaker> opensfx-0.2.0-1.1.noarch.rpm <-- why this funny versioning? 12:00:05 <Ammler> https://dev.openttdcoop.org/projects/admin/wiki/Osc 12:00:17 <Ammler> 0.2.0 is obvious 12:00:21 <planetmaker> yes 12:00:27 <Ammler> 1 means first revision of the spec 12:00:38 <Ammler> the second 1 is first build run 12:00:59 <Ammler> (made from the building farm) 12:01:31 <Ammler> imagine a required package will be rebuild like in that example gcc-c++ 12:01:48 <Ammler> that would trigger a new run and change it to -1.2 12:02:13 <Ammler> or I change something in the spec, that would trigger a new build and change to -2.1 12:02:25 <planetmaker> and what would -1.2 be? 12:02:41 <Ammler> unchanged spec/source but new build run 12:03:47 <Ammler> it's the Tag Release: in the spec 12:04:10 <Ammler> but as said, that would be overwritten by the build server 12:04:43 <Ammler> noarch should be obvious too 12:05:24 <planetmaker> yes 12:05:55 <Ammler> well, I also thought about committing the spec for grfcodec and nforenum to opengfx 12:06:48 <planetmaker> they do belong to their own repositories IMO 12:07:15 <Ammler> I once suggested a patch to grfcodec or renum, which got ignored, so not sure if it helps to post it there... 12:07:29 <Ammler> on the other side, those specs are in the obs repo 12:07:34 <planetmaker> concerning this build specs? 12:07:43 <Ammler> yes 12:08:13 <planetmaker> hm :S 12:08:20 <Ammler> does it hurt, if I push it here? 12:08:35 <planetmaker> what? nforenum? 12:08:44 <Ammler> if someone of the devs there thinks, it is usefull, he can take it and we remove it. 12:08:59 <Ammler> catcodec/nforenum/grfcodec 12:09:24 <Ammler> if not, we have at least a template somewhere. 12:09:56 <planetmaker> I don't mind. I'm not sure it makes sense, though 12:10:23 <Ammler> well, I would just "save" those somewhere else then on the obs. 12:10:28 <Ammler> as that needs a account. 12:13:32 <Ammler> btw. how do we party 0.2.0? 12:14:01 <planetmaker> :-) Good question. 12:14:33 <planetmaker> We need a blog post about both, OpenG/SFX 12:14:54 <planetmaker> Title: Finally Free! 12:15:16 <Rubidium> "Tool to en/decode OpenTTD's sound files" 12:15:45 <Rubidium> "Replacement sound set for OpenTTD" 12:16:01 <Rubidium> catcodec/opensfx is impplicit there, so no need to mention it 12:16:06 <planetmaker> Any other remarks concerning the makefile diff? Otherwise I'll commit it. 12:16:43 <Ammler> I would test it in the next hour 12:16:50 <planetmaker> k 12:16:55 <Ammler> but you can commit 12:17:07 <planetmaker> nah, I wait for the test then. No rush 12:17:09 <Ammler> would make it easier to test ;-) 12:17:13 <Ammler> ok :-) 12:17:27 <planetmaker> not really. You can hg up -r<X> with the diff applied 12:17:37 <planetmaker> and whether you have an M or not, doesn't matter 12:18:09 <planetmaker> (for testing purposes) 12:18:27 <planetmaker> otherwise use a test repo where you can commit locally 12:18:30 <planetmaker> that's what I did 12:20:53 <Ammler> hmm, I should also rename the package names and prefix with openttd- 12:21:56 <Ammler> openttd-devel-catcodec, openttd-devel-grfcodec, openttd-devel-nforenum, openttd-data-opengfx, openttd-data-opensfx, openttd 12:23:50 <Rubidium> openttd-data-original-stubs 12:24:31 <planetmaker> what's the latter? 12:24:49 <Rubidium> bin/data/orig*.ob[gs] bin/data/openttd[dw].grf 12:25:00 <planetmaker> isn't that part of the usual OpenTTD build? 12:25:27 <Rubidium> yes-ish, but it's the part that would cause OpenTTD to stay in contrib/non-free in Debian :) 12:27:41 <Ammler> Rubidium: what about a openttd-min and openttd-client? 12:28:55 <Ammler> I still don't know, how I should make the dedicated build 12:29:09 <Rubidium> well, technically openttd would be split into 3 packages; 1 binary package, 1 package with all the langfiles, opntitle.dat, scripts etc and 1 with *.obs, *.obs and openttd[wd].grf 12:29:17 <Ammler> maybe just openttd-dedicated 12:29:23 <Rubidium> then you can make a second binary package that is only a dedicated binary 12:31:29 <Rubidium> but those splits are generally only useful in repositories; for manual downloading/installing one package is much easier 12:31:41 <Ammler> indeed 12:31:50 <Ammler> well, that are installers for :-) 12:32:42 <Ammler> well, the issue I have is the SDL requirement for it 12:33:34 <Ammler> and because openttd is a requirement for the data files 12:34:34 <Ammler> so currently a second package openttd-dedicated wouldn't work 12:35:37 <Rubidium> depend on openttd or openttd-dedicated ? 12:35:49 <Rubidium> or can't RPM handle that? 12:36:10 <Ammler> opengfx depend on openttd 12:36:49 <Ammler> se* 12:37:36 <Rubidium> or openttd-dedicated provides openttd 12:37:45 <Rubidium> openttd-gui provides openttd 12:38:49 <Ammler> well, it needs to be easy for people to install 12:39:38 <Rubidium> then openttd-dedicated provides openttd-binary, openttd provides openttd-binary, opengfx depends on openttd-binary 12:39:53 <Rubidium> although... it would work as well as depending on openttd-data 12:40:10 <Rubidium> because both openttd-dedicated and openttd would depend on openttd-data 12:40:23 <Ammler> indeed, that might be the solution 12:41:17 <Ammler> would you implement something like that in the Makefile? 12:41:27 <Ammler> or is that part for the packager? 12:41:38 <Rubidium> that's for the packager 12:41:49 <Ammler> you could also "solve" the debian issue that way. 12:42:23 <Rubidium> yeah, I know... I already solved the debian issue a year ago, but the debian maintainer didn't have time to review it yet :( 12:42:29 <Ammler> theoretically it's also a suse issue, they are also very restrictive with such stuff 12:42:39 <Ammler> i.e. no libdvdcss 12:42:56 <Rubidium> is openttd in suse? 12:43:02 <Ammler> yes 12:43:10 <Rubidium> bad boys :) 12:43:19 <Ammler> well, of course without the original files 12:43:26 <Ammler> but with openttdw.grf 12:43:50 *** Mark has joined #openttdcoop.devzone 12:44:11 <Ammler> btw. since I know, since version 1.0 almost. 12:44:15 <Ammler> 0.1 I meant 12:46:25 <Ammler> I try to make a multipackage spec 12:46:39 <Ammler> openttd-data, openttd-dedicated and openttd 12:48:00 <Ammler> I should also test the desktop file script from your Makefile, as skidd asked me for. 12:52:25 <Rubidium> opensfx doesn't buildrequire OpenTTD 12:53:50 <Ammler> hmm 12:54:20 <Ammler> that is a "workaround" for file permission warnings 12:55:19 <Ammler> and doesn't hurt, as it is required anyway. 12:56:37 <Rubidium> then mention (in a comment) that it has to be included for file permission reasons. To prevent that someone later comes along and thinks... heh, that's not needed and removes it 12:57:58 <Ammler> well, it is from my beginning, maybe I find a "better/ more proper" solution... 12:58:15 <Ammler> if not, I add such a comment, indeed. 12:58:52 <Ammler> iirc, that was suggested from the suse pros packagers. 13:00:51 <Ammler> Rubidium: if you are interested, I could give you access to the obs user on our server 13:01:05 <Ammler> so you can run the local build server 13:02:34 <Ammler> well, theoretically, the obs build server is also available for debian/ubuntu 13:21:05 *** KenjiE20 has joined #openttdcoop.devzone 14:13:36 <planetmaker> http://paste.openttd.org/220119 <-- should I add that script which helps me generating the changelog to the repo? 14:13:59 <planetmaker> It's by no means a script which does it automatically, I still have to edit each line and judge whether it gets deleted. But... 14:14:59 <Ammler> didn't you already? 14:15:13 <Ammler> or do I have the template project in mind? 14:15:38 <Ammler> maybe in extra? 14:16:38 <planetmaker> I think it's not part of the repo. I spoke of OpenGFX - but it could be added to each. But then... it would also fit a general grfdev scripts repo 14:16:49 <planetmaker> it's not really needed, you know :-) 14:17:02 <planetmaker> it's just convenient for me - every few months 14:40:15 *** mib_1r0a4i has joined #openttdcoop.devzone 14:40:23 *** mib_1r0a4i has left #openttdcoop.devzone 15:13:42 <planetmaker> http://www.openttdcoop.org/files/pm/patches/changes_020.diff and especially http://www.openttdcoop.org/files/pm/patches/update_readme.diff <-- comments? 15:20:15 <Rubidium> with the other version, except 0.1.1 you didn't add newlines between different kinds of backport 15:20:36 <Rubidium> read: it's inconsitent 15:20:58 <Rubidium> African faces -> African manager faces? 15:21:22 <Rubidium> CC <- what's that (oh yes I'm stupid) 15:21:42 <Rubidium> Doc: Document looks double 15:21:54 <Rubidium> Ammler: don't need access 15:22:51 <Rubidium> in the readme: the first TTD -> Transport Tycoon Deluxe (TTD)? 15:25:41 <Ammler> planetmaker: did you check the credits list? 15:27:08 <Ammler> the missing real names is quite ugly. 15:29:02 <Rubidium> but we all know that planetmaker doesn't have a real name! 15:29:39 <Ammler> hmm, maybe Jesus Christ 15:29:44 <Rubidium> also you might consider word-wrapping readme.txt 15:29:58 *** ODM has joined #openttdcoop.devzone 15:30:47 <Ammler> yes, I would include manual newlines, too. 15:31:35 <Ammler> around 70 chars per line? 15:32:37 <Rubidium> 72 :) 15:32:37 <Ammler> maybe we could change the credits list to Realname (nickname) 15:33:01 <Ammler> and those without to Anonymous (nickname) 15:33:36 <Ammler> then sort with realnames alphabetically :-) 15:34:02 <Ammler> might "force" some people to give us their names. 15:35:09 <Ammler> Anyway, is it legal to contribute to GPL without real name? 15:36:09 <Rubidium> I see no reason why it is not 15:36:50 <Ammler> nevermind, no discussion for 0.2.0 :-) 15:37:59 *** DJNekkid has joined #openttdcoop.devzone 15:40:22 <Ammler> planetmaker: http://www.youtube.com/watch?v=gLMokwHG0sA 15:40:24 <Webster> Title: YouTube - Wer hats erfunden? (at www.youtube.com) 15:40:42 <DJNekkid> hi guy(s) 15:41:04 <Ammler> hey DJ(s) 15:41:45 <DJNekkid> lol 15:41:49 <DJNekkid> i got a gig tonight :) 15:47:18 <planetmaker> Thanks for feedback. Sorting by nicknames is fine IMO ;-) 15:47:37 <DJNekkid> hey planetmaker ... i got a small task for you :) 15:47:51 * planetmaker hides 15:47:57 <DJNekkid> should probably take you less then 10 mins 15:48:28 <DJNekkid> look at paxwag.tnfo :) 15:51:01 <planetmaker> what's preferrable: different commit types (Feature, Fix, Doc) separated by a blank line or just one row, one after another? 15:51:27 <DJNekkid> im not sure i follow you 15:52:33 <planetmaker> http://www.openttdcoop.org/files/pm/patches/changes_020.diff <-- you missed that 15:53:43 <planetmaker> and I wonder: is there a way to have the "source" text file as long lines and the resulting txt file with lines wrapped? 15:54:05 <planetmaker> It makes editing somewhat easier, if the line wraps don't have to be adopted. 15:54:41 <planetmaker> but what's with that template, DJNekkid ? 15:56:23 <planetmaker> 2 minutes are already over :-P 16:11:29 <planetmaker> I guess I cannot solve anything I don't know about... 16:14:20 <DJNekkid> were afk :) 16:14:21 <DJNekkid> hehe 16:14:26 <DJNekkid> point was ... 16:14:37 <DJNekkid> as you can see, there are literaly two templates there 16:14:59 <DJNekkid> my intentions were that "THIS_WAG_TYPE" could be "NORMAL" or "DD" 16:15:34 <DJNekkid> but the normal wagons were getting the DD as well 16:15:51 <planetmaker> line numbers? 16:16:27 <DJNekkid> 133 16:16:42 <DJNekkid> if i at line number 164 did: 16:16:49 <DJNekkid> #if THIS_WAG_TYPE == DD 16:16:56 <DJNekkid> the "NORMAL" ones still used it 16:18:10 <DJNekkid> currently it is kinda hacked 16:18:21 <DJNekkid> as you can see... 16:18:49 <planetmaker> did you try brackets and / or quotation marks like #if (THIS_WAG_TYPE == "DD") 16:18:56 <DJNekkid> no 16:19:01 <DJNekkid> but however 16:19:22 <planetmaker> NORMAL and DD are strings, not variables, so they will probably need quotation marks 16:19:30 <planetmaker> or? 16:19:42 <DJNekkid> if i in the "definition files" (i.e. ic1gen.pnfo or similars) dont put this: 16:19:53 <DJNekkid> #define THIS_WAG_TYPE NORMAL 16:19:59 <DJNekkid> it skips the first part 16:20:06 <DJNekkid> line 133 until #endif 16:20:30 <planetmaker> he :-) 16:20:50 <planetmaker> sounds like just this kind of string problem 16:21:05 <planetmaker> though I'd probably rather solve it by 16:21:58 <planetmaker> #include "THIS_WAG_TYPE.pnfo"... hm... probably not that easy, though 16:22:04 <planetmaker> quotation marks suck 16:22:37 <planetmaker> you should definitely try with quotation marks and brackets as I wrote above. 16:23:54 <DJNekkid> but why does it work with NORMAL and not DD ? 16:25:51 <Rubidium> I'm sceptic about where #if works with strings 16:26:35 <DJNekkid> brackets and "'s dont work: 16:26:56 <DJNekkid> token ""normal"" is not valid in preprocessor expressions 16:27:34 <planetmaker> Reading gcc's docs, I get the feeling that such simple comparison might not work that way 16:28:06 <DJNekkid> so i should rather "define" normal as 01 and doubledecker as 02 ? 16:28:09 <DJNekkid> i.e. 16:28:37 <planetmaker> at least easier, yes 16:30:10 <planetmaker> there's probably a solution along the lines you tried, but I don't know how. I'd have to study the gcc docs, too 16:32:11 <planetmaker> http://gcc.gnu.org/onlinedocs/cpp/If.html#If if you like ;-) 16:32:12 <Webster> Title: If - The C Preprocessor (at gcc.gnu.org) 16:33:00 *** LordAzamath has joined #openttdcoop.devzone 16:35:08 <DJNekkid> already looked at that 16:35:18 <planetmaker> the solution I'd prefer is to conditionally include one or another file. But as said, it might be not too easy / or not looking too nice, if only using the gcc pre-processor. 16:35:45 <DJNekkid> i were thinking of makeing a subdir in the templates folder 16:35:50 <DJNekkid> wagons 16:35:53 <DJNekkid> pax 16:35:57 <DJNekkid> then two different ones 16:36:07 <DJNekkid> then something along: 16:36:19 <DJNekkid> #if THIS_WAG_TYPE == NORMAL 16:36:31 <LordAzamath> planetmaker congratz on the sprites completion ;) 16:36:33 <planetmaker> having a sub dir for each template is IMO not yet worth it. If the files are properly named, maybe each starting with wagon_XXX.tnfo 16:36:34 <DJNekkid> #include wagons/pax/normal.tnfo 16:37:00 <DJNekkid> #endif 16:37:21 <planetmaker> you'll need quotation marks ;-) 16:37:39 <planetmaker> #include "path/to/file" 16:38:43 <DJNekkid> well, sure 16:38:53 <DJNekkid> but you see the point... 16:40:04 <planetmaker> yes, of course 16:40:41 <DJNekkid> and im also thinking along the lines of: 16:41:10 <DJNekkid> doing the same ish thing for M's 16:41:11 <DJNekkid> MU's 16:41:31 <DJNekkid> where all MU's have "nustyle" files 16:41:42 <DJNekkid> but have variational action2's 16:41:51 <DJNekkid> where all "normal" ones have one file 16:42:00 <DJNekkid> and all variations have its own file 16:42:03 <DJNekkid> called in the same mannor 16:42:23 <DJNekkid> even if it is one single variation 16:42:55 <DJNekkid> for example, the LRC and the IC125 share same var2 pattern 16:43:16 <DJNekkid> the BM73, the RAE_TEE_II (ish), ET420, etc also 16:45:07 <planetmaker> hm, yes :-) 16:45:31 <planetmaker> ok, I'm off for a bit, need to do some shopping 16:45:41 <DJNekkid> happy presant'ing :) 16:46:06 <Ammler> Rubidium: why is there no source packages: http://binaries.openttd.org/extra/nforenum/r2274/ ? 16:47:02 <planetmaker> Ammler, http://svn.ttdpatch.net/trac/browser/misc 16:47:38 <Ammler> planetmaker: ? 16:48:06 <Ammler> shall I make it self? 16:48:25 <Ammler> http://binaries.openttd.org/extra/nforenum/r2251/ had it 16:55:55 <Rubidium> hmm, guess the CF failed there too 16:58:24 <Rubidium> lets see if rerunning the CF works 17:10:30 <Rubidium> there they are 17:18:02 <Brot6> 2cctrainset: update from r393 to r399, starting nightly compile 17:18:44 <Brot6> 2cctrainset: compile done (3 errors) - http://bundles.openttdcoop.org/2cctrainset/nightlies/ 17:18:45 <Brot6> bros: nightly compile not needed. (r10) 17:18:45 <Brot6> comic_houses: nightly compile not needed. (r65) 17:18:46 <Brot6> firs: nightly compile not needed. (r366) 17:18:47 <Brot6> fish: nightly compile not needed. (r220) 17:18:47 <Brot6> heqs: nightly compile not needed. (r172) 17:18:47 <Brot6> nmts: nightly compile not needed. (r15) 17:18:49 <Brot6> opengfx: update from r267 to r268, starting nightly compile 17:20:13 <Brot6> opengfx: compile done (1 errors) - http://bundles.openttdcoop.org/opengfx/nightlies/ 17:20:13 <Brot6> opensfx: nightly compile not needed. (r61) 17:20:13 <Brot6> worldairlineset: nightly compile not needed. (r584) 17:24:56 *** LordAzamath has quit IRC 17:31:27 <Ammler> thanks Rubidium 17:41:14 <planetmaker> Ammler: is there a way to update renum on our CF? 17:42:39 *** welshdragon has joined #openttdcoop.devzone 17:53:07 <Ammler> localhost:~/repos/home:openttdcoop/openttd-data-opengfx/opengfx> make release_source 17:53:08 <Ammler> mkdir: missing operand 17:53:12 <Ammler> planetmaker: yes :-) 17:53:21 <Ammler> I just updated the packages 17:54:45 <planetmaker> hm... release_source fails, yes? 17:54:59 <Ammler> seems so or I run it wrongly? 17:55:10 <planetmaker> probably not. I'll check 17:55:22 <planetmaker> I was just about to commit it. Luckily I didn't yet push :-P 17:55:37 <planetmaker> and I didn't commit locally anything further either.... 17:55:41 <Ammler> I am at testing your patch :-) 17:55:42 <planetmaker> so rollback works :-P 17:56:07 <Ammler> hmm, maybe also rename the target to "source" only 17:56:07 <planetmaker> and I appreciate that :-) I just thought you might have done it already. 17:56:24 <planetmaker> both then. source and release-source. For legacy reasons. 17:56:30 <Ammler> then you would have got feedback. 17:56:58 <planetmaker> :-) 17:57:23 <Ammler> theoretically, we don't need to support downwards compatibitly for beta releases ;-) 17:59:02 <planetmaker> true. 17:59:17 <planetmaker> but then I need to remove (and probably should!) release-install, too 17:59:35 <planetmaker> though... better maybe rename this to "bundle_src" ? 17:59:58 <Ammler> dunno :-) 18:00:04 <planetmaker> sounds nice to me :-) 18:00:21 <Ammler> hmm, release-install was just target which might already be in use 18:00:24 <planetmaker> btw, you're right, make release must fail 18:00:28 <Ammler> source isn't 18:00:53 <Ammler> he instead of alias the targets 18:01:24 <Ammler> generate a msg. "target is obsolete, use soundso instead" 18:01:27 <planetmaker> no one except us uses release-install so far, or? 18:02:03 <Ammler> planetmaker: afaik, official fedora and suse still installs manually 18:02:31 <Ammler> as they have the php scripts in the docs :-) 18:07:17 <Ammler> planetmaker: ping me, if you are done... 18:07:35 <planetmaker> let me give you a new patch 18:07:41 <planetmaker> or updated rather :-) 18:08:51 <planetmaker> same address as before, updated 18:10:07 <planetmaker> http://www.openttdcoop.org/files/pm/patches/unify_make.diff 18:20:44 <Brot6> is2: new trunk patch: http://bundles.openttdcoop.org/is2/trunk-patches/ 18:35:43 *** LordAzamath has joined #openttdcoop.devzone 18:37:03 <Hirundo> How are these trunk patches currently generated? 18:42:02 <Ammler> Hirundo: https://dev.openttdcoop.org/projects/home/repository/entry/openttd/mkpatch.sh 18:42:31 <Ammler> planetmaker: why does target bundle_src need to generate grfs? 18:47:16 <Hirundo> FYI- I have done some testing, and I think hg will work 18:51:09 <planetmaker> Ammler: good question :-) 18:51:42 <planetmaker> actually... it doesn't need to. But it does. As does 'test' - for a reason I haven't yet figured. 18:52:02 <planetmaker> it's probably the dependency check... recursive make is not w/o problems, I guess 18:52:11 <planetmaker> or rather pitfalls. It's not a real problem 18:54:36 <Ammler> http://obs.openttdcoop.org/ <-- looks fine 18:55:09 <planetmaker> renum needs updating. it complains :-) 18:55:18 <planetmaker> (the one on the CF) 18:55:23 <Ammler> yep 18:55:36 <Ammler> but I guess, I don't 18:55:55 <Ammler> I rather move the compile farm to salieri where the new renum is already installed :-) 19:00:18 <planetmaker> :-) true 19:04:35 <Ammler> hmm, could you make the same with opensfx? 19:04:59 <Ammler> might be already too late as that release is already done, but.... 19:05:25 <planetmaker> yes, it can be done 19:06:15 <planetmaker> make a ticket :-) 19:09:05 <Brot6> ::DevZone:: OpenGFX - Revision 269: Change: Determine automatically whether we build a release or a nightly a... @ https://dev.openttdcoop.org/projects/opengfx/repository/revisions/269 (by planetmaker) 19:09:06 <Brot6> ::DevZone:: OpenGFX - Revision 270: Change: Let the readme reflect the project status and update a few links @ https://dev.openttdcoop.org/projects/opengfx/repository/revisions/270 (by planetmaker) 19:11:30 <Ammler> ticket done ;-) 19:11:52 <Ammler> #675 19:12:54 <Brot6> ::DevZone:: Infrastructure Sharing - Revision 14293: [IS] Fix: _local_company != _current_company. @ https://dev.openttdcoop.org/projects/is2/repository/revisions/14293 (by Hirundo) 19:14:09 <planetmaker> true. thx 19:15:41 <Brot6> ::DevZone:: OpenSFX - Feature #675 (Closed): use default behaviour for make targets @ https://dev.openttdcoop.org/issues/675#change-1779 (by planetmaker) 19:16:22 <Ammler> he, you closed the sfx ticket :-P 19:33:18 <DJNekkid> any bets on that "Generic Train Set" ? 19:33:54 <planetmaker> meh 19:34:02 <planetmaker> wrong ticket closed :-P 19:34:11 <DJNekkid> my bet is, it will NEVER be finished 19:34:20 <planetmaker> DJNekkid: my best bet is in 2 years earliest started 19:35:24 <DJNekkid> tbh, i doubt it ever will be dont anything with. As someone pointed out on one of the first pages, the 2cc set is pretty much as generic as there can be 19:36:10 *** andythenorth has joined #openttdcoop.devzone 19:36:23 <planetmaker> one of the biggest obstacles is nekomaster :-P 19:36:38 <DJNekkid> you mean, THE obstacle :) 19:37:58 <DJNekkid> he wants so much... 19:38:00 <DJNekkid> SO much! 19:38:07 <DJNekkid> but only gets there 20% 19:38:51 <Brot6> ::DevZone:: OpenSFX - Feature #675 (New): use default behaviour for make targets @ https://dev.openttdcoop.org/issues/675#change-1780 (by planetmaker) 19:39:25 *** andythenorth has quit IRC 19:41:38 <planetmaker> yeah. at most 19:41:53 <DJNekkid> even that ... 19:41:57 <DJNekkid> what was it again 19:42:41 <DJNekkid> queens rail narrow guage tilt train 19:42:43 <DJNekkid> or something 19:43:19 <DJNekkid> didnt look _too bad_ 19:43:23 <DJNekkid> i even coded it for him 19:43:28 <DJNekkid> with LOTS and LOTS of comments 19:46:31 <planetmaker> he's not willing to learn or take advice 19:58:11 *** Mark has quit IRC 20:08:37 <planetmaker> hm... toyland wagons fixed now. 20:08:46 <Brot6> ::DevZone:: OpenGFX - Revision 271: Fix (r258): There's only one wagon type for toyland. Use the normal ones ... @ https://dev.openttdcoop.org/projects/opengfx/repository/revisions/271 (by planetmaker) 20:20:10 <Rubidium> hmm, why is issue 675 > 2 months old when 672 isn't even a day old? 20:21:52 <Ammler> because I just made a copy of the ogfx ticket ;-) 20:24:15 <Rubidium> then redmine should say so... :( 20:24:40 <Rubidium> people will go nuts if they see bugreports appear that are 'months' old 20:28:37 <Ammler> ah well, I guess, nobody can make copies usually :-) 20:29:45 <Rubidium> I've got a copy button to click on 20:30:20 <Ammler> I guess, it's a manager feature 20:43:44 <SmatZ> I see it too, as "Developer" 20:46:20 *** LordAzamath has quit IRC 20:55:24 *** KenjiE20 has quit IRC 20:56:36 <Brot6> ::DevZone:: OpenGFX - Revision 272: Feature: More climate specific monorail and maglev wagons (Graphics by mo... @ https://dev.openttdcoop.org/projects/opengfx/repository/revisions/272 (by planetmaker) 21:00:47 <planetmaker> Ammler: care to look over the current state of OpenGFX? 21:01:09 <planetmaker> It's ready for tagging, I think, if there's no big blunder left 21:05:51 <planetmaker> well... 21:09:57 *** andythenorth has joined #openttdcoop.devzone 21:10:01 *** KenjiE20 has joined #openttdcoop.devzone 21:17:59 *** andythenorth has quit IRC 21:21:51 <planetmaker> ... I guess ... 21:22:24 *** andythenorth has joined #openttdcoop.devzone 21:25:11 <Ammler> yes, it should 21:25:28 <Ammler> I still have no idea, how to split openttd 21:26:55 <planetmaker> he... 21:27:32 <Ammler> the issue is that openttd-gui and server uses the same binary name 21:30:14 <planetmaker> ah... 21:30:28 *** andythenorth has quit IRC 21:33:03 *** andythenorth has joined #openttdcoop.devzone 21:45:18 <planetmaker> Released. Pushed. Uploading :-D 21:47:13 <Brot6> ::DevZone:: OpenGFX - Revision 273: Update changelog and prepare for the long awaited release of a complete b... @ https://dev.openttdcoop.org/projects/opengfx/repository/revisions/273 (by planetmaker) 21:47:13 <Brot6> ::DevZone:: OpenGFX - Revision 274: Added tag 0.2.0 for changeset cff739bbb521 @ https://dev.openttdcoop.org/projects/opengfx/repository/revisions/274 (by planetmaker) 21:47:45 *** andythenorth has quit IRC 21:48:40 *** andythenorth has joined #openttdcoop.devzone 21:51:04 <Ammler> oh, tagged :-) 21:51:38 <planetmaker> yep :-) I'm just looking how to convince the CF to build the releases 21:52:36 <planetmaker> can you remind me? 22:04:40 *** andythenorth has quit IRC 22:07:12 <planetmaker> Ammler: ^ 22:07:27 *** andythenorth has joined #openttdcoop.devzone 22:09:09 <Ammler> planetmaker: build it on salieri or at home 22:09:20 <planetmaker> ok 22:09:29 <Ammler> as the CF doesn't have newest renum or doesn't that matter? 22:09:42 <planetmaker> not 100% sure 22:10:47 <Ammler> /home/obs/repos/home:openttdcoop/openttd-data-opengfx/opengfx <-- the checkout I tested with 22:11:37 <planetmaker> salieri? 22:11:42 <planetmaker> what does "obs" stand for? 22:12:07 <Rubidium> openttd base sound/samples ofcourse! 22:12:18 <planetmaker> :-P 22:13:12 <Ammler> opensuse building server or service? 22:13:38 <DJNekkid> ttyl ... got a gig in 45... 22:13:40 *** DJNekkid has quit IRC 22:14:09 <Ammler> I have already made the src bundle 22:14:22 <Ammler> I could make the others too and move those to the bundles dir 22:15:23 <planetmaker> jo... zip: permission denied ;-) 22:19:35 <Ammler> p7zip installed 22:26:32 <Ammler> http://bundles.openttdcoop.org/opengfx/releases/ <-- ok? 22:30:53 <Ammler> [Checking] sprites/ogfxh_tropical.nfo 22:30:54 <Ammler> <stdin>:404:59: warning: no newline at end of file 22:31:59 <Ammler> planetmaker: did you change something on Makefile so it doesn't build anymore without renum? 22:32:19 <planetmaker> Dunno... maybe? 22:32:40 <planetmaker> Link sounds about ok 22:33:22 <Ammler> http://pastebin.ca/1710222 22:34:16 <planetmaker> obviously the answer is 'yes' 22:34:42 <planetmaker> and... makes sense 22:35:03 <planetmaker> and I think I made somewhere a mistake... 22:35:19 <planetmaker> It calls itself -nightly-272M :-( 22:35:40 <planetmaker> bugger that. 22:37:11 <Ammler> the one I posted? 22:37:29 *** ODM has quit IRC 22:38:28 <Ammler> http://pastebin.ca/1710227 22:38:35 <planetmaker> the one uploaded 22:38:41 <planetmaker> I guess 22:40:30 <planetmaker> yes 22:40:45 <planetmaker> I guess I don't care 22:41:37 <planetmaker> nice, Ammler :-) 22:46:25 <Ammler> http://pastebin.ca/1710240 <-- complete :-) 22:46:44 <Ammler> it needs around 20 mins from building until it is mirrored 22:47:03 <Ammler> http://download.opensuse.org/repositories/home:/openttdcoop/openSUSE_11.2/ 22:47:22 <Ammler> http://download.opensuse.org/repositories/home:/openttdcoop/ <-- available distros 22:49:22 <planetmaker> well... so I released opengfx-nightly-r272M... grrr 22:50:29 <Ammler> maglev looks a bit missalined 22:50:57 <Ammler> hmm 22:52:14 <Ammler> http://imagebin.ca/view/8bW9oywG.html 22:52:15 <Webster> Title: plasma-desktopEw2419.jpg (at imagebin.ca) 22:56:12 <planetmaker> it does. oh well 22:59:58 <Ammler> and the tunnel glitch is still there 23:00:28 <planetmaker> Not all wagons are short. Also not the engines. 23:00:34 <planetmaker> But... maglev should be. 23:00:48 <planetmaker> if they still glitch.. dunno why. 23:01:33 <Ammler> the train on the screen 23:02:08 <planetmaker> for another time to worry, I think. Time for bed :-) 23:02:39 <Ammler> shall I remove the release? 23:03:20 <planetmaker> from bananas? There's no way back 23:03:33 <Ammler> no, from bundles 23:03:43 <planetmaker> Note to self: upload to bananas last 23:04:05 <Ammler> well, you could reupload 0.1.1 23:04:05 <planetmaker> Not sensible to remove it. It's out in the world 23:04:09 <Brot6> is2: Backup push to ssh://hg@bitbucket.org/OpenTTD/infrastructure-sharing/ initiated. 23:04:20 <Brot6> opengfx: Backup push to ssh://hg@bitbucket.org/OpenTTD/opengfx/ initiated. 23:04:24 <planetmaker> And why would I upload 0.1.1? 23:04:58 <planetmaker> (which I would need to give a higher number then anyway) 23:05:23 <planetmaker> nah. I leave the mess for tonight and there might be a better 0.2.1 then soon 23:05:58 <planetmaker> Or not. Seems like I'm even unable to release something properly 23:06:38 <Ammler> :-) 23:07:08 <Ammler> anyway, you did a awesome job lately. 23:08:13 <Brot6> ::DevZone:: OpenGFX - Bug #676 (New): Action colours in female African manager faces @ https://dev.openttdcoop.org/issues/676 (by zephyris) 23:13:52 <Rubidium> yeah... just round up the first list of bugs, fix them and release something new :) 23:14:39 * Ammler votes still vor reverting the waggon size change :-) 23:15:27 <Brot6> ::DevZone:: #openttdcoop - Wiki edit: Welcome (#30) @ https://dev.openttdcoop.org/projects/16/wiki/Welcome?version=30 (by planetmaker) 23:15:28 <Brot6> ::DevZone:: #openttdcoop - Wiki edit: Making_a_release (#3) @ https://dev.openttdcoop.org/projects/16/wiki/Making_a_release?version=3 (by planetmaker) 23:16:39 *** PeterT has joined #openttdcoop.devzone 23:17:48 <Ammler> http://imagebin.ca/view/tVLLuy.html 23:17:49 <Webster> Title: plasma-desktopdt2419.jpg (at imagebin.ca) 23:21:35 <Brot6> ::DevZone:: #openttdcoop - Wiki edit: Making_a_release (#4) @ https://dev.openttdcoop.org/projects/16/wiki/Making_a_release?version=4 (by planetmaker) 23:28:39 <Brot6> ::DevZone:: OpenGFX - Bug #676: Action colours in female African manager faces @ https://dev.openttdcoop.org/issues/676#change-1782 (by athanasios) 23:31:23 *** andythenorth has quit IRC 23:31:44 <Ammler> good night from my side too, I let the release stay