Times are UTC Toggle Colours
01:33:22 <Brot6> Backup done! (Usage: 43M) 01:33:23 <Brot6> ... or were you driving the PONTIAC that HONKED at me in MIAMI last Tuesday? 02:04:02 <Brot6> 2cctrainset: Backup push to ssh://hg@bitbucket.org/OpenTTD/2cctrainset/ initiated. 04:48:57 *** DJNekkid has quit IRC 06:20:53 *** DJNekkid has joined #openttdcoop.devzone 06:21:23 <DJNekkid> planetmaker: do you want/need the website password as well? 06:44:45 <DJNekkid> and a question for you guys: 06:44:58 <DJNekkid> if i make a subdir in the (lets say) 10w-eu subfolder 06:45:40 <DJNekkid> and i put .nfo's in that, will that be included in the merge? 07:12:46 <planetmaker> moin DJNekkid 07:13:04 <DJNekkid> morning :) 07:13:17 <planetmaker> if you create a new subdir, you have to use hg add path/to/subdir/newfile 07:13:25 <planetmaker> and then it will be part of the repository 07:13:36 <planetmaker> but the makefile currently doesn't use it. 07:13:56 <DJNekkid> yes, hg add i know 07:13:56 <planetmaker> BUT: in Makefile.config is a variable where you can enter that dir to the build structure 07:14:11 <DJNekkid> but i were mainly thinking of the makefile :) 07:14:39 <planetmaker> SUB_DIRS = 2africa 3asia 4e-eu 5n-am 6s-am 7ocean 8scandinavia 9s-eu 10w-eu 07:15:22 <planetmaker> on the other hand: I wouldn't branch the directory structure more than it is now. Or for what purpose do you need further subdirectories? 07:15:28 <Brot6> ::DevZone:: DJNekkid: 2cc train set - Version 2.0: New features ... ??? @ http://dev.openttdcoop.org/boards/13/topics/468 07:15:28 <Brot6> ::DevZone:: Hi guys. As we are "up to" version 1.0.1 and hopefully bugfree now, i would say we should discuss what to do in 2.0 or sooner... As for the 1.1 I'd like to introduce thoose DMUs i got from alex (EXO... 07:15:40 <DJNekkid> cause im wondering if we should redo the struckture for the next (main) version... 07:15:49 <planetmaker> basically you can add any new directory which has NFO files to that variable in Makefile.config and you're set. 07:16:01 <DJNekkid> steam, electric, dmu, emu, railbus 07:16:07 <planetmaker> DJNekkid, well... I wonder that, too :) 07:16:16 <planetmaker> for each region? 07:16:23 <DJNekkid> no 07:16:24 <DJNekkid> total 07:16:27 <planetmaker> I would rather have those four, and then be set. Yes. 07:16:36 <DJNekkid> and then one .nfo for each engine/train 07:16:47 <planetmaker> Then it would just need changing the variable in Makefile.config 07:17:04 <planetmaker> the one I just mentioned 07:17:33 <DJNekkid> aye 07:18:01 <Ammler> soso Leute. 07:18:20 <DJNekkid> bud i did set up a forum for the 2cc set, and wrote some thougts about the next releaes... 07:19:01 <planetmaker> forum? 07:19:11 <DJNekkid> http://dev.openttdcoop.org/boards/13/topics/468 07:19:21 <planetmaker> oh. we can have forums there, too :D 07:19:28 <DJNekkid> :) 07:19:39 <DJNekkid> more private there then on tt-forums 07:19:53 <Brot6> ::DevZone:: DJNekkid: 2cc train set - Version 1.1 / 2.0: New features ... ??? @ http://dev.openttdcoop.org/boards/13/topics/468 07:19:53 <Brot6> ::DevZone:: Hi guys. As we are "up to" version 1.0.1 and hopefully bugfree now, i would say we should discuss what to do in 2.0 or sooner... As for the 1.1 I'd like to introduce thoose DMUs i got from alex (EXO... 07:23:00 <Ammler> let us just complete version 1.0.1 07:23:12 <Ammler> (with the credits for translator ;-) 07:23:21 <planetmaker> it's already released, Ammler... 07:28:49 <Ammler> http://users.tt-forums.net/2cc/ <-- I meant specially here and in tt-forums post 07:28:50 <Webster> Title: The 2cc Set - The Trains of the World in 2cc (or 3 if you count grey) (at users.tt-forums.net) 07:29:31 <planetmaker> yes. DJNekkid maybe you can modify your announcment post by pasting the current changelog.txt there instead of the current list. 07:29:40 <planetmaker> I added the Danish translator's name there, too 07:30:04 <planetmaker> I'd feel bad, to leave out them two :) 07:32:42 <Ammler> and planetmaker, there is no problem to delete a tag and make a new one. 07:33:03 <planetmaker> Ammler, yes, I know. But not after you officially made an announcement with that md5sum. 07:33:11 <planetmaker> well... 07:33:21 <planetmaker> if it doesn't :P - you're right 07:33:28 <Ammler> I meant about yesterday 07:33:43 <Ammler> you added the changelog after release :-) 07:35:07 <planetmaker> yes. DJNekkid was too fast. 07:35:28 <planetmaker> As he said he makes release, I thought he would go through the release process step by step :) 07:35:35 <planetmaker> and make sure the files are up2date. 07:35:55 <planetmaker> or at least shout around that I should get my arse around to update what's missing. ;) 07:36:55 <planetmaker> it's the responsibility of the person doing the tag to check for those things. 07:38:32 <Ammler> adding the changelog to the release woudn't change the md5sum either. 07:38:39 <planetmaker> yes :) 07:39:04 <planetmaker> you're our man for history revision ;) :P 07:39:28 <planetmaker> Swiss people should do that as they're neutral in that by definition ;) 07:39:41 <Brot6> ::DevZone:: planetmaker: 2cc train set - Version 1.1 / 2.0: RE: New features ... ??? @ http://dev.openttdcoop.org/boards/13/topics/468#message-469 07:39:41 <Brot6> ::DevZone:: Basically I agree with above thoughts. Just a few further thoughs, in the same run there should be some modifications to the build system / nfo structure: - language files should become easier on the ... 07:39:47 <planetmaker> no one would believe they do that for their own benefit :P 07:40:31 <Ammler> everything what brings the world forward is for own benefit :P 07:40:52 <planetmaker> hehe :) 07:41:02 <planetmaker> fair enough :) 07:44:46 <DJNekkid> planetmaker: it _almost_ seems like you want to code in preprocessor :) 07:44:59 <DJNekkid> :p 07:45:56 <planetmaker> DJNekkid, for the ID replacement it could make sense as it could make for a more structured NFO file. 07:46:04 <planetmaker> And Ammler wants that, I don't really mind. 07:46:20 <planetmaker> but I guess it looks cleaner then wrt the makefile 07:46:47 <planetmaker> and it *might* be less work. Not sure yet. 07:46:51 <planetmaker> at least not more. 07:47:42 <DJNekkid> but ID replacement i like... 07:47:42 <DJNekkid> !! 07:48:08 <DJNekkid> and a word for word basis on translations, or similar 07:49:34 <planetmaker> string by string. yes :) 07:49:49 <planetmaker> just give people a file of English strings, line by line and let them fill in the translations. 08:06:17 <DJNekkid> isnt word basis better? 08:06:43 <DJNekkid> $capacity: 45 $passengers / 30 $mail 09:07:29 <planetmaker> DJNekkid, strings are ... more diverse. Like cases etc. Or sentences like "MUs cannot be attached to <whatever>" cannot be translated wordwise. 09:08:08 <planetmaker> Always sentences when it comes to translations. In some cases it may be words. One of those might be what you described. We should think of it :) 09:08:39 <Ammler> does it hurt to use both? 09:09:13 <Ammler> you could make exceptions for those strings not fitting there, maybe it wuold be possible to preprocess the language file 09:11:30 <Ammler> hmm, maybe useless :-) 09:12:17 <DJNekkid> oki ... suggestion: typical sentences are translated as a whole, while "$capacity: 45 $passengers / 30 $mail" is more on a word basis... 09:12:40 <DJNekkid> as that only requre us (me) to add that to the language file(s) 09:13:21 <DJNekkid> and, is it possible to only have _one_ file, and the others are autogenerated from the first one? 09:13:49 <DJNekkid> where the 7F or FF is changed to xx or xx+80 respectivly? 09:14:12 <Ammler> something like that is already supported by the current version. 09:14:27 <Ammler> scripts/lang.copy.sh 09:19:02 <planetmaker> <Ammler> does it hurt to use both? <-- of course not. And I think we will need to. 09:19:57 <planetmaker> Ammler, yes, but in principle all that should be out of the files where the strings are in. All that could be done by a script. 09:20:09 <planetmaker> or rather the makefile 09:20:26 <planetmaker> (which is some form of script and includes a possible pre-processor) 10:06:51 *** DJNekkid has quit IRC 10:39:01 <Ammler> planetmaker: your wagon cargo thing, how to setup new cargos, like tourists? 10:51:03 <planetmaker> Ammler, all cargos are in it. 10:51:10 <planetmaker> All currently defined one from the wiki 10:51:37 <planetmaker> you just have to add 1 or 0 to the cargo classes properties and the 1D properties of the translation table 11:00:45 <Ammler> btw. documents is for such things better, imo, then you could also comment it 11:01:02 <planetmaker> hm, yes 11:01:10 <Ammler> (files is meant for binaries, rather. 11:02:18 <Ammler> but maybe, we should make a "empty" project, where we add the Makefile and such things? 11:02:36 <Ammler> as a template 11:02:59 <planetmaker> I think it could go to documents, maybe in a tar file or so. 11:03:09 <Ammler> brr 11:03:09 <planetmaker> no need for a project. 11:03:22 <planetmaker> or zip or whatever :) 11:03:33 <Ammler> well, I meant repo 11:03:49 <planetmaker> yes, I know. 11:04:00 <Ammler> I rename the repo tools to misc 11:04:08 <planetmaker> And I think a dummy repo is not needed. Just an archive which has the proper files and dir structure. 11:04:24 <Ammler> and how do you change that? 11:04:45 <Ammler> documents or files don't have histroy :-) 11:04:50 <planetmaker> Oh, that way... hm. Just upload a new version :P 11:05:00 <Ammler> UGLY 11:05:29 <Ammler> well, we don't have a "proper" Makefile template anyway now. 11:05:51 <Ammler> we need ID substitution and such 11:06:13 <Ammler> now, it is just a hmm, german word is "bastel" 11:06:36 <Ammler> or is that ch-de? 11:07:33 <planetmaker> well. It's not really that. It IS a decent template. It's just not that you have ID templates and stuff which might be considered unnecessary. 11:07:42 <planetmaker> A makefile like this otoh is not unnecessary. 11:07:58 <Ammler> did I say that? 11:08:00 <planetmaker> calling it "Frickelei" is IMO not appropriate. 11:08:08 <planetmaker> yes. "bastelei" 11:08:21 <Ammler> ah, isches doch 11:08:25 <planetmaker> no way. 11:08:30 <Ammler> :-D 11:08:43 <planetmaker> ID templates is something absolutely not necessary. 11:08:54 <planetmaker> Especially for projects quite a bit smaller than 2cc. 11:08:55 <Ammler> hehe 11:09:36 <planetmaker> And the makefile serves in principle any project with the same dir structure. 11:09:45 <planetmaker> and that won't change by ID templates either. 11:09:49 <Ammler> which is the bastel ;-) 11:10:03 <planetmaker> ... 11:10:10 <Ammler> but you said that already 11:10:28 <Ammler> we need to clean up that somehow/time 11:10:34 <planetmaker> so... anything but the Notre dame or the Peters cathedral are no church? 11:11:14 <planetmaker> The makefile is quite well. What needs cleanup is the other files, the PCX. 11:11:47 <Ammler> the nfo structure is chaos too, now 11:12:49 <Ammler> I am still think, theoretically it should be possible to "cat */*.nfo > final.nfo" 11:13:06 <planetmaker> the nfo structure is. But that has nothing to do with the makefile. 11:13:10 <planetmaker> it's fully configurable. 11:13:31 <planetmaker> And no. you always need an order of nfo files 11:13:40 <planetmaker> at least header, others and footer. And we have that. 11:13:47 <planetmaker> exactly that what you describe. 11:13:51 <planetmaker> Just have a look. 11:14:12 <planetmaker> :S 11:14:24 <Ammler> hmm 11:14:33 <Ammler> you might get me wrong. 11:15:09 <planetmaker> to make it clear: I never want cat * > file 11:15:24 <Ammler> oh, "theoretically" 11:15:28 <planetmaker> I always prefer to have an explicit list of files which comprise the project. 11:15:32 <planetmaker> no. practically. 11:15:35 <Ammler> it is fine to define every single needed file 11:16:01 <Ammler> hehe, I meant, theoretically :P 11:16:07 <planetmaker> otherwise you might have an example.nfo - and it enters the project even though it's not versioned. You must not have that. 11:16:26 <planetmaker> never ever must files which are not versioned be put into the final.nfo. 11:16:48 <Ammler> let me quote myself: theoretically :P 11:16:53 <planetmaker> in that respect even the current one is not ideal. But it pays attention that at least no files in the main nfo dir go there accidentially. 11:17:22 <planetmaker> you don't say what you refer to... "theoretically" is just and adverb. 11:17:41 <planetmaker> and pasting *.nfo is practically a big NONO 11:17:42 <Ammler> e.g. a subdir for header too 11:17:59 <planetmaker> yes. But I won't make a cat * > something. 11:18:18 <Ammler> menno, I give up 11:18:23 <planetmaker> but the makefile already allows that. That's nothing to do with the makefile. 11:18:35 <planetmaker> just move it and adjust the filename. 11:18:39 <Ammler> [13:15] <Ammler> it is fine to define every single needed file 11:18:44 <planetmaker> yes. 11:18:58 <planetmaker> And we have exactly that. 11:19:01 <planetmaker> What's your point then? 11:20:40 <planetmaker> actually... it allows for both, wildcard definitions and explicit definitions. I think 11:21:50 <Ammler> something like "make ogfx1_base.grf" would be nice 11:22:00 <planetmaker> you can do that :) 11:22:07 <planetmaker> did you try? 11:22:08 <Ammler> really? 11:22:21 <planetmaker> yes. 11:22:24 <Ammler> omg 11:22:27 <planetmaker> you can make 2cctrainset.grf 11:22:34 <planetmaker> you can make ogfx1_base.grf 11:22:37 <planetmaker> and the others. 11:22:57 <Ammler> and grf based Makefile.config 11:23:30 <planetmaker> well. all grf follow the same rules. 11:23:31 <Ammler> so you could "make 2ccpw.grf" with other ID table 11:23:56 <planetmaker> but the rules are: look for source files with the same stem and process them with the same rules 11:24:25 <planetmaker> e.g. make ogfx1_base.grf will look for ogfx1_base.pnfo and process that to an nfo, renum it, grfcodec it and such produce the grf. 11:24:54 <planetmaker> the rules just have to be generic enough that you don't explicitly change them for another filename. 11:24:55 <Ammler> that is exactly what I need for MiniGRFs 11:25:05 <planetmaker> E.g. the dependencies have to follow certain naming rules. 11:25:21 <planetmaker> well. you have it. 11:25:27 <Ammler> :-) 11:25:28 <planetmaker> opengfx's makefile does that. 11:26:03 <Ammler> but the further rules like tar and bundle would make all 11:26:07 <planetmaker> it doesn't do any ID replacement. But to put that into that makefile wouldn't hurt opengfx, but would help such mini-newgrf. 11:26:14 <planetmaker> yes. 11:26:29 <Ammler> hmm, well, that should be easy to change 11:26:38 <planetmaker> BUT: if you specify only one ogfx file in the config file 11:26:48 <planetmaker> then it would only make that one and bundle that. 11:26:54 <planetmaker> so - it can already also do that. 11:27:14 <planetmaker> you just need to adjust the list of targets. 11:27:30 <Ammler> I have to try, if it is possible to overwrite confis with command arguemtns 11:27:46 <Ammler> I know, openttd does such things 11:27:49 <planetmaker> not easy. But for a new project you want a different config file. 11:27:57 <planetmaker> and openttd uses configure 11:28:03 <Ammler> no, make does it 11:28:38 <Ammler> you can change the bundle name with a make parameter 11:28:48 <planetmaker> ah. 11:29:02 <Ammler> I use that in autostart 11:29:09 <planetmaker> http://www.gnu.org/software/make/manual/make.html#Chained-Rules 11:29:10 <Webster> Title: GNU `make' (at www.gnu.org) 11:29:33 <planetmaker> http://www.cs.utah.edu/dept/old/texinfo/make/make.html#SEC74 11:29:34 <Webster> Title: GNU Make (at www.cs.utah.edu) 11:29:43 <planetmaker> gah. This title quoting sucks. 11:29:47 <Ammler> I thoght about, to change the install dir for releases and nightlies 11:30:09 <planetmaker> you mean different ones? 11:30:14 <Ammler> yes 11:30:26 <planetmaker> feasable 11:30:35 <planetmaker> quite easy actually 11:30:44 <planetmaker> I *think* 11:30:48 <Ammler> then you have a example :P 11:31:02 <planetmaker> you mean, you want one? 11:31:22 *** DJNekkid has joined #openttdcoop.devzone 11:31:29 <Ammler> if you say, it is that easy you can give me a example right away ;-) 11:31:56 <Ammler> and btw. I see no tourists in your cargo table 11:31:57 <planetmaker> install: tar $(BUNDLE_NAME) 11:32:14 <planetmaker> Ammler, there are tourists :). Look at the latest in 2cctrainset, though 11:32:23 <planetmaker> it's the nicer one. 11:32:46 <planetmaker> and then you define two new targets in the Makefile 11:33:02 <Ammler> then I don't get your document :-) 11:33:13 <planetmaker> $(BUNDLE_NAME_NIGHTLY): cp $(BUNDLE_NAME) $(INSTALL_DIR_NIGHTLY) 11:33:29 <planetmaker> and for releases, too 11:34:04 <Ammler> that belongs to Makefile.local ? 11:34:08 <planetmaker> and $(BUNDLE_NAME) is set to either $(BUNDLE_NAME_NIGHTLY) or $(BUNDLE_NAME_RELEASE) 11:34:17 <planetmaker> no, those targets go into the Makefile 11:34:32 <planetmaker> you set those variables in Makefile.config (and possibly Makefile.local) 11:36:40 <planetmaker> $(TAR_FILENAME_NIGHTLY): 11:36:40 <planetmaker> -cp $(TAR_FILENAME_NIGHTLY) $(INSTALLDIR_NIGHTLY)/$(TAR_FILENAME_NIGHTLY) 11:37:42 <planetmaker> actually... no. it's even easier. 11:37:55 <planetmaker> you only need to change makefile.config 11:38:33 <planetmaker> you just need to make a new rule how to modify INSTALLDIR on the same lines as the TAR_FILENAME itself is created. 11:38:40 <Ammler> Makefile.config isn't changeable 11:38:46 <Ammler> you mean Makefile.local? 11:39:00 <planetmaker> Makefile.config isn't changeable? 11:39:28 <Ammler> well, I would need to commit the change then :-) 11:40:10 <Ammler> but I assume, I could add the rule to .local, too? 11:40:27 <planetmaker> well, yes. 11:40:55 <planetmaker> but you don't have there, currently (at least in opengfx) access to grf_modified, repo_tags, grf_buildname etc. 11:41:10 <planetmaker> But that might need moving in the Makefile itself to before the makefile.local 11:41:17 <planetmaker> so that you can actually modify that. 11:43:04 <planetmaker> I guess it should go after grf_modified and repo_tags. 11:43:43 <planetmaker> hm... I wonder whether you can define and re-define variables. That'd be best. 11:45:45 <planetmaker> yes, it works. So it needs inclusion before and after :) 11:45:54 <planetmaker> I'll submit those changes. 11:45:55 <Ammler> ? 11:46:02 <Ammler> oh, thanks :-) 11:47:06 <planetmaker> you want a makefile.local which allows modification of only GRF_NAME or so - without the need to also uncomment the rules for GRF_FILENAME and so on. 11:47:34 <planetmaker> there are some funny dependencies which require you currently to put more than just what you want to change into the local makefile.config 11:51:51 <Brot6> ::DevZone:: planetmaker: OpenGFX - Revision 62: Change: allow Makefile.local to also change the rules for GRF_TITLE and si... @ http://dev.openttdcoop.org/projects/opengfx/repository/revisions/62 11:51:51 <Brot6> ::DevZone:: 11:52:23 <planetmaker> there you go. You should be able to re-define now virtually EVERY variable you find in Makefile.config 11:52:52 <planetmaker> and of course you're free to make their definitions as complicated as you want :) 11:58:21 <planetmaker> NIGHTLYDIR = /my/nightly/dir 11:58:21 <planetmaker> RELEASEDIR = my/release/dir 11:58:21 <planetmaker> INSTALLDIR = $(shell [ -n "$(REPO_TAGS)" ] && echo $(RELEASEDIR) || echo $(NIGHTLYDIR)) 11:58:27 <planetmaker> these three lines should do the trick 11:58:42 <planetmaker> ^^ Ammler 11:59:29 <planetmaker> and it would have worked without my last commit :P 12:00:06 <Ammler> shall I rollback the commit? 12:00:41 <planetmaker> no. It's a good commit despite. 12:00:45 <Ammler> hehe 12:00:49 <Ammler> hmm, pasting irc lines 12:01:16 <planetmaker> it's something which I worried about when I was choosing the location where to insert makefile.local 12:01:23 <planetmaker> now I have it twice and it's fine :) 12:11:09 <DJNekkid> anyway guys... 12:11:35 <DJNekkid> if i start working on a 2.0 branch, how would i do that? 12:12:09 <Brot6> ::DevZone:: DJNekkid: 2cc train set - Bug #133 (Resolved): Flatbed wagons aren't @ http://dev.openttdcoop.org/issues/133#change-301 12:12:10 <Brot6> ::DevZone:: Im concidering this fixed ... can ammler or planetmaker close this so im 100% sure? 12:21:20 <Ammler> :-) 12:21:42 <Ammler> DJNekkid: you really like to make it incompatible, that early? 12:24:19 <planetmaker> hm... yes. I think before we start with 2.0 we might just as well cleanup the structure of the 1.x version. 12:27:47 *** DJNekkid has quit IRC 12:28:19 <planetmaker> IMO especially the pcx directory could use a major cleanup. Removing all the unnecessary files and better structuring of the pngs which act as models (if they're needed) 12:28:26 <planetmaker> Maybe rather moving them to doc or alike 12:55:19 <Brot6> ::DevZone:: Ammler: 2cc train set - Bug #133 (Closed): Flatbed wagons aren't @ http://dev.openttdcoop.org/issues/133#change-302 12:55:19 <Brot6> ::DevZone:: A screen from my test save proves it. :-) 12:57:09 <planetmaker> nice, Ammler :) 12:57:27 <planetmaker> you should add maybe the test save to the repository... 13:00:50 <Ammler> well, it is the save from our prozone 13:00:54 <Ammler> but a good idea. 13:01:00 <Ammler> add it to docs 13:01:39 <Ammler> is it possible, if you close openttd, it doesn't save? 13:02:19 <Ammler> then, we lost all I did now :-) 13:03:12 <planetmaker> that's perfectly possible. That's what happens. 13:03:32 <planetmaker> except you have a working autosave folder. 13:04:55 <Ammler> well, ususally my tools ask if I like to save current state. ;-) 13:05:54 <planetmaker> yes. Mine, too :P 13:06:41 <Brot6> ::DevZone:: Ammler: 2cc train set - Revision 192: Testsave @ http://dev.openttdcoop.org/projects/2cctrainset/repository/revisions/192 13:06:41 <Brot6> ::DevZone:: 13:17:55 <Brot6> ::DevZone:: Ammler: 2cc train set - Bug #137 (New): Misaligned trains @ http://dev.openttdcoop.org/issues/137#change-303 13:17:55 <Brot6> ::DevZone:: REOPEN! IMO, not fixed. See attachment. 13:18:08 <Ammler> I just hope, I loaded version 1.0.1 :-) 13:21:17 <Brot6> ::DevZone:: Ammler: 2cc train set - Revision 193: Algnment of Lok2k @ http://dev.openttdcoop.org/projects/2cctrainset/repository/revisions/193 13:21:17 <Brot6> ::DevZone:: 13:24:04 <Brot6> ::DevZone:: Ammler: 2cc train set - Revision 194: Removed tag "Version1.0" @ http://dev.openttdcoop.org/projects/2cctrainset/repository/revisions/194 13:24:04 <Brot6> ::DevZone:: 13:46:53 *** DJNekkid has joined #openttdcoop.devzone 13:52:58 <DJNekkid> hi again 13:55:43 <planetmaker> Ammler, shouldn't matter. It will load it, if you remove the others. 13:55:55 <planetmaker> ho DJNekkid 13:57:16 <Brot6> ::DevZone:: planetmaker: 2cc train set - Feature #154 (Closed): cement as cargo for silo wagons @ http://dev.openttdcoop.org/issues/154#change-305 13:57:16 <Brot6> ::DevZone:: in r187 13:57:57 <DJNekkid> Ammler: what seems to be the problem with the selfdischargers and the flatbeds? 14:02:55 <DJNekkid> a tad too much to the "left" ? 14:04:02 <Brot6> 2cctrainset: Backup push to ssh://hg@bitbucket.org/OpenTTD/2cctrainset/ initiated. 14:04:14 <Brot6> opengfx: Backup push to ssh://hg@bitbucket.org/OpenTTD/opengfx/ initiated. 14:05:35 <Ammler> DJNekkid: a tad too much to north 14:05:52 <DJNekkid> what im saying, to the "left" :) 14:05:52 <Ammler> you see it very good on the png from kenij 14:05:56 *** andythenorth has joined #openttdcoop.devzone 14:05:57 <Ammler> yes 14:06:17 <planetmaker> hey andythenorth :) 14:06:35 <DJNekkid> well, that would be the case with ALL trains, and ALL wagons if thoose ones are "wrong" :) 14:06:49 <planetmaker> this is the channel we dedicated to things being worked on which we have on our devzone 14:06:59 <andythenorth> hi 14:07:03 <DJNekkid> hi andythenorth :) 14:07:09 <planetmaker> e.g. the the community repositories. 14:07:34 <Ammler> I set the prio to low, but it was the cause ot that bug report, what else did you fix? 14:07:50 <Ammler> sali andy 14:08:49 <planetmaker> andythenorth, have you already looked at the server's interface? 14:09:13 <planetmaker> and care to register? 14:09:13 <DJNekkid> basicly the selfdischargers had a bit bad alignment compared to the rest... 14:09:13 <andythenorth> not yet. have used it to look at some stuff DJ helped me with 14:09:20 <planetmaker> aye 14:09:28 <andythenorth> will register. working right now, but might get to it this weekend 14:09:43 <andythenorth> got to do a HEQS release anyway, so might put it in the repo at the same time 14:10:00 <andythenorth> is the repo a good place for release downloads - rather than the forum thread? 14:10:29 <planetmaker> you can use the files section of this server, yes. 14:10:50 <planetmaker> Though, of course, bananas should be a place, too, where it gets published 14:11:02 <planetmaker> e.g. look at the 2cc train set files section 14:11:15 <andythenorth> thanks 14:11:57 <DJNekkid> but Ammler... i've looked at pikkas "sprite templates", and his aligments differ quite a bit from mine... 14:13:01 <DJNekkid> but i guess i _could_ "pikkafie" them 14:13:11 <planetmaker> andythenorth, dunno whether you have a website for heqs. If so, a single point of download makes it easier as the website then doesn't need updating ;) 14:13:12 <Ammler> well, finally we will use the nightly farm for 2cc :-) 14:13:36 <Ammler> (for releases too) 14:14:03 <andythenorth> I do have a site, unfinished. Prefer a single point of download that I don't own, in case of problems with my site / me! 14:14:04 <planetmaker> :) 14:14:20 <Ammler> DJNekkid: dunno, I think, it is a general issue, every sprite is 2px too far north 14:14:24 <planetmaker> hehe. What happens, if the other single point of download is down? 14:14:37 <DJNekkid> Ammler: i basicly know :) 14:14:54 <DJNekkid> and as i saied, compared to pikkas sprites they are :) 14:14:54 <planetmaker> DJNekkid, did you already test Anders' new alignment proggy? 14:15:00 <DJNekkid> no 14:15:06 <planetmaker> ok :) 14:15:23 <Ammler> planetmaker: you won't use that for 2cc :-) 14:15:38 <planetmaker> Ammler, no? 14:15:49 <Ammler> bulk edit? 14:16:12 <planetmaker> not afaik. but for single issues? yes 14:16:28 <Ammler> as I said, I guess, it is a general issue in 2cc. 14:16:45 <DJNekkid> Ammler: lets say, all sprites will have this aligment for all 1.x versions, and for 2.x "we" fix them all 14:16:46 <planetmaker> yeah, I guess. 14:16:50 <Ammler> the 2k lok is just a example. 14:21:52 <Ammler> andythenorth: you could also use the other server as "backup for the source" 14:22:32 <Ammler> we use bitbucket right now for those projects, which are on our server, which server the master is doesn't matter. 14:22:46 <andythenorth> yes / no / maybe. Redundancy isn't always the answer. Being able to make fixes fast is sometimes the answer. 14:22:56 <andythenorth> (in reply to ammler above) 14:23:27 <Ammler> well, with DVCS, there is no isssue with redundancy 14:23:54 <Ammler> the tools complain quite fast is something is different on the push location. 14:24:01 <Ammler> if* 14:26:25 <DJNekkid> andythenorth: ever used var2 variabl4 47 ? 14:26:34 <DJNekkid> http://wiki.ttdpatch.net/tiki-index.php?page=VarAction2Vehicles#Variational_Action_2_Variables_for_Vehicles 14:26:36 <Webster> Title: TTDPatch Wiki : VarAction2Vehicles (at wiki.ttdpatch.net) 14:27:18 <planetmaker> hm... andythenorth you obviously have a mac :) 14:27:36 <planetmaker> which versions of renum and grfcodec do you use? 14:27:51 <andythenorth> DJ Nekkid: yes, is it in relation to unexpected behaviour in recent nightlies? 14:28:27 <DJNekkid> no 14:28:28 <andythenorth> planetmaker: not sure I'd have to look. I run them through Crossover. Someone tried compiling Mac versions of them for me but it didn't work. 14:28:29 <planetmaker> andythenorth, let's say, I've got a problem as I don't find and have a working renum on mine? 14:28:35 <DJNekkid> ive just not tried it... 14:28:41 <planetmaker> oh... so you don't have native mac versions? 14:29:27 <planetmaker> I also tried compiling. But I only get grfcodec compiled. nforenum absolutely doesn't work... :S 14:31:36 <DJNekkid> point is andythenorth... for the 2.0 version of the 2cc set i want to get rid of the express wagon, and use var47 to check if it's a pax or mail/valuables cargo 14:32:03 <DJNekkid> so that the same callback/var2 chain can be used 14:32:44 <planetmaker> DJNekkid, as said in the reply. I'm not sure it's a good idea to deprive the user of this explicit choice. 14:33:01 <planetmaker> actually I'm convinced it's a bad thing... 14:33:19 <DJNekkid> but ... but ... 14:33:23 <Ammler> :-) 14:33:30 <DJNekkid> it makes it much cleaner to code... 14:33:41 <DJNekkid> no need of dual callbacks etc 14:33:49 <planetmaker> not really. It just replaces a bit duplication by high-end advanced code. 14:34:19 <planetmaker> but the user's view will miss all that and just see that getting a certain cargo combination is a pain in the *** 14:34:43 <planetmaker> and _that_ should be the main concern. Not code beautification. 14:34:44 <DJNekkid> more hifi stereo code, not high end, for example, DTS HD 7.1 :p 14:35:03 <DJNekkid> i see your point 14:36:34 <planetmaker> :) sorry for being a pain myself ;) 14:37:04 <DJNekkid> btw, im not sure that the mus can carry goods? 14:37:30 <planetmaker> dunno :) They might in 2.0 :P 14:37:50 <DJNekkid> nah... 14:37:54 <DJNekkid> we have goods trains for that 14:38:06 <DJNekkid> even a goods MU that can carry more goods then any other wagon 14:38:16 <planetmaker> hu? 14:38:44 <DJNekkid> cargosprinter 14:39:13 <planetmaker> oh, right :) 14:39:44 <DJNekkid> even mail is a strech i think 14:39:57 <planetmaker> for the cargo sprinter? 14:39:59 <DJNekkid> but since the game is like it is' its ok 14:40:03 <DJNekkid> for the normal ones 14:40:14 <DJNekkid> cargosprinter can only do "express" class 14:40:21 <DJNekkid> and fridge class as well perhaps 14:40:58 <planetmaker> hm, yes. Fridge and express is fine for that IMO. 14:41:13 <planetmaker> maybe we should make a wagon / consist list for 2.0 :) 14:42:10 <DJNekkid> the way it is now: engines can attach everything but mu wagons, mus can attach mu wagons, except the top of its class, that can only attach mu pax 14:42:32 <andythenorth> planetmaker: Crossover is a good solution (but costs £ / $ / €). I can help you get it working if you need. you're screwed with nforenum :) 14:42:33 <DJNekkid> top of its class is the fastest and/or the one with highest capacity... 14:43:41 <andythenorth> DJNekkid: I've used that varaction in HEQS to do livery refit of tractors based on trailer cargo. Recent nightlies have a bug with it, Frosch knows and has committed a fix. 14:44:09 <andythenorth> by the way, gotta go. Might be back on IRC later if you want to revisit questions above ;) 14:44:13 <planetmaker> andythenorth, I have parallels running here successfully. But yes, it also costs. 14:44:14 *** andythenorth has left #openttdcoop.devzone 14:44:23 <planetmaker> ... 14:44:29 <DJNekkid> andythenorth... oki... but it seems like we didnt want that... 14:44:30 <DJNekkid> bah 14:44:37 <planetmaker> :( 14:47:55 <Brot6> ::DevZone:: planetmaker: OpenGFX - Revision 63: Change: add the bundled files and dirs to .hgignore @ http://dev.openttdcoop.org/projects/opengfx/repository/revisions/63 14:47:55 <Brot6> ::DevZone:: 14:48:16 <planetmaker> he didn't even really leave... 14:48:32 <planetmaker> at least he's still in openttd. 14:56:16 <Ammler> planetmaker: you can also make a local ignore list, :-) 14:57:41 <Ammler> why do you have .renum in your repo? 14:57:53 <planetmaker> I don't know 14:58:07 <Ammler> shouldn't that be in ~ 14:58:40 <planetmaker> I have it in /usr/local/bin 14:58:50 <planetmaker> well. not .renum. yes 14:58:55 <planetmaker> sorry 14:59:25 <Ammler> that might be from time, when you used a local renum 15:00:04 <planetmaker> I didn't need it. I'm sure. I put it on *someone's* request there :) 15:29:44 <Ammler> IMO, it isn't the purpose to handle all local chaos with repo ignore file, such things hould be handled by the local hg settings. 15:30:01 *** andythenorth has joined #openttdcoop.devzone 15:30:29 <andythenorth> are there logs for this room similar to #openttd 15:30:30 <andythenorth> ? 15:32:06 <Ammler> :-) 15:32:19 <Ammler> not available, I guess 15:33:54 <Ammler> andythenorth: http://pastebin.ca/1448808 15:37:57 <DJNekkid> paste.openttd.org ... fits us better :P 15:38:13 <Ammler> no, it has ugly spamfilter 15:38:39 <Ammler> thry to paste there what I did ;-) 15:39:33 <Ammler> I tried many different paste services, pastebin.ca is the best :-) 15:40:46 *** Hirundo has joined #openttdcoop.devzone 15:51:09 *** andythenorth has quit IRC 15:51:56 *** andythenorth has joined #openttdcoop.devzone 15:55:02 <andythenorth> sorry, had about three real people talking to me earlier just as I needed to leave the office :) What was the varaction var 47 question? 15:56:39 <andythenorth> planetmaker: nforenum version is v3.4.6 16:00:42 <DJNekkid> andythenorth: nevermind i think... atleast for now :) 16:01:46 <andythenorth> planetmaker: I registered at https://dev.openttdcoop.org 16:04:12 <DJNekkid> so ehm... 16:04:58 <DJNekkid> planetmaker: are you SURE we want remove the express mus? please please please?` 16:05:12 <DJNekkid> *cant 16:07:21 <DJNekkid> either that, or we make some more specialized mail trains 16:08:50 <DJNekkid> TGV La Poste for example :p 16:09:45 <DJNekkid> http://en.wikipedia.org/wiki/British_Rail_Class_325 16:09:46 <Webster> Title: British Rail Class 325 - Wikipedia, the free encyclopedia (at en.wikipedia.org) 16:09:47 <DJNekkid> http://en.wikipedia.org/wiki/SNCF_TGV_La_Poste 16:09:48 <Webster> Title: SNCF TGV La Poste - Wikipedia, the free encyclopedia (at en.wikipedia.org) 16:12:33 <DJNekkid> btw, have you heard about/seen the "railjet" ? 16:12:51 <DJNekkid> my wife did send me a challange, and ... i didnt recognize it! 16:18:03 <Brot6> OpenGFX: update from r60 to r63, starting nightly compile 16:18:12 <Brot6> OpenGFX: nightlies compile finished with 42 errors: http://mz.openttdcoop.org/bundles/opengfx/nightlies/log/ 16:22:51 <Ammler> planetmaker: tomorrow :-) 16:23:54 <andythenorth> (hmm, learning how to generate ssh key pairs) 16:24:23 <andythenorth> rsa or dsa key needed for the repo? 16:25:04 <Ammler> up2you 16:25:08 <andythenorth> k 16:25:18 <Ammler> foobar made a nice guide btw. 16:25:37 <Ammler> http://dev.openttdcoop.org/projects/home/wiki/Welcome 16:26:39 <Ammler> oh, mainly windows based :-) 16:27:12 <andythenorth> got a key from ssh-keygen, what next? (I'm new to this :) ) 16:27:25 <Ammler> upload to your webspace 16:27:49 <Ammler> but only the *.pub one 16:28:11 <Ammler> then submit it to us and we add you 16:29:29 <andythenorth> done - can I just post url here? 16:29:31 <Ammler> currently, we don't restrict commit rights to single repos. 16:29:44 <Ammler> as it is a public key, that is ok. 16:29:48 <andythenorth> http://tt-foundry.com/id_rsa.pub 16:29:55 <Ammler> it is useless without the private one. 16:30:39 <Ammler> do you have already projects created on our devzone? 16:30:51 <andythenorth> pm created a HEQS project for me 16:31:06 <Ammler> will you keep bazaar? 16:32:14 <andythenorth> don't know. I am vcs agnostic right now :0 I know a tiny bit of svn and a tiny bit of bazaar. Think I'd prefer bazaar as we use it for FIRS. 16:33:26 <Ammler> I have installed bazaar but have no idea about. 16:34:06 <DJNekkid> andythenorth: the good thing about HG is mainly that the server does the thinking, not the client ... plus "everyone" on this channel knows how to use it ... to a bigger or lesser degree 16:35:31 <andythenorth> well I am happy to learn any vcs. a mac GUI client would be a bonus though. I have eclipse or Versions for svn...nothing for bazaar yet. Any other GUI client recommendations (mac)? 16:35:38 <andythenorth> planetmaker? 16:35:58 <Ammler> I guess, he uses cli 16:36:24 *** Hirundo has quit IRC 16:36:57 <Ammler> do you use eclipse for heqs? 16:38:18 <andythenorth> no. only for work, under duress most of our team have got rid of eclipse and switched to other svn clients / dev tools :0 16:38:36 <DJNekkid> andythenorth: you work as a programmer? 16:38:46 <Ammler> the hg cli is very easy to use 16:38:54 <andythenorth> no, I run a business :) 16:38:56 <Ammler> hg <command>, I guess, like bazaar 16:39:16 <andythenorth> cli probably fine. I'll go dig up a tutorial, you guys have better things to do I'm sure ;) 16:39:45 <Ammler> http://dev.openttdcoop.org/projects/home/wiki/Using_TortoiseHg_(Windows) <-- this isn't just for windows 16:42:06 <Ammler> as you aren't a advanced bazaar user, I would highly recommend using hg, I thought, foobar already asked you if you would like to switch ;-) 16:42:37 <Ammler> but I won't force you to anything. :-P 16:43:03 <andythenorth> not advanced is an understatement ;) 16:44:20 <Ammler> well, I would always prefer bazaar to git 16:44:48 <Ammler> that is hell complicated 16:45:03 <andythenorth> Ammler: I got hg installed and a gui client called murky. I'll read the tutorial you linked now... 16:47:01 <Ammler> the repo is already there, pm might have made it: http://mz.openttdcoop.org/hg/heqs 16:47:33 <Ammler> so you can first clone that, then move the part from your heqs there 16:47:41 <Ammler> hg add everything you want public 16:47:52 <Ammler> and hg ci -m "..." 16:47:59 <Ammler> and finally hg push 16:48:19 <Ammler> but in your case you use the ssh link for clone/push 16:49:06 <Ammler> mercurial.ini <-- ~/.hgrc in unix world 16:49:45 <Ammler> or /etc/mercurial/hgrc, but no idea, if a max has such a folder :-) 16:53:23 <andythenorth> yup, it does. think of us as part of the unix world :) 16:55:36 <andythenorth> I am just cleaning up my filesystem before setting up a local repo. does hg freak out if things move / get renamed later (svn sometimes wets itself in that case) 16:56:48 <Ammler> no, rename is mainly a copy with delete 16:56:52 <planetmaker> hey ho 16:59:10 <planetmaker> hm... I don't use a GUI client and never looked for one, I have to admit 17:00:03 <planetmaker> the ini file is in ~/.hgrc 17:00:23 <planetmaker> or the repository's one in <repositorypath>/.hg/hgrc 17:00:30 <planetmaker> like on linux 17:00:37 *** Hirundo has joined #openttdcoop.devzone 17:01:25 <andythenorth> so what generally goes in the repo? *all* development related files, or just clean good ones? 17:01:41 <planetmaker> depends. 17:01:53 <planetmaker> At least all files which are necessary in order to generate the grf 17:02:01 <planetmaker> so all necessary nfo and pcx files 17:02:22 <planetmaker> you might want to add license and readme, too and the excel table for the vehicles or so 17:02:30 <andythenorth> it's gpl, so I'll probably put photoshop files in there as well 17:02:49 <planetmaker> also the script you use in order to create the grf 17:03:02 <planetmaker> yes, then the gpl should be part of the repo :) 17:03:16 <planetmaker> it has to be delivered with the source. That makes it sure :) 17:04:11 <Ammler> it might be cool for others to get the psd things, don't bother about disk usage, that is a cheap thing today :-) 17:04:12 <planetmaker> adding some photoshop files certainly doesn't hurt. Especially, if they're the source of the images 17:04:18 <planetmaker> yes 17:04:25 <andythenorth> do you guys work directly in your local repo? That is how we do it with svn at work. Or do you manually commit files from elsewhere on your filesystem and then update the remote repo? 17:04:31 <planetmaker> yes, of course 17:04:47 <planetmaker> well. Hg works differently from svn 17:05:07 <planetmaker> you modify your local repo. commit locally. And then push changes to other repos (this one here) 17:05:37 <planetmaker> hg is a de-centralized VCS as opposed to SVN's central structure 17:05:58 <planetmaker> but in principle: yes 17:07:09 <andythenorth> I'll give it a go. Guess I'll figure it out. If I screw up, we'll see how good Time Machine is :) 17:07:21 <planetmaker> well. 17:07:35 <planetmaker> in your case I would keep your old files where they are now 17:07:45 <planetmaker> copy what you want to the new repository 17:07:49 <planetmaker> and commit that. 17:07:59 <planetmaker> add and commit that 17:08:11 <andythenorth> if you could see the mess my HEQS filesystem is in, you might disagree! 17:08:14 <Ammler> and do not add things like grfs or grfcodec or such 17:08:21 <planetmaker> :) 17:08:32 <planetmaker> andythenorth: might be good time to clean up :) 17:08:33 <andythenorth> Ammler: do not add grfs? 17:08:42 <planetmaker> andythenorth: no. 17:08:46 <planetmaker> they're a product 17:08:55 <planetmaker> and created from the sources 17:09:03 <planetmaker> the grf is no source. It's a result 17:09:18 <planetmaker> anyone with the sources can create the grf 17:09:30 <planetmaker> using renum and grfcodec 17:10:04 <planetmaker> maybe you can look for reference at the 2cc train set or opengfx what is needed :) 17:10:24 <andythenorth> (looking now) 17:10:27 <planetmaker> but otoh: don't worry. Ammler and myself have already experience in cleaning up repos :) 17:10:30 <Ammler> well, it doesn't hurt that much if you add it, we can remove it later 17:10:47 <planetmaker> exactly. It's a VCS after all :) 17:11:03 <andythenorth> 2cc structure makes sense 17:11:18 <Ammler> well, that is the point, if you once add, you can't remove it anymore completely :-) 17:11:45 <planetmaker> :) 17:16:03 <andythenorth> broke all my crossover scripts (expected). ho hum. 17:16:07 <andythenorth> fixing 17:16:42 <planetmaker> yes, scripts will have to be adopted surely. No absolute paths or binary references 17:16:57 <planetmaker> hehe... I guess another project where I'll add a makefile once. 17:17:15 <andythenorth> possibly just broke *all* pcx file references from the nfo :) about to find out! 17:17:41 <planetmaker> he... 17:17:53 <andythenorth> yup, bad happened 17:18:30 <planetmaker> you might want to keep the relative paths between nfo and pcx maybe at least intially. 17:19:12 <planetmaker> though if you fix it now :) ... good thing 17:20:10 <Ammler> yeah, it doesn't matter if the first version does only work for you. 17:20:42 <Ammler> you/we can add crosscompile support later :-) 17:20:43 <DJNekkid> is it firs or heqs we are talking about? 17:20:47 <DJNekkid> *you 17:20:52 <Ammler> heqs 17:20:55 <planetmaker> heqs 17:21:02 <Ammler> well, and firs maybe ;-) 17:21:11 <andythenorth> planetmaker: my nfo has absolute paths right now. Should relative work? 17:21:20 <planetmaker> yes, of course 17:21:30 <planetmaker> relative to the nfo 17:21:45 <DJNekkid> if the makefile/batchfile is in the "home" dir, all sprites should be in /sprites/<whatever> in that "home dir" 17:21:50 <andythenorth> think it might trip up grfcodec when using Crossover Mac. 17:21:57 <andythenorth> I'll have a look at 2cc 17:22:56 <planetmaker> we have sprites/nfo/*.nfo 17:23:03 <planetmaker> and sprites/pcx/*.pcx 17:23:11 <DJNekkid> actually ... 17:23:15 <planetmaker> in the main directory 17:23:18 <planetmaker> by principle 17:23:23 <planetmaker> in detail we have more 17:23:32 <DJNekkid> sprites/<engine/mus/wagons>/pcx/*.pcx :) 17:24:05 <DJNekkid> but i guess we should shift the .pcx to the "main" folder, and rather make a .png instead 17:24:12 <andythenorth> planetmaker: you have grfcodec working for mac (leopard)? 17:24:49 <planetmaker> on tiger. yes 17:25:05 <planetmaker> but I use both renum and grfcodec on an xp in a virtual machine 17:25:38 <andythenorth> ho hum. I have updated the absolute paths for now. Could be a problem for another day. But will mean problems for anyone else trying to build :( 17:25:52 <planetmaker> well. but that can be sorted out 17:26:33 <planetmaker> don't worry about that too much for now. Paths issues can be fixed in a 2nd step 17:27:00 <andythenorth> ok, so I've cleaned up and run hg add -n 17:27:24 <planetmaker> what does the -n do? 17:27:45 <andythenorth> dunno, it's in the tutorial :) 17:27:50 <Ammler> everyhting 17:27:56 <planetmaker> must be Ammler's doing then :P 17:28:03 <Ammler> foobars :P 17:28:09 <DJNekkid> whats -n ? 17:28:28 <Ammler> no -n is just dry-run 17:28:29 <DJNekkid> "dry run 17:28:37 <DJNekkid> and what the hell is dry run? 17:28:45 <andythenorth> man says -n, --dry-run do not perform actions, just print output 17:28:48 <Ammler> it just outputs , what it WOULD do 17:28:58 <DJNekkid> aha 17:29:06 <DJNekkid> as in dry hump ;p 17:30:32 <Ammler> well, if you are happy with the output of hg add -n 17:30:36 <Ammler> you can run it without 17:30:48 <andythenorth> well there's no output. is that good :) 17:30:49 <Ammler> if you don't want add everything you run hg add <file> 17:30:56 <DJNekkid> or even folder 17:30:58 <DJNekkid> <folder> 17:31:04 <andythenorth> I probably don't want to add everything. unless we welcome crud 17:31:04 <DJNekkid> hg add sprite 17:31:05 <Ammler> andythenorth: did you clone the repo? 17:31:05 <DJNekkid> s 17:31:09 <andythenorth> yep 17:31:19 <Ammler> and you are in that folder now? 17:31:36 <Ammler> with your working copy? 17:31:55 <Ammler> do you have a folder .hg there? 17:33:41 <andythenorth> i do, but I have a confusion to clear up first 17:34:08 *** Hirundo has quit IRC 17:34:22 <andythenorth> so I have a folder ~/heqs_build into which I've done the clone 17:34:30 <andythenorth> producing ~/heqs_build/heqs 17:35:18 <andythenorth> so do I move my files in to ~/heqs_build/heqs manually, or is hg going to do that for me ?? 17:35:38 <DJNekkid> you move all files to the hg-dir 17:35:41 <DJNekkid> well 17:35:52 <DJNekkid> a subdir in the the dir the .hg folder is 17:35:58 <DJNekkid> and then "hg add <folder>" 17:36:01 <DJNekkid> pref, sprite :p 17:36:07 <DJNekkid> sprites ... god damn it 17:36:34 <planetmaker> no, you don't need to create heqs in heqs-build :) 17:36:48 *** Hirundo has joined #openttdcoop.devzone 17:37:07 <planetmaker> if you did hg clone <server-repo> heqs_build 17:37:20 <andythenorth> ah 17:37:23 <Brot6> ::DevZone:: DJNekkid: 2cc train set - Revision 195: i bet i did something :p @ http://dev.openttdcoop.org/projects/2cctrainset/repository/revisions/195 17:37:23 <Brot6> ::DevZone:: 17:37:28 <planetmaker> you'd normally add within the directory "heqs_build" the dirs sprites 17:38:11 <planetmaker> hmpf @ DJNekkid 17:38:52 <DJNekkid> hehe 17:39:04 <DJNekkid> i think i were messing with some wagon gfx earlier... 17:39:06 <Ammler> andythenorth: don't take djn's commit messages as examples ;-) 17:39:17 <Ammler> DJNekkid: hg diff 17:39:21 <planetmaker> honestly... ^^ 17:39:26 <planetmaker> and hg st 17:39:41 <DJNekkid> hehe... solly! 17:39:44 <DJNekkid> i've been drinking! :) 17:39:55 <DJNekkid> anything i need to do? :p 17:39:58 <DJNekkid> well seriously... 17:40:03 <Ammler> :-) 17:40:10 <DJNekkid> i did a trial on changeing the "wagon flag" ... 17:40:11 <andythenorth> so if heqs_build already exists, hg complains... 17:40:19 <andythenorth> so create it new then move files into it? 17:40:23 <andythenorth> after the clone? 17:40:33 <andythenorth> or use add (sorry for being dumb) 17:40:35 <planetmaker> eh? 17:40:45 <planetmaker> well. you cloned an empty repository. 17:40:57 <planetmaker> into that repository you add a subdirectory called sprites 17:41:17 <planetmaker> and into that one you add your nfo and pcx (in whatever dir structure you like) 17:41:20 <DJNekkid> easiest thing is to rename the "old" heqs to "heqs backup" 17:41:32 <DJNekkid> then make a new dir you "hg clone ssh://blablabla" 17:41:46 <DJNekkid> then copy everything into a "sprites" folde rin the new dir 17:41:50 <DJNekkid> then "hg add sprites" 17:42:04 <DJNekkid> "hg commit -m "initial upload of version 0.4c"" 17:42:13 <planetmaker> what DJNekkid sais ^^ 17:42:43 *** Hirundo has quit IRC 17:42:51 <DJNekkid> i had to do it about 5 times before i got it correct :) 17:42:53 <planetmaker> starting in an empty dir, you copy things there, you add those things, then commit those things. 17:43:09 <andythenorth> ok, so I've started the commit... 17:43:21 <andythenorth> I seem to just have a prompt? '>' 17:43:31 <andythenorth> maybe it's thinking :) 17:43:32 <planetmaker> hehe :) DJNekkid I sometimes also mess up... and then just make a new checkout 17:43:37 <Ammler> hg log 17:43:43 <planetmaker> or hg tip 17:45:06 <andythenorth> pdq2s-macbook-2:heqs_build andy$ hg tip 17:45:06 <andythenorth> changeset: -1:000000000000 17:45:06 <andythenorth> tag: tip 17:45:06 <andythenorth> user: 17:45:07 <andythenorth> date: Thu Jan 01 00:00:00 1970 +0000 17:45:54 <planetmaker> hm... 17:46:03 <planetmaker> doesn't look like you commited anything. 17:46:19 <planetmaker> did you add anything before? 17:46:41 <andythenorth> oops extra quote mark on the commit comment 17:46:54 <planetmaker> :) what you posted is what I have here, too :) 17:46:55 <andythenorth> winner... 17:46:56 <andythenorth> pdq2s-macbook-2:heqs_build andy$ hg log 17:46:56 <andythenorth> changeset: 0:d92ebc26a9f5 17:46:56 <andythenorth> tag: tip 17:46:57 <andythenorth> user: andy@pdq2s-macbook-2.local 17:46:57 <andythenorth> date: Fri Jun 05 18:46:29 2009 +0100 17:46:57 <andythenorth> summary: initial upload of heqs files 17:47:24 <planetmaker> good :) 17:47:37 <andythenorth> nice progress. thanks for the help. got to go out for a bit now, might be back later :) 17:48:05 <planetmaker> wait! 17:48:09 <planetmaker> you need to do hg push 17:48:14 <andythenorth> just doing it now 17:48:17 <planetmaker> or it won't leave your computer :) 17:48:38 <DJNekkid> you can actually do hg commit -m "message" when you are offline 17:48:48 <DJNekkid> i tend to do it to seldom tbh 17:48:56 <planetmaker> of course. That's the sense of distributed VCS :) 17:48:59 <andythenorth> ok, 'ssl required', so either my key on the server, or hg needs the path to my local key? 17:49:14 <planetmaker> uhm 17:49:14 <andythenorth> *really* have to go go out for a bit! in 1 min... 17:49:30 <planetmaker> I *though* Ammler put your key there 17:49:34 <planetmaker> *thought 17:49:41 <planetmaker> how did you pull? 17:50:06 <planetmaker> aeolusreloaded:~/ottd/grfdev/heqs ingo$ cat .hg/hgrc 17:50:08 <planetmaker> [paths] 17:50:09 <planetmaker> default = ssh://ottdc@mz.openttdcoop.org/hg-repos/heqs 17:50:26 <planetmaker> ^^that's how my config file for heqs looks like 17:50:28 <andythenorth> hg pull -u 17:50:34 <planetmaker> yours should look the same. 17:52:16 <andythenorth> this will be the problem then: default = http://mz.openttdcoop.org/hg/heqs 17:52:24 <planetmaker> just edit it. 17:52:30 <Ammler> maybe you need to define the private key 17:52:37 <planetmaker> and paste the line I have 17:52:40 <andythenorth> yay, might work... 17:52:40 <Ammler> oh 17:52:43 <Ammler> yes 17:52:48 <andythenorth> trying... 17:53:07 <Ammler> no writing with http 17:53:17 <planetmaker> :) 17:55:11 <Brot6> ::DevZone:: foobar: OpenGFX - Support #156: Temperate sprites for toyland @ http://dev.openttdcoop.org/issues/156#change-307 17:55:11 <Brot6> ::DevZone:: Ammler wrote: Well, for me, a temperate airport is like a "nicer" black box, at least we should keep those sprites as "undone" for release 0.1. Agreed. Recoloring, like I did for the road and rail sta... 17:55:58 <andythenorth> hg seems to be hung up searching for changes. will get back to this later! 17:56:09 *** andythenorth has quit IRC 17:57:23 <Ammler> hello foobar :-) 17:57:38 <DJNekkid> lol 17:58:07 <planetmaker> hehe :) 17:58:25 <Brot6> ::DevZone:: planetmaker: OpenGFX - Support #156: Temperate sprites for toyland @ http://dev.openttdcoop.org/issues/156#change-308 17:58:25 <Brot6> ::DevZone:: making atomic commits in order to update one file IMO don't hurt. IMO even on the contrary: it makes changes more transparent than commits which change several things at once, even though completely u... 18:00:43 <planetmaker> Barack Obama's speech in Cairo was really a good one :) 18:01:39 <DJNekkid> i prefer ... ehm ... 18:01:43 <DJNekkid> the 2cc set :p 18:01:51 <planetmaker> hm? 18:04:02 <Brot6> 2cctrainset: Backup push to ssh://hg@bitbucket.org/OpenTTD/2cctrainset/ initiated. 18:04:10 <Brot6> opengfx: Backup push to ssh://hg@bitbucket.org/OpenTTD/opengfx/ initiated. 18:06:38 <DJNekkid> lol@SpriteAligner 18:06:45 <DJNekkid> it cant handle relative locations 18:07:59 <planetmaker> yep. Just read that, too. That's indeed funny. 18:08:17 <planetmaker> I never considered that a programme couldn't handle relative paths... 18:10:02 <DJNekkid> are anyone of you guys into house music btw? 18:10:20 <DJNekkid> David Guetta Feat Kelly Rowland - When Love Takes Over 18:10:38 <DJNekkid> im willing to bet money, that tune is gonna be one of the big hits on the dancefloor! 18:11:31 <planetmaker> he :) 18:11:47 <planetmaker> I'm basically a music illiterate... :S 18:12:21 <DJNekkid> youtube it! 18:13:03 <planetmaker> :O No, that's against the law. I must not intentionally harm other people ;) 18:16:24 <DJNekkid> youtube aint illegal! 18:16:29 <DJNekkid> the dude himself did put it there 18:17:57 <planetmaker> :) I didn't say youtube is illegal. I just said any attempt of myself to produce music would be illegal as I'd harm other people :P 18:17:58 <Ammler> XeryusTC: is 18:18:22 <Ammler> he likes ugly music, too. 18:18:24 <DJNekkid> aha :) 18:18:31 <DJNekkid> haha 18:18:38 <XeryusTC> tssk 18:18:40 <XeryusTC> i like proper music 18:18:43 <XeryusTC> made by proper bands 18:18:50 <Ammler> :-D 18:18:51 <DJNekkid> dont shoot me, im just the messanger of good music to a dancefloor near you) 18:19:05 <DJNekkid> i dont do bands... i do people featuring other ppl :p 18:19:19 <XeryusTC> they have bands too, but not proper bands 18:19:26 <XeryusTC> or they just hire a bunch of artist 18:19:30 <XeryusTC> to play on their tape 18:20:19 <XeryusTC> but proper bands with classical trained vocalists :P 18:20:58 <DJNekkid> aint kelly roland a good singer now? :p 18:21:11 <XeryusTC> no 18:21:21 <XeryusTC> roy khan and bruce dickinson are :P 18:21:28 <XeryusTC> simone simmons is too :P 18:22:11 <planetmaker> [20:19] <XeryusTC> but proper bands with classical trained vocalists :P <-- that indeed helps modern bands a lot. 18:22:30 <planetmaker> There's so many crap around of people who think that they sing but actually just screech 18:23:21 <DJNekkid> FUCK! 18:24:01 <DJNekkid> i were hopeing to catch a formula1 race during the summer, but we dont have vocation then :( 18:34:24 <DJNekkid> hmm ... i wonder... 18:34:39 <Brot6> ::DevZone:: planetmaker: OpenGFX - Support #144: Tag will automatically create a release bundle @ http://dev.openttdcoop.org/issues/144#change-309 18:34:39 <Brot6> ::DevZone:: Did it actually work for 1.0.1? If so this could be closed... 18:36:11 <Ammler> planetmaker: no :-( 18:36:19 <planetmaker> oh :( 18:36:43 <planetmaker> other question: shall I create the dummy newgrf repo with generic makefile? 18:37:21 <planetmaker> well. I'll first work on it locally, I guess 19:09:00 *** andythenorth has joined #openttdcoop.devzone 19:09:06 <andythenorth> hi hi 19:09:56 <Brot6> ::DevZone:: andy@pdq2s-macbook-2.local: Heavy Equipment Set - Revision 0: initial upload of heqs files @ http://dev.openttdcoop.org/projects/heqs/repository/revisions/0 19:09:56 <Brot6> ::DevZone:: 19:10:35 <planetmaker> ho ho 19:10:44 <planetmaker> I see a commit here :) 19:13:50 *** andythenorth has quit IRC 19:14:38 *** andythenorth has joined #openttdcoop.devzone 19:15:33 <andythenorth> probably quite a bit of junk gone in there, but hey, it works 19:15:57 <planetmaker> indeed it does. 19:16:14 <planetmaker> So... how did you make the grf e.g. produce the grf file from the things I found there? 19:16:17 <DJNekkid> omg! you have more pcx' then me :p 19:16:36 <DJNekkid> grfcodec -e -p2 heqs2.nfo 19:16:40 <DJNekkid> :p 19:19:14 <andythenorth> planetmaker: I need to clean up the pcx structure. I changed my approach to pcx files, but left the legacy stuff in the filesystem. I guess that's my first job 19:20:27 <planetmaker> well :) you know it best, yes 19:20:38 <planetmaker> but you have only one nfo file? 19:20:39 <Brot6> ::DevZone:: Ammler: #openttdcoop - Wiki edit: Using_TortoiseHg_(Windows) (#3) @ http://dev.openttdcoop.org/projects/16/wiki/Using_TortoiseHg_(Windows)?version=3 19:20:39 <Brot6> ::DevZone:: 19:20:48 <planetmaker> which you pipe through grfcodec? 19:20:56 <planetmaker> or do you edit also other nfo files? or how? 19:21:11 <Ammler> andythenorth: http://dev.openttdcoop.org/projects/home/wiki/Using_TortoiseHg_(Windows)#Letting-Hg-know-who-you-are 19:21:26 <andythenorth> one nfo. current release is built from heqs_preview_v0.4c.nfo 19:23:03 <andythenorth> ok user name changed 19:23:25 <andythenorth> I build with grfcodec, no makefile 19:23:30 <Brot6> ::DevZone:: Ammler: #openttdcoop - Wiki edit: Getting_started_on_Win (#5) @ http://dev.openttdcoop.org/projects/16/wiki/Getting_started_on_Win?version=5 19:23:30 <Brot6> ::DevZone:: 19:23:30 <Brot6> ::DevZone:: Ammler: #openttdcoop - Wiki edit: Setting_up_SSH_(Windows) (#3) @ http://dev.openttdcoop.org/projects/16/wiki/Setting_up_SSH_(Windows)?version=3 19:23:30 <Brot6> ::DevZone:: 19:23:30 <Brot6> ::DevZone:: Ammler: #openttdcoop - Wiki edit: Setting_up_a_Compile_Environment_(Windows) (#3) @ http://dev.openttdcoop.org/projects/16/wiki/Setting_up_a_Compile_Environment_(Windows)?version=3 19:23:31 <planetmaker> ok :) 19:23:34 <Brot6> ::DevZone:: 19:23:36 <Brot6> ::DevZone:: Ammler: #openttdcoop - Wiki edit: Using_a_Makefile (#2) @ http://dev.openttdcoop.org/projects/16/wiki/Using_a_Makefile?version=2 19:23:39 <Brot6> ::DevZone:: 19:30:31 <andythenorth> ok cleaned up in my local filesystem. Correct way to commit that? 19:36:33 <Ammler> do you like to make a new 1st push? 19:37:03 <andythenorth> sounds good 19:37:37 <andythenorth> hmm, my username didn't change. I edited .hg/hgrc in the repo 19:37:44 <andythenorth> [paths] 19:37:44 <andythenorth> default = ssh://ottdc@mz.openttdcoop.org/hg-repos/heqs 19:37:44 <andythenorth> [ui] 19:37:44 <andythenorth> username = andythenorth 19:42:10 <andythenorth> ammler: how do I make a new 1st push? 19:42:29 <Ammler> hg rollback 19:42:37 <Ammler> andythenorth: ^ 19:43:25 <Ammler> the repo is empty again 19:43:53 <andythenorth> pushing now... 19:45:15 <planetmaker> andythenorth: did you make rollback before? 19:45:23 <andythenorth> yup 19:45:30 <planetmaker> ok 19:45:42 <Ammler> doesn't matter, else he pushes 2 :-) 19:46:02 <planetmaker> :) or we just make a new repo then. 19:46:12 <Ammler> the repo was empty 19:46:20 <planetmaker> before that, yes 19:46:30 <Ammler> I made a rollback 19:47:57 <andythenorth> hmm interesting. repo now contains files that I have deleted from my filesystem. To solve this do I need to do addremove or something before I commit? 19:48:19 <planetmaker> hg remove <filename> 19:48:35 <andythenorth> anyway to just sync with the filesystem? 19:48:50 <planetmaker> hg add 19:48:54 <planetmaker> to add everything 19:49:06 <planetmaker> and you have to remove - afaik - every file by hand you deleted 19:49:11 <planetmaker> but... 19:49:21 <planetmaker> you made rollback 19:49:32 <planetmaker> so... the repo shouldn#t contain any registered files anymore 19:49:42 <planetmaker> what does hg tip tell you? 19:50:05 <andythenorth> pdq2s-macbook-2:sprites andy$ hg tip 19:50:05 <andythenorth> changeset: 0:d92ebc26a9f5 19:50:05 <andythenorth> tag: tip 19:50:05 <andythenorth> user: andy@pdq2s-macbook-2.local 19:50:06 <andythenorth> date: Fri Jun 05 18:46:29 2009 +0100 19:50:06 <andythenorth> summary: initial upload of heqs files 19:50:11 <andythenorth> gotta eat - back in 20 mins! 19:50:25 <planetmaker> then you didn't use rollback 19:50:45 <planetmaker> it should be empty after a rollback 19:50:55 <planetmaker> like you posted initially 19:51:22 *** andythenorth has quit IRC 19:51:35 <planetmaker> aeolusreloaded:~/ottd/grfdev/heqs ingo$ hg rollback 19:51:37 <planetmaker> rolling back last transaction 19:51:38 <planetmaker> aeolusreloaded:~/ottd/grfdev/heqs ingo$ hg tip 19:51:40 <planetmaker> changeset: -1:000000000000 19:51:41 <planetmaker> tag: tip 19:51:43 <Ammler> hehe, why does he disconnect for afk? :-) 19:51:43 <planetmaker> user: 19:51:44 <planetmaker> date: Thu Jan 01 00:00:00 1970 +0000 19:51:47 <planetmaker> arg 19:51:49 <planetmaker> why does he always go? :( 19:52:08 <Ammler> he might use a strange client 19:52:53 <planetmaker> yep 19:53:03 <planetmaker> or just irc inexperienced 19:53:14 <planetmaker> I remember my first irc day... 19:53:16 <planetmaker> omg 20:07:35 <planetmaker> wow. The dependency check for 2cctrainset already takes some time... 20:09:52 <DJNekkid> what is that? :p 20:10:11 <planetmaker> something makefile does 20:10:31 <planetmaker> checking which files changed since the last time the grf was created 20:11:03 <planetmaker> or since the last time the bundle was created. Whatever is called 20:11:38 <Ammler> :-) 20:13:01 *** andythenorth has joined #openttdcoop.devzone 20:13:11 <andythenorth> hi hi 20:13:34 <planetmaker> hi 20:13:44 <planetmaker> why do you leave IRC each time you're AFK? 20:14:04 <planetmaker> [21:49] <planetmaker> then you didn't use rollback 20:14:05 <planetmaker> [21:49] <planetmaker> it should be empty after a rollback 20:14:07 <planetmaker> [21:49] <planetmaker> like you posted initially 20:14:08 <planetmaker> [21:50] |<-- andythenorth has left members.openttdcoop.org (Quit: andythenorth) 20:14:10 <planetmaker> [21:50] <planetmaker> aeolusreloaded:~/ottd/grfdev/heqs ingo$ hg rollback 20:14:12 <planetmaker> [21:50] <planetmaker> rolling back last transaction 20:14:13 <planetmaker> [21:50] <planetmaker> aeolusreloaded:~/ottd/grfdev/heqs ingo$ hg tip 20:14:15 <planetmaker> [21:50] <planetmaker> changeset: -1:000000000000 20:14:17 <planetmaker> [21:50] <planetmaker> tag: tip 20:14:18 <planetmaker> [21:50] <planetmaker> user: 20:14:20 <planetmaker> [21:50] <planetmaker> date: Thu Jan 01 00:00:00 1970 +0000 20:14:27 <planetmaker> ^ @ andythenorth 20:14:35 <andythenorth> planetmaker: laptop goes to sleep! Anyway, back to the problem in hand... 20:15:40 <Brot6> ::DevZone:: planetmaker: 2cc train set - Revision 196: Change: when creating a bundle, create a subdirectory to put things... @ http://dev.openttdcoop.org/projects/2cctrainset/repository/revisions/196 20:15:40 <Brot6> ::DevZone:: 20:15:41 <planetmaker> hm, right :) 20:16:10 <andythenorth> pdq2s-macbook-2:heqs_build andy$ hg rollback 20:16:10 <andythenorth> no rollback information available 20:16:44 <Ammler> hg tip? 20:16:55 <andythenorth> pdq2s-macbook-2:heqs_build andy$ hg tip 20:16:55 <andythenorth> changeset: 0:d92ebc26a9f5 20:16:55 <andythenorth> tag: tip 20:16:55 <andythenorth> user: andy@pdq2s-macbook-2.local 20:16:56 <andythenorth> date: Fri Jun 05 18:46:29 2009 +0100 20:16:56 <andythenorth> summary: initial upload of heqs files 20:17:17 <planetmaker> hm... did you do that in a dir which you didn't checkout from the server? 20:17:19 <planetmaker> hm... 20:18:41 <planetmaker> well. I guess the easiest thing is: we just create a completely new repo 20:19:06 <andythenorth> ok sorry. round 2 then.... 20:20:41 <Ammler> why 20:20:48 <Ammler> can't you push? 20:21:35 <Ammler> you could just remove the dir .hg 20:21:42 <Ammler> hmm 20:22:02 <Ammler> strip I meant 20:22:09 <Ammler> you shouldn't lose the repo infos 20:22:15 <DJNekkid> whos stripping? *just came back from a phonecall* 20:22:22 <DJNekkid> *who is 20:22:30 <planetmaker> your wife, DJNekkid :P 20:22:42 <Ammler> did you setup the webcam? 20:22:44 <planetmaker> as seen on youprn 20:22:56 * planetmaker hides 20:23:15 <andythenorth> hmm I tried the murky GUI client earlier, it has left some config files in .hg maybe it screwed with the repo info? 20:23:24 <andythenorth> anyway. 20:23:27 <DJNekkid> now she is laughing! 20:23:37 <planetmaker> :) 20:24:06 <DJNekkid> "you wish, i've just pulled on some fishnet stockings and a slinky black dress" 20:24:21 <planetmaker> haha :) 20:24:34 <DJNekkid> she saied 20:24:54 *** DJNekkid is now known as Kristine 20:25:00 <Kristine> you wish, i've just pulled on some fishnet stockings and a slinky black dress 20:25:01 <planetmaker> I dunno her, but I guess it looks tasty ;) 20:25:05 *** Kristine is now known as DJNekkid 20:25:13 <planetmaker> :O 20:25:22 <DJNekkid> shes slim with big b00bs :p 20:27:02 * planetmaker wonders wether the i-net has some images of you and your wife :) 20:28:23 <DJNekkid> the i-net might... 20:28:32 <DJNekkid> are you on the f-book? :p 20:28:38 <planetmaker> nope 20:28:49 <planetmaker> not yet... but people keep asking me that 20:28:58 <Ammler> fuckbook? 20:29:03 <planetmaker> tsk 20:29:13 <planetmaker> where do your thoughts dwell, Ammler? 20:29:40 <planetmaker> andythenorth: what happens if you just commit? 20:29:44 <Ammler> is there another f-word, you need to censore? 20:29:51 <planetmaker> nope 20:30:01 <planetmaker> well. in german 20:30:33 <Brot6> ::DevZone:: planetmaker: 2cc train set - Revision 197: Cleanup: remove a few old comments and vars @ http://dev.openttdcoop.org/projects/2cctrainset/repository/revisions/197 20:30:33 <Brot6> ::DevZone:: 20:30:49 <andythenorth> (trying...in between the smut and the washing up) 20:30:52 <DJNekkid> i look quite horrible, but she's hot: 20:30:53 <DJNekkid> http://redmine.ammler.ch/attachments/download/129/sensation-fra-erik-lyngvær.jpg 20:31:32 <planetmaker> :) indeed 20:31:53 <planetmaker> but you're no horrible guy either :) You're a nice couple, I'd say 20:33:00 <planetmaker> hehe. andythenorth get straight the right impression of us :P 20:33:42 <Brot6> ::DevZone:: DJNekkid: 2cc train set - sensation-fra-erik-lyngvær.jpg @ http://dev.openttdcoop.org/attachments/download/129/sensation-fra-erik-lyngv%C3%A6r.jpg 20:33:42 <Brot6> ::DevZone:: 20:33:42 <Brot6> ::DevZone:: DJNekkid: 2cc train set - Bilde000.jpg @ http://dev.openttdcoop.org/attachments/download/130/Bilde000.jpg 20:33:42 <Brot6> ::DevZone:: 20:33:42 <Brot6> ::DevZone:: DJNekkid: 2cc train set - CIMG0440.JPG @ http://dev.openttdcoop.org/attachments/download/131/CIMG0440.JPG 20:33:45 <Brot6> ::DevZone:: 20:34:12 <DJNekkid> there is a couple of other ones of her 20:34:25 <DJNekkid> i'll see if i can find something close to representative of me... :) 20:35:10 <planetmaker> he :) the latter is a nice shot 20:35:44 <DJNekkid> almost takes streight out of "eric prydz - call on me" 20:37:30 <Brot6> ::DevZone:: DJNekkid: 2cc train set - IMG_3843.JPG @ http://dev.openttdcoop.org/attachments/download/132/IMG_3843.JPG 20:37:30 <Brot6> ::DevZone:: 20:37:30 <Brot6> ::DevZone:: DJNekkid: 2cc train set - CIMG1609.JPG @ http://dev.openttdcoop.org/attachments/download/133/CIMG1609.JPG 20:37:30 <Brot6> ::DevZone:: 20:38:34 <Ammler> DANGER! 20:38:53 <planetmaker> uhm... the sign of a shopping centre? 20:39:01 <DJNekkid> wrong image i guess :) 20:40:37 <DJNekkid> there, 3 more ... :) 20:40:39 <DJNekkid> :) 20:40:42 <DJNekkid> guess thats it :) 20:41:01 <Brot6> ::DevZone:: DJNekkid: 2cc train set - CIMG1627.JPG @ http://dev.openttdcoop.org/attachments/download/135/CIMG1627.JPG 20:41:01 <Brot6> ::DevZone:: 20:41:01 <Brot6> ::DevZone:: DJNekkid: 2cc train set - CIMG1603.JPG @ http://dev.openttdcoop.org/attachments/download/134/CIMG1603.JPG 20:41:01 <Brot6> ::DevZone:: 20:41:02 <planetmaker> hehe. Luckily no kids on this channel :) 20:42:19 <DJNekkid> im that ugly huh :p 20:43:49 <planetmaker> :P 20:44:01 <DJNekkid> and now, its your turn! 20:44:10 <DJNekkid> ammler! 20:46:14 <planetmaker> I was just looking. I'm always taking photos... so no photos of me :P 20:46:33 <DJNekkid> thats my excuse as well 20:46:39 <planetmaker> hehe :) 20:47:15 <Brot6> ::DevZone:: planetmaker: OpenGFX - Support #156: Temperate sprites for toyland @ http://dev.openttdcoop.org/issues/156#change-308 20:47:15 <Brot6> ::DevZone:: making atomic commits in order to update one file IMO don't hurt. IMO even on the contrary: it makes changes more transparent than commits which change several things at once, even though completely u... 20:47:51 <planetmaker> eh? that's an old thing, that issue... 20:50:05 <planetmaker> http://www.planetmaker.de/ingo_small.jpg <-- ok, I won't stay completely anonymous. But it's just an old portrait foto. 20:50:54 <Brot6> ::DevZone:: andythenorth: Heavy Equipment Set - Revision 1: removed redundant files @ http://dev.openttdcoop.org/projects/heqs/repository/revisions/1 20:50:54 <Brot6> ::DevZone:: 20:51:14 <DJNekkid> she think you looked cute :) 20:51:28 <planetmaker> he. Yeah. Back then I was young ;) 20:51:30 <andythenorth> no pictures from me. but I did a commit and push. 20:51:47 <planetmaker> ha. Someone is at least working :P 20:52:22 <DJNekkid> isnt lifting a glass with the right hand work? 20:52:40 <planetmaker> hard work indeed. 20:52:42 <planetmaker> where's my beer? 20:53:08 <DJNekkid> ./dcc 1x Aas SommerØl to planetmaker 20:53:15 <planetmaker> there we go 20:53:24 <planetmaker> cheers 20:53:55 <andythenorth> ok stripping files using remove then commit then push. so that's all fine 20:54:44 <DJNekkid> http://translate.google.com/translate?prev=hp&hl=no&js=n&u=http://www.matoppskrift.no/sider/artikkel1581.asp&sl=no&tl=de&history_state0= 20:54:45 <Webster> Title: Google Oversetter (at translate.google.com) 20:56:30 <Brot6> ::DevZone:: andythenorth: Heavy Equipment Set - Revision 2: removed more redundant files @ http://dev.openttdcoop.org/projects/heqs/repository/revisions/2 20:56:30 <Brot6> ::DevZone:: 20:56:30 <Brot6> ::DevZone:: andythenorth: Heavy Equipment Set - Revision 3: removed more redundant files @ http://dev.openttdcoop.org/projects/heqs/repository/revisions/3 20:56:30 <Brot6> ::DevZone:: 20:56:30 <Brot6> ::DevZone:: andythenorth: Heavy Equipment Set - Revision 4: removed more redundant files @ http://dev.openttdcoop.org/projects/heqs/repository/revisions/4 20:56:33 <Brot6> ::DevZone:: 20:57:52 <DJNekkid> well, tty tomorrow, i got a gig in 3 minutes :) 20:58:20 <andythenorth> planetmaker: hmm. the mac has an anti-social habit of leaving .DS_Store files on servers. looks like that happens with hg. any solution other than manual remove? 20:58:30 <andythenorth> (they got added when I did hg add I guess) 20:58:42 <DJNekkid> hg remove .ds_sgtore? 20:58:48 <planetmaker> well. then use ^ 20:58:50 <planetmaker> :) 20:59:05 <planetmaker> my computer has the same habit 20:59:11 <Brot6> ::DevZone:: planetmaker: OpenGFX - Support #156: Temperate sprites for toyland @ http://dev.openttdcoop.org/issues/156#change-308 20:59:11 <Brot6> ::DevZone:: making atomic commits in order to update one file IMO don't hurt. IMO even on the contrary: it makes changes more transparent than commits which change several things at once, even though completely u... 20:59:11 <Brot6> ::DevZone:: planetmaker: OpenGFX - Support #144: Tag will automatically create a release bundle @ http://dev.openttdcoop.org/issues/144#change-309 20:59:11 <Brot6> ::DevZone:: Did it actually work for 1.0.1? If so this could be closed... 20:59:14 <Brot6> ::DevZone:: Ammler: #openttdcoop - Wiki edit: Using_TortoiseHg_(Windows) (#3) @ http://dev.openttdcoop.org/projects/16/wiki/Using_TortoiseHg_(Windows)?version=3 20:59:17 <Brot6> ::DevZone:: 20:59:19 <Brot6> ::DevZone:: Ammler: #openttdcoop - Wiki edit: Getting_started_on_Win (#5) @ http://dev.openttdcoop.org/projects/16/wiki/Getting_started_on_Win?version=5 20:59:22 <Brot6> ::DevZone:: 20:59:43 <planetmaker> Ammler: what's up with brot6? 21:01:16 <andythenorth> advice please (think I know the answer though). I haven't cleaned up the psd files and they *may* contain copyright graphics from screenshots etc. I should remove them right? 21:02:18 <Brot6> ::DevZone:: andythenorth: Heavy Equipment Set - Revision 1: removed redundant files @ http://dev.openttdcoop.org/projects/heqs/repository/revisions/1 21:02:18 <Brot6> ::DevZone:: 21:02:18 <Brot6> ::DevZone:: andythenorth: Heavy Equipment Set - Revision 2: removed more redundant files @ http://dev.openttdcoop.org/projects/heqs/repository/revisions/2 21:02:18 <Brot6> ::DevZone:: 21:02:18 <Brot6> ::DevZone:: andythenorth: Heavy Equipment Set - Revision 3: removed more redundant files @ http://dev.openttdcoop.org/projects/heqs/repository/revisions/3 21:02:21 <Brot6> ::DevZone:: 21:02:23 <Brot6> ::DevZone:: andythenorth: Heavy Equipment Set - Revision 4: removed more redundant files @ http://dev.openttdcoop.org/projects/heqs/repository/revisions/4 21:02:26 <Brot6> ::DevZone:: 21:02:28 <Brot6> ::DevZone:: andythenorth: Heavy Equipment Set - Revision 5: removed more redundant files @ http://dev.openttdcoop.org/projects/heqs/repository/revisions/5 21:02:31 <Brot6> ::DevZone:: 21:02:33 <Brot6> ::DevZone:: andythenorth: Heavy Equipment Set - Revision 6: removed more redundant files @ http://dev.openttdcoop.org/projects/heqs/repository/revisions/6 21:02:36 <Brot6> ::DevZone:: 21:02:38 <Brot6> ::DevZone:: andythenorth: Heavy Equipment Set - Revision 7: removed more redundant files @ http://dev.openttdcoop.org/projects/heqs/repository/revisions/7 21:02:41 <Brot6> ::DevZone:: 21:05:00 <Ammler> hmm 21:06:12 <Ammler> andythenorth: why should a screenshot affect copyright? 21:06:42 <Ammler> or how? 21:07:14 <Ammler> planetmaker: I change brot back to oneliner, until I know how to fix that :-) 21:07:36 <Ammler> !rss delete devzone 21:07:36 <Brot6> Ammler: #openttdcoop.devzone has been removed from the watchlist for DevZone 21:07:36 <Brot6> okay then :), Ammler 21:07:46 <planetmaker> eh? 21:09:49 <Ammler> !rss watch devzone http://dev.openttdcoop.org/activity.atom?show_changesets=1&show_documents=1&show_files=1&show_issues=1&show_messages=1&show_news=1&show_wiki_edits=1 in #openttdcoop.devzone 21:09:49 <Brot6> Ammler: Added RSS http://dev.openttdcoop.org/activity.atom?show_changesets=1&show_documents=1&show_files=1&show_issues=1&show_messages=1&show_news=1&show_wiki_edits=1 named devzone 21:09:49 <Brot6> okay then :), Ammler 21:10:01 <Ammler> !rss delete devzone 21:10:03 <Brot6> Ammler: #openttdcoop.devzone has been removed from the watchlist for devzone 21:10:03 <Brot6> sure, Ammler 21:10:12 <Ammler> !rss watch DevZone http://dev.openttdcoop.org/activity.atom?show_changesets=1&show_documents=1&show_files=1&show_issues=1&show_messages=1&show_news=1&show_wiki_edits=1 in #openttdcoop.devzone 21:10:12 <Brot6> Ammler: Added RSS http://dev.openttdcoop.org/activity.atom?show_changesets=1&show_documents=1&show_files=1&show_issues=1&show_messages=1&show_news=1&show_wiki_edits=1 named DevZone 21:10:12 <Brot6> sure, Ammler 21:10:29 <andythenorth> ammler: screenshot in source file would violate GPL if I don't have copyright of graphics contained in screenshot. 21:10:43 <andythenorth> it's a bit of a grey area as the screenshot isn't needed to build the project 21:11:07 <andythenorth> but also I would be distributing copyright material without permission = violation of copyright law surely? 21:11:14 <andythenorth> where is MB when we need him :) 21:12:13 <Ammler> [23:10] <andythenorth> ammler: screenshot in source file would violate GPL if I don't have copyright of graphics contained in screenshot. <.--- LOL, (sorry) 21:12:50 <Ammler> if you make a foto of something, you won't violate gpl, for sue 21:13:10 <Ammler> you might have understood MP completely wrong there 21:13:17 <Ammler> mb* 21:14:39 <andythenorth> well anyway, life's easier if I get rid of things I don't have copyright on before distributing the files. it's not a big job ;) 21:14:57 <andythenorth> so the right files are now in the repo 21:15:02 <andythenorth> what else to do today? 21:15:06 <planetmaker> they're uploaded in one version. so technically they're distributed whether you remove them now or not 21:15:47 <andythenorth> planetmaker: are we talking the same thing in two places (#openttd)?? 21:16:12 <planetmaker> uhm, no? 21:16:34 <andythenorth> uhm, ok, sorry 21:16:51 <planetmaker> this is about some screenshots, right? OpenTTD about grfIDs. 21:17:01 <planetmaker> s/OpenTTD/#openttd/ 21:17:18 <andythenorth> yes :) good sorry my wife is asking me to help with something, I lost my thread 21:17:28 *** Mucht has joined #openttdcoop.devzone 21:18:53 <Ammler> planetmaker: belugas should remove tag "newgrfs" from his name on the contact list ;-) 21:19:04 <planetmaker> :P 21:31:41 <andythenorth> so everything I want to put up for HEQS is in the repo. But you won't be able to build due to bad paths :( 21:33:14 <andythenorth> I of course can build :) 21:33:15 <Ammler> shall I sed them? 21:34:15 <andythenorth> sed?? 21:35:14 <Ammler> sed s/your silly path/better path/ ;-) 21:35:47 <andythenorth> ah man sed is my friend 21:36:25 <andythenorth> you can try but I think you might need a couple of passes over to get them right.... 21:36:35 <andythenorth> I can sort it out later if you want. Or feel free to try :) 21:36:51 <planetmaker> I'm just trying to get a Makefile adopted :) 21:37:24 <Ammler> "Y:\Documents\OTTD graphics\HEQS\heqs_build\" <-- you could just remove that 21:37:44 <Ammler> and it works still, if you run grfcodec in the project root 21:38:56 <andythenorth> I can't. Or rather I can of course, but I have to run grfcodec in crossover (mac version of wine). It needs absolute paths because it lives in a wine bottle thing. Maybe I can find a workaround with a bit of effort. 21:40:03 <planetmaker> uhm... but even then? 21:41:03 <planetmaker> also with crossover you should be able to cd into that dir and then call a command? 21:46:44 <andythenorth> yup makes sense 21:47:18 <planetmaker> I've never used cross-over, though. But it's just a VM, right? 21:47:24 <Ammler> no 21:47:31 <Ammler> it is like wine, iirc 21:47:38 <andythenorth> no not a vm. some kind of wrapper for windows APIs 21:47:45 <andythenorth> don't really know beyond that 21:47:46 <planetmaker> oh, ok 21:47:56 <planetmaker> I run a full VM here for windows 21:48:05 <andythenorth> ok bedtime here. That was nice work with hg - thanks for the help. I might be back tomorrow ;) 21:48:12 <planetmaker> :) 21:48:36 <planetmaker> good night 21:48:57 *** andythenorth has quit IRC 21:56:34 <planetmaker> ha. Made heqs archive compile-able 21:59:29 <Ammler> with the absolute paths? 21:59:36 <planetmaker> No 21:59:40 <planetmaker> without. 21:59:52 <planetmaker> I just removed all absolute things therein. 22:00:12 <Ammler> was there more than that to do? 22:00:23 <planetmaker> no 22:00:30 <planetmaker> at least it didn't look like 22:00:38 <planetmaker> as it made a grf 22:01:17 <planetmaker> but renum reports some errors. but not related to that, I think 22:01:19 <Ammler> :-) 22:01:33 <planetmaker> action 2s and cargoIDs 22:01:44 <planetmaker> you can pull and see yourself :) 22:01:55 <Ammler> hmm 22:02:01 <Ammler> where is Brot then? 22:02:20 <planetmaker> that I wondered, too 22:02:27 <Ammler> !config rescan 22:02:27 <Brot6> Ammler: incorrect usage, ask for help using 'Brot6: help config' 22:02:39 <Ammler> !recan 22:02:43 <Ammler> !rescan 22:02:43 <Brot6> Ammler: saving ... 22:02:43 <Brot6> Ammler: rescanning ... 22:02:53 <planetmaker> should be 4 commits by me 22:02:54 <Brot6> Ammler: done. 10 core modules loaded; 78 plugins loaded; 3 plugins failed to load 22:03:01 <planetmaker> :O 22:03:05 <Ammler> hehe 22:03:14 <Ammler> Brot has everything ;-) 22:03:55 <planetmaker> I really like my makefile. It was really only changing a few variables from the 2cctrainset. :) 22:04:01 <Brot6> 2cctrainset: Backup push to ssh://hg@bitbucket.org/OpenTTD/2cctrainset/ initiated. 22:04:36 <Brot6> ::DevZone:: Heavy Equipment Set - Revision 11: Add: .hgignore @ http://dev.openttdcoop.org/projects/heqs/repository/revisions/11 (by planetmaker) 22:11:45 <planetmaker> hm... make install doesn't yet work 22:55:07 <Brot6> ::DevZone:: Heavy Equipment Set - Revision 12: Change: add a few more things to .hgignore @ http://dev.openttdcoop.org/projects/heqs/repository/revisions/12 (by planetmaker) 22:55:07 <Brot6> ::DevZone:: Heavy Equipment Set - Revision 13: Change: automatically generate version information and title @ http://dev.openttdcoop.org/projects/heqs/repository/revisions/13 (by planetmaker) 23:10:32 <Brot6> ::DevZone:: Heavy Equipment Set - Revision 14: Change: remove *.bak which were versioned in sprites dir @ http://dev.openttdcoop.org/projects/heqs/repository/revisions/14 (by planetmaker) 23:10:32 <Brot6> ::DevZone:: Heavy Equipment Set - Revision 15: (re)move obsolete nfo files @ http://dev.openttdcoop.org/projects/heqs/repository/revisions/15 (by planetmaker) 23:10:32 <Brot6> ::DevZone:: Heavy Equipment Set - Revision 16: Add: gpl now in license.txt @ http://dev.openttdcoop.org/projects/heqs/repository/revisions/16 (by planetmaker)