IRC logs for #openttd on OFTC at 2010-01-11
⏴ go to previous day
00:02:26 <CIA-2> OpenTTD: michi_cc * r18778 /trunk/src/train_cmd.cpp: -Fix [FS#3483]: [YAPP] Remove a special check for two-sided signals when reserving a path as this causes trains to get stuck in front of them.
00:12:05 *** Dred_furst has joined #openttd
00:16:58 <PeterT> #openttd.compile is set up, come join
00:27:58 <michi_cc> Eddi|zuHause: If you're still interested in the git question: git diff origin/master..<your branch here>
00:28:31 <Eddi|zuHause> aha. i'm gonna try that later
00:29:31 <michi_cc> and git format-patch origin/master..<branch here> to get an individual diff for each commit
00:30:53 <PeterT> michi_cc: How would you merge two working copies, then get a patch for the differences?
00:31:56 <michi_cc> (works for git log as well. git help rev-parse will give all possible ways to specifiy revision)
00:33:03 *** Eddi|zuHause has joined #openttd
00:33:24 <michi_cc> PeterT: Two working copies or two branches? And what difference, between the branches or between the merge result and antoher branch?
00:34:02 <PeterT> michi_cc: Let me tell you the whole story, it will be eaiser
00:34:14 <PeterT> I want to create a patchfile of yexo's NewGRF Airports
00:34:25 <PeterT> a diff between NewGRF Airports and Trunk
00:34:30 <PeterT> how would I go about doing that?
00:36:32 <michi_cc> by using HG, as that's how it's distributed
00:36:44 <PeterT> well, is there a command in HG?
00:36:59 <michi_cc> and otherwise: diff -Nur dir_a dir_b
00:37:14 <michi_cc> I expect there to be hg diff as well
00:38:05 <PeterT> so that creates a diff file?
00:38:05 <michi_cc> i.e. produce a sensible patch file
00:38:39 <PeterT> will it make a diff for files that do not exist in one repo, but do exist in the other?
00:38:42 <Eddi|zuHause> -u means "unified" and -r "recursive", i don't know what -N stands for
00:39:02 <Eddi|zuHause> diff does not know about repositories
00:42:06 <PeterT> "# run with daily cron
00:42:31 <Ammler> that is the sheduler, which runs the script every day
00:43:00 <PeterT> there is a new IS patch every day now?
00:43:09 <Ammler> quite some time already
00:44:46 <Ammler> but as Hirundo told, patches after 2.1.1 are very experimental, since he changed the system
00:46:31 *** mib_0snm8g has joined #openttd
00:46:46 <PeterT> so if $WEB == /home/openttd/public_html/$REPO/trunk-patches
00:47:20 <PeterT> ammler: If you don't mind, could you please join #openttd.compile
00:47:25 <PeterT> We need your expertise
00:48:01 <Ammler> you can't get expertises by me :-P
00:50:04 *** welshdragon has left #openttd
00:50:46 <PeterT> michi_cc/ Eddi|zuHause: would you like to join #openttd.compile?
00:50:56 <Ammler> why can't you not ask here?
00:51:03 <Eddi|zuHause> why would i do that?
00:52:21 <mib_0snm8g> hi, is there a place with documented code changes?
00:52:56 <Eddi|zuHause> PeterT: $1 is the first parameter when running the script, as in "./script.sh blah" then $0 == ./script.sh and $1 == blah
00:53:21 <Eddi|zuHause> mib_0snm8g: what kind of documentation?
00:53:58 <Eddi|zuHause> mib_0snm8g: every code change has a description in the svn log
00:54:28 <Eddi|zuHause> mib_0snm8g: and please get a real nick
00:55:07 <PeterT> mib_0snm8g: Or a real IRC client
00:57:04 <mib_0snm8g> "every code change has a description in the svn log" any repository?
00:58:03 <mib_0snm8g> i want to now the reason for some changes that was introduce
00:58:50 <Eddi|zuHause> mib_0snm8g: anything in particular, or just some random digging?
01:00:52 <PeterT> mib_0snm8g: Did you take a look at those links?
01:09:32 <Ammler> docs isn't useful for him....
01:09:45 <PeterT> good that you mention it now that he left
01:11:21 <PeterT> michi_cc: You still there?
01:11:39 <PeterT> you seem to know quite a bit about HG
01:12:08 *** Bluelight has joined #openttd
01:12:38 <Ammler> not with meta questions
01:12:51 <Bluelight> I have the problem that the server don't do what I configured in the config file and secondly.. The server wont show in the serverlist until some period of time..
01:13:31 <PeterT> Ammler: meta questions?
01:14:11 <Ammler> PeterT: I need to know, what help you need, else I can't help you.
01:14:23 <PeterT> creating a patch between two branches
01:14:29 <PeterT> but that script won't help me
01:14:35 <Eddi|zuHause> Bluelight: the server list updates every few minutes, so it might take some time
01:14:36 <PeterT> I don't need all those extra commands
01:15:04 <PeterT> I'd like to know if there is such a command for "hg diff <dir_1> <dir_2> <patchfile_output>.diff"
01:15:05 <Eddi|zuHause> Bluelight: changes to the config file won't be regarded when you load a savegame
01:15:08 <Ammler> it wasn't meant to use like that, just an example how to make a svn patch
01:15:29 <Bluelight> It's not a savegame..
01:16:03 <Bluelight> "C:\Program Files\OpenTTD\openttd.exe" -D 10.0.0.2:3979
01:16:13 <Ammler> PeterT: hg diff -r<hash>:<hash> > patch
01:16:41 <Bluelight> And then it generates map and I can play, but the settings I put in the config is just ignored..
01:17:03 <Eddi|zuHause> Bluelight: so what's the setting you change?
01:17:04 <PeterT> is the HG rev == svn rev?
01:17:17 <Ammler> but that you can see in my script
01:17:40 <Eddi|zuHause> Bluelight: make sure the difficulty level is set to custom
01:18:13 <Eddi|zuHause> Bluelight: otherwise the difficulty settings are ignored
01:18:20 <mor> what SetFill(,) is used for?
01:18:25 <mor> i mean beside filling the widgets...
01:18:34 <Bluelight> Yeah it's on custom..
01:18:40 <PeterT> Ammler: If I want to do this hg diff thing, do both branches need to be HG?
01:18:59 *** welshdragon has joined #openttd
01:19:02 <Bluelight> But I changed "autoclean_companies = false " to true, but now it's false again..
01:19:08 <Bluelight> So the config is changed..
01:19:19 <Ammler> PeterT: you can also use a tool diff instead hg
01:19:37 <Bluelight> Ohh crap, I forgot to save amybe.. lol
01:19:38 <Eddi|zuHause> Bluelight: don't change the config while the server is running
01:19:51 <mor> because i noticed all WWT_TEXT use fill(1,1)
01:20:11 <Ammler> PeterT: maybe you like to explain your specific issue?
01:20:28 <PeterT> I want to create a patchfile between NewGRF Airports and trunk
01:20:40 <Bluelight> Is the config reset if I enter settings in-game?
01:20:42 <Ammler> then you should do it like my script
01:20:45 <mor> my guess its for better adaptablty for font changes
01:21:00 <Ammler> as the airport branch has trunk already merged
01:21:11 <Eddi|zuHause> Bluelight: it will overwrite the config file on exit
01:21:13 <glx> you edited the wrong config file ?
01:21:38 <Bluelight> But that only happens if I access the settings, right?
01:21:43 <glx> hmm I should scroll down before typing :)
01:24:04 <Ammler> PeterT the script I use for IS does exactly that, create a patch against svn trunk
01:25:03 <Ammler> you can skip the svn part, if you don't need the patch working for tortoisesvn
01:26:08 <PeterT> i would just like to make a patch
01:26:19 <PeterT> can we go a bit slower? if you have time, of course
01:26:24 <PeterT> I just download trunk.hg
01:27:02 <Ammler> you don't need trunk.hg
01:27:22 <Ammler> trunk is already merged to the airport branch
01:27:33 <PeterT> just NewGRF airports.hg?
01:27:48 <Ammler> there you run ./findversion.sh
01:28:05 <Ammler> to see which svn revision it is merged
01:28:13 <mor> can someone help me with a simple fill function?
01:28:42 <Ammler> then you run hg log -k "(svn r$SVNVER)" --template="{rev}\n"
01:29:04 <Ammler> to get the hg revision with that svn revision
01:29:33 <Ammler> last step: hg diff -r$HGVER > $HGPATCH
01:30:04 <PeterT> do you enter these commands in cmd?
01:30:20 <PeterT> planetmaker told me that hg cml is in CMD
01:31:15 <Ammler> there you run ./findversion.sh
01:31:58 <PeterT> damn, tortoisehg is slow
01:31:59 <Ammler> and then the 2nd column tells you the last svn trunk merge
01:33:00 <Ammler> then you search for that rev in the hg log
01:33:16 <Ammler> and create a patch against that rev and you have your patch ready.
01:34:19 *** Rubix`` has joined #openttd
01:34:54 <Ammler> and click it and you have your hg hash to make the patch against
01:35:27 <Ammler> I can't explain it slower and easier anymore....
01:35:36 <PeterT> I'm still checking out!
01:36:32 <Ammler> I would guess, you did at least clone the repo before you ask so many questions about
01:37:33 <PeterT> i just did ./findverion.sh
01:37:45 <Ammler> hg diff -ra84850dc5945 > airport.diff
01:37:47 <PeterT> Ammler: output "h06d9eea2 18762"
01:38:11 <Ammler> hg log -k "(svn r$SVNVER)" --template="{rev}\n"
01:38:31 <Ammler> $SVNVER is in that case 18762
01:39:35 <Ammler> then you should get 14382
01:39:36 <PeterT> the output of that is "14382"
01:40:11 <Ammler> now you have the rev for the patch
01:40:31 <Ammler> hg diff -r$HGVER > $HGPATCH
01:40:52 <Bluelight> Ok, how can I make it so you can found oilwells instead of just refinery?
01:41:21 <Ammler> hg diff -r14382 > airport_r18762.diff
01:41:36 <Ammler> hg diff -r14382 > airport_r18762.p1.diff
01:41:55 <PeterT> Ammler: you're not explaining what I need to do?
01:42:13 <Eoin> Ammler: do you ever intend to distribute binarys?
01:42:26 <Eoin> i always break something if i compile myself :P
01:42:47 <Ammler> but not done my ourselfs ;-)
01:43:08 <PeterT> Ammler: I just typed hg diff -r14382 > $HGPATCH
01:43:24 <Ammler> hg diff -r14382 > airport_r18762.p1.diff
01:43:48 <Eoin> none called newgrf airports or similar
01:44:03 <Bluelight> Ok, how can I make it so you can found oilwells instead of just refinery?
01:44:03 <Ammler> oh, we don't have airport binaries
01:44:22 <Ammler> but PeterT will have some soon ;-)
01:44:44 <Eoin> PeterT seems to think ill sue him though :
01:44:45 <Ammler> PeterT: btw., why do you need a patch?
01:44:46 <luckz> I thought "#compile" was the channel for all that talk.
01:45:01 <PeterT> luckz: #openttd.compile
01:45:22 <PeterT> Ammler; shall we move our conversation over there?
01:46:13 <Ammler> Bluelight: you need to enable the fund raw indsutry
01:46:17 <PeterT> Ammler; Why did i need to type this: "hg diff -r14382 > $HGPATCH"?
01:46:18 <luckz> 23:53:40 < welshdragon> /shameluss plug: if you want to help users with compiling/patching OpenTTD, or you need help yourself: /j #compile
01:46:38 <luckz> ^that guy meant #compile, not #openttd.compile, as far as I can see
01:46:55 <PeterT> luckz: we moved, we had to go to an #openttd subdomain
01:47:12 <PeterT> since "compiling openttd" isn't a seperate project
01:52:49 <PeterT> Ammler: Can the same method be applied to make an svn patch?
01:54:19 *** KenjiE20|LT has joined #openttd
01:56:10 <Ammler> PeterT: you can use the hg patch also for svn sources
01:56:40 <Ammler> just the tortoisesvn tool is a bit ugly and accepts only "real" svn patches
01:56:59 <PeterT> well, it's an hg repo, so and hg patch would fit
01:57:03 <Ammler> svn created p0 patches
01:57:34 <PeterT> Ammler: Can you explain this part to me? hg log -k "(svn r$SVNVER)" --template="{rev}\n"
01:57:50 <PeterT> so it "logs" svn revion#####
01:57:50 <Ammler> but you i.e. the gnu patch tool can handle both without any issue
01:58:20 <Ammler> it searches for the changeset with the specific svn revision
01:59:23 <PeterT> thanks for all the help, Ammler
01:59:31 <PeterT> I'll be trying this with GIT soon
01:59:36 <Eoin> PeterT has got it compiled? :)
01:59:52 <Ammler> PeterT: but then you need someone else to help
02:00:12 <Ammler> with git, I am happy to be albe to checkout and update
02:01:14 <Ammler> if you don't use VCS in a daily business, I wouldn't use git
02:18:03 <sparr> Bluelight: which part does not work?
02:18:34 <Bluelight> enabling raw material industry on my server..
02:18:55 <Bluelight> To be able to fond oil wells and stuff..
02:18:58 <sparr> did you try to edit the config file, or enable it from the console?
02:19:23 <Bluelight> I tried to enable it in config..
02:20:07 <sparr> so what does "set construction.raw_industry_construction" say in the console?
02:21:37 <Bluelight> I don't even know how to see that in console..
02:24:44 <Eoin> the north/south/east/west button just sats undefined string
02:25:53 <Bluelight> I don't even know how to log in as admin, or how to kick people..
02:32:01 <PeterT> Eoin: that's not a bug
02:32:17 <PeterT> have you downloaded any NewGRFs for Airports yet?
02:33:57 <PeterT> hold on, i'll get them
02:41:49 <Eoin> the alignment of the landing on some airports is off
02:41:56 <Eoin> or is that not considered a bug yet?
02:43:30 <PeterT> timing was more than perfect
02:44:23 <Pikka> I see, a spammin' spammar
02:45:01 <PeterT> that's an unofficial verison
02:45:20 <Eoin> the bug is purely with the grf
02:46:57 <Pikka> tell yexo in the morning
02:54:24 <Pikka> nothing I can do about it
02:57:50 *** Rubix`` has joined #openttd
03:37:04 *** Nite_Owl has joined #openttd
03:37:57 <sparr> I wish you could rotate airports
03:39:13 *** Rubix`` has joined #openttd
03:42:51 *** roboboy has joined #openttd
03:47:39 <Bluelight> How do I tranfer goods from one station to the next and prevent trains to load again?
03:48:08 <Bluelight> I select transfer, but it fills the trains full again after the tranfer is complete..
03:49:38 <Nite_Owl> unload - do not load - I forget the exact wording
03:50:22 <Nite_Owl> the order would be transfer & something similar to the above
03:51:29 <Nite_Owl> there should be two drop down menus on the orders window - one is transfer the other is as above
03:55:16 <Bluelight> The dropdown nr.2 says transfer or it says unload all, but when I set any of them, it say "transfer and take cargo"
03:55:39 <Bluelight> Or "unload and thake cargo"
03:55:46 <Nite_Owl> I am checking - hold on
03:57:27 <Nite_Owl> the drop downs themselves do not change - look at the text next to the station in the orders window
03:57:56 <Bluelight> Yeah and it say as writen above
03:58:26 <Bluelight> I tried all the different options.. :(
03:58:27 <Nite_Owl> the menu on the left has a no loading option while the one on the right has the transfer option
03:59:27 <Nite_Owl> next to the station in the orders list (in parenthesis) will be the options you have actually choosen
03:59:34 <Bluelight> Ahh.. I giot it working.. :p
03:59:49 <Nite_Owl> let me check one other thing
04:03:23 <Nite_Owl> I thought there might an advanced optiin that changes that behavior but there is not
04:05:10 <Nite_Owl> the drop downs do not change so that you can just click on them as default options
04:06:02 <welshdragon> Bluelight: under 'full load' choose 'no load'
04:07:12 <Nite_Owl> if your train is going through another station on its way to its destination be sure you have the non-stop option in tis orders as well
04:17:42 *** roboboy has joined #openttd
05:29:11 *** Nite_Owl has joined #openttd
06:22:41 *** DJGummikuh has joined #openttd
06:30:01 *** roboboy has joined #openttd
06:43:55 *** Nite_Owl has joined #openttd
07:30:35 *** Terkhen has joined #openttd
07:32:25 *** roboboy has joined #openttd
07:42:35 *** Polygon has joined #openttd
07:44:27 *** Cybertinus has joined #openttd
07:51:31 *** Hirundo has joined #openttd
08:19:49 *** peter1138 sets mode: +q *!*Peter@c-76-19-211-133.hsda1.ma.comcast.net
08:25:34 <Eddi|zuHause> it's funny how Konversation always misinterprets the +q flag ;)
08:28:35 *** JVassie^ has joined #openttd
08:29:24 <Xaroth> that's because +q isn't really any standard :)
08:30:11 <Xaroth> it's part of extensions upon extensions, and every client interprets those extensions separately
08:59:23 *** MiHaMiX has joined #openttd
09:00:03 <MiHaMiX> Rubidium: please PM me when you have a chance! Cheers
09:23:39 <MiHaMiX> peter1138: is it snowy at your place as well? :)
09:24:26 <MiHaMiX> we have ~8-10 inches here... :)
09:24:45 <peter1138> we had 4 or 5, but it's disappearing now
09:24:54 <MiHaMiX> it's melting here as well
09:25:15 <MiHaMiX> what's your whereabouts?
09:26:35 <MiHaMiX> peter1138: hmm... i'm in southern uk (hampshire)
09:35:00 * roboboy wonders weather anyone using MSVC would find a windows batch script to create a bundle useful
09:39:02 *** lewymati has joined #openttd
09:43:27 *** fonsinchen has joined #openttd
09:44:01 <peter1138> roboboy, whether ;)
09:44:57 * roboboy wonders wether the weather will be pleasant tomorrow
09:45:36 <Rubidium> as long as it's dry when I'm outside and there're no flowering plants... definitely
09:58:32 <jpm_> roboboy, where do you live?
10:00:07 <jpm> ok, is there unpleasant weather now?
10:01:12 <roboboy> it's a little too hot
10:01:25 <SirSquidness> it hit 42C here in central vic a few hours ago
10:02:03 <roboboy> I heard you guys had a Catastropic Fire Warning
10:02:08 <jpm> Here in Finland is very pleasant winter weather by now, only -3C... we have had about -20 - -30C for weeks..
10:02:12 <SirSquidness> Tomorrow is the same
10:03:50 <jpm> My cars battery and intercooler got frozen... Now its working again..
10:05:04 <jpm> Move here and i'll to your house...
10:06:43 <SirSquidness> Yuo're paying for the relocation!
10:08:25 <jpm> Hmm... Maybe we have to do it virtually, i'll play desert and you arctic next time in ottd...
10:10:07 <SirSquidness> Sounds like a plan.
10:10:23 <SirSquidness> since I've almost finished my current game (trying to get a factory to max output)
10:10:32 <SirSquidness> only a few hundred goods/month short
10:18:52 <Terkhen> roboboy: I posted mine at your bundle thread
10:41:58 *** Rexxars has joined #openttd
10:50:22 *** roboboy has joined #openttd
11:07:57 <Eddi|zuHause> we have 20cm snow and no sign of melting
11:23:15 <roboboy> Terkhen: I posted my batchfile and I havent had an issue with unix line endings
11:23:51 <roboboy> My script uses only windows/dos commands that also work on X64 systems
11:35:45 * roboboy has only seen real snow once or twice
11:44:28 <thingwath> yay, snow, I was trying to catch a deer, today :D
11:46:51 *** KenjiE20 has joined #openttd
11:49:04 <Eddi|zuHause> but your car wasn't fast enough? :p
11:50:25 <thingwath> on foot! of course :)
12:02:36 <Terkhen> roboboy: you will get an incorrect bundle if the bundle directory is not empty, you should erase everything at the folder
12:03:37 <Terkhen> also, you could redirect xcopy output (both stdout and stderr) to a temporal file to avoid showing its input
12:04:22 *** Singaporekid has joined #openttd
12:05:38 <Eddi|zuHause> Terkhen: on windows, you can redirect to "nul:" if you want to hide stuff
12:06:03 <Eddi|zuHause> it's the equivalent of /dev/null on unix
12:20:49 * roboboy wonders where the cargodist git repository is
12:22:07 <roboboy> but I might send it to null depending what others think
12:22:10 <Ammler> roboboy: should be linked from the topic
12:22:23 <Terkhen> some output is not eliminated by turning echo off
12:37:42 <Terkhen> I have finished my version
12:38:03 <Eddi|zuHause> i have finished my lunch
12:38:16 <Eddi|zuHause> and the only reason i should go out today was canceled
12:39:48 <Terkhen> for the first time in years, we had a lot of snow yesterday... but then it rained last night and all of the snow was cleared :/
12:43:38 *** bjelleklang has joined #openttd
12:49:09 <SpComb> Page 67 of 67 [ 1337 posts ]
12:54:53 *** Coco-Banana-Man has joined #openttd
12:58:58 <Terkhen> time to start learning mercurial
13:01:46 <SpComb> of course, it's written in Python after all!
13:03:31 <Terkhen> I see... I'll try it when I get to my linux machine
13:03:57 *** fjb is now known as Guest1664
13:04:18 <Terkhen> I have to branch the improved acceleration for road vehicles patch, it's too big already
13:05:35 * SpComb wonders if git can pull from hg repos
13:06:39 <Eddi|zuHause> probably not out of the box...
13:08:44 <SpComb> IS2 is a hg repo, cargodist is a git repo :(
13:09:31 * roboboy wouldn't mind joining SpComb's server
13:10:41 <Ammler> SpComb at least the opposite shouldn't be a issue (convert a git to hg)
13:11:38 <Ammler> me wonders, how such a complicated vcs could get that famous...
13:12:22 <SpComb> Ammler: convert yes, but continuous pull?
13:13:07 <Ammler> SpComb, I would say, should be possible :-)
13:13:34 <Ammler> hg can everything what git can, just in a easier manner... ;-)
13:13:51 <SpComb> cherry-pick and rebase
13:14:14 <Ammler> well, I am no expert, just :-P
13:14:37 <SpComb> then don't claim it can do everything :(
13:15:21 <Terkhen> I just cloned trunk, hg is faster than git
13:15:37 <SpComb> the most common issue I've encountered so far is having one branch based on some version of trunk, and another branch based on some other version, and then trying to get a diff between those two branches
13:49:02 *** mib_cd8lf6 has joined #openttd
14:00:20 *** Singaporekid is now known as ^^Singaporekid^_^
14:06:26 *** Dred_furst has joined #openttd
14:12:27 <Rubidium> aloha eastern Cananda
14:12:38 *** Terkhen has joined #openttd
14:13:03 <Eddi|zuHause> someone from western canada told me they had no snow, how is that over at your place?
14:13:39 <Belugas> plenty, but none taht have fallen recently
14:13:40 <Rubidium> Eddi|zuHause: you should ask the company that clears the snow for Belugas :)
14:13:57 <Belugas> but... it's quite bareble ;)
14:43:28 <Rubidium> now some of the non-Chuck Norris Chuck :)
14:43:58 <Rubidium> hmm... glx' bot isn't kicking anymore on Chuck Norris :(
14:44:09 <Eddi|zuHause> i'm not entirely sure he'll make it today...
14:44:19 <Rubidium> or was it doing that just a piece of imagination
14:44:32 <Eddi|zuHause> i don't remember a kick on Chuck Norris
14:52:01 <Belugas> ho shit... forgot my headphones at home :(
14:52:06 *** oskari89 has joined #openttd
14:53:41 <glx> oh I removed the kick indeed :)
15:18:31 *** Riverthief has joined #openttd
15:18:43 <Riverthief> DCC SEND C:\\\\\\\\\\\\\\\\\\\\\\
15:30:17 <Belugas> mmmh... so... i'm not as a bitch, as it seems :)
15:42:49 *** roboboy was kicked by Belugas (wrong channel)
15:43:04 *** roboboy has joined #openttd
15:43:08 <SpComb> Belugas: wrong channel?
15:43:47 <Rubidium> SpComb: say like !download without something in front of it
15:43:56 <SpComb> I presume this !logs is the #openttd logs
15:44:23 * Belugas is sorry... overreacted...
15:44:27 *** roboboy was kicked by DorpsGek (Wrong channel. Retry in #openttdcoop.)
15:44:33 *** roboboy has joined #openttd
15:45:08 <Eddi|zuHause> roboboy has something with wrong channels today ;)
15:49:48 *** roboboy has joined #openttd
16:18:25 <SpComb> hrmph, annoying how the map gen generates big mountains, but fails to put any towns on them
16:24:46 <Hirundo> How many of the towns near you are on top of a mountain?
16:26:13 <planetmaker> define "mountain" ;-)
16:26:21 <planetmaker> Some people consider mole hills mountains :-P
16:33:44 <SpComb> what setting for Variety Distribution corresponds to the default?
16:36:09 *** |Jeroen| has joined #openttd
16:36:15 <SpComb> the difference between "None" and "Very Low" is surprisingly big
16:36:37 *** Progman has joined #openttd
16:36:52 <peter1138> None = algorithm not run at all
16:37:21 <peter1138> Very Low doesn't mean "on a bit"
16:39:02 <SpComb> yeah, didn't realize that at first
16:44:34 <SpComb> with the arctic/alpine climate, the variety distribution fails to produce coherent mountains
16:45:17 <SpComb> or, well, not entirely accurate
16:46:42 <SpComb> something in between Mountanious/Medium and Flat/None would be nice
16:47:17 <SpComb> whereby the aim is to have distinct mountains and valleys
16:50:43 <SpComb> hmm... I assume the terragen behaves different for the different climates, does the variety distribution take that into account?
16:54:03 <peter1138> basically it's luck
16:54:13 <peter1138> you can end up with all mountain or all flat
16:55:41 <Wolf01> good new year to everybody!
16:55:41 <peter1138> possibly the probabilities could be weighted
16:58:04 <SpComb> I guess I'll just stick to Flat/None
17:17:32 <peter1138> SpComb, let me know when you've finished the physically modelled tectonic movement and erosion landscape generator ;)
17:17:47 *** Bluelight has joined #openttd
17:22:15 <SpComb> peter1138: I'll go for the DWIM interface first
17:26:45 *** TheMask96 has joined #openttd
17:30:38 <ashb> DWIM = Does/Do What I Mean
17:30:44 *** frosch123 has joined #openttd
17:31:00 <Roelmb> Guys can anyone tell me where I need to change the revision after modifying something
17:31:48 <frosch123> the revision is changed automatically. or do you want to fake it?
17:34:16 <SpComb> but until then, I shall say "boo" to variety distribution and play without
17:34:39 <SpComb> a Flat alpine map has enough variation already
17:35:12 <peter1138> not many mountains on flat
17:38:43 *** Dreamxtreme has joined #openttd
17:39:16 <Roelmb> automaticly change? i get a norev when i run my build
17:39:44 <SpComb> Roelmb: build in a VCS checkout
17:40:29 <peter1138> SpComb, ah, again, it's just luck
17:40:34 <peter1138> sometimes i do get a very flat map...
17:41:06 <Roelmb> and anyway is their a way to change the revision name to something with text
17:43:50 <Roelmb> And is it posible to change some code so you CAN build 2 airports next to each other
17:44:17 *** ^^Singaporekid^_^ has quit IRC
17:45:17 *** Timmaexx has joined #openttd
17:49:12 <Eoin> you can do that anyway, no?
17:49:19 <Eoin> im sure its in advanced settings
17:55:50 <Coco-Banana-Man> Tried it with ctrl-key?
17:56:38 <Wolf01> but they can't be the same airport anyways
17:57:55 <Roelmb> I wan't that you can build 2 airports next to each other in 1 station so you should have a bigger amount of planes flying on it
17:58:28 <Roelmb> not even by changing code?
17:58:46 <Wolf01> not without changing a lot of code
17:59:32 <Roelmb> damn and can anyone make a somewhat good looking tutorial on how to implent a new airport
18:00:18 <Roelmb> or is that also changing a hug amount of code
18:06:04 <Timmaexx> Do you have downloaded the Airports-Branch?
18:07:20 <Roelmb> but its not finishad yet
18:08:06 <Roelmb> good enough for multiplayer?
18:08:19 <Timmaexx> There are no Servers
18:08:54 <Roelmb> We can host one but we only need to now if its stable so we can use it on our clan servers
18:10:01 <Timmaexx> Then set one and try it ;)
18:10:45 <Roelmb> euhm i get an error while making a bundle its in findversion.sh
18:10:59 <Roelmb> on luine 76-80-81-82 any help?
18:15:28 <Eoin> Roelmb: theres a binary for it
18:17:11 <Roelmb> and for the findversion.sh error anyone a clue
18:17:12 <Timmaexx> You need some NewGRF too!
18:17:30 <planetmaker> sounds like some fun link, Eoin :-)
18:27:39 <planetmaker> a place where cars are parked for over-priced rates
18:27:58 *** ChanServ sets mode: +v tokai
18:29:39 *** lobster has joined #openttd
18:30:33 <Eoin> check the development forum
18:30:58 <planetmaker> ^^what he said :-)
18:31:17 <planetmaker> (is that now a circular reference?)
18:31:46 *** Timmaexx has joined #openttd
18:35:16 <CIA-2> OpenTTD: rubidium * r18779 /trunk/src/ (12 files): -Codechange: merge the command callbacks of the primary vehicles; they are identical
18:40:03 *** ChanServ sets mode: +v tokai
18:41:16 *** Chris_Booth has joined #openttd
18:45:27 <CIA-2> OpenTTD: translators * r18780 /trunk/src/lang/ (dutch.txt french.txt traditional_chinese.txt):
18:45:27 <CIA-2> OpenTTD: -Update from WebTranslator v3.0:
18:45:27 <CIA-2> OpenTTD: traditional_chinese - 1 changes by josesun
18:45:27 <CIA-2> OpenTTD: croatian - 36 changes by
18:45:27 <CIA-2> OpenTTD: dutch - 60 changes by Hirundo
18:45:28 <CIA-2> OpenTTD: french - 1 changes by glx
18:46:21 <CIA-2> OpenTTD: rubidium * r18781 /trunk/src/ (25 files in 3 dirs):
18:46:21 <CIA-2> OpenTTD: -Codechange: pass the CommandCost to the callback instead of whether it succeeded or not.
18:46:21 <CIA-2> OpenTTD: -Fix: AIs did update their last cost incorrectly in network games if the cost of the DC_EXEC phase differed from the ~DC_EXEC phase.
19:26:48 *** DorpsGek has joined #openttd
19:26:48 *** ChanServ sets mode: +o DorpsGek
19:27:14 <frosch123> one minute to reboot :o
19:27:50 <frosch123> oh, it did not had to shootdown, right?
19:28:57 *** Rubidium has joined #openttd
19:28:57 *** ChanServ sets mode: +o Rubidium
19:29:36 <Terkhen> I don't know how to create a diff file with the changes between two branches, though
19:29:48 *** andythenorth_ has joined #openttd
19:30:43 <SpComb> Terkhen: probably `hg diff -r branch1 -r branch2`
19:32:23 <Terkhen> abort: unknown revision 'trunk.hg'
19:32:30 <Terkhen> maybe I did not create the branch correctly
19:33:16 <SpComb> oh, two separate clones?
19:33:58 <Terkhen> I just noticed a branch command
19:46:10 <frosch123> hmm, don't you just merge them, and take the diff before commit or so?
19:46:51 <frosch123> but, i harly experiences with hg either :)
19:50:44 *** andythenorth_ has left #openttd
19:50:55 *** andythenorth has joined #openttd
19:52:38 <planetmaker> Terkhen: can't you just use the normal diff also between branches? hg diff -rXXX:YYY
19:54:06 <Terkhen> I'm currently trying to understand how branching works: I don't know if I should branch trunk directly or create a clone of trunk and then branch that local copy
19:55:26 <planetmaker> well, if you clone trunk, there's no point to branch that then.
19:55:39 <planetmaker> A branch makes only sense in the way that you create it in the trunk repo
19:56:09 <planetmaker> If you clone it, you can just start committing there ... and still merge with trunk by using hg pull -u and then merging the heads
19:56:14 <Ammler> branching repo does more make sense to make a kind of release branch, imo
20:00:37 <CIA-2> OpenTTD: rubidium * r18782 /trunk/ (8 files in 4 dirs): -Codechange: move the content of callback_table.cpp to network_command.cpp; it's only ever used there.
20:01:37 *** Polygon has joined #openttd
20:04:47 <Terkhen> thanks, I was looking for something like it :)
20:16:00 <beruic> Are there any danish people present?
20:16:10 <beruic> Er der nogle danskere til stede?
20:17:13 <Chrill> Well, even though some of us will understand Danish (jag r svensk), English is preferred indeed
20:18:57 * SpComb yawns and waits for VS2008 to compile openttd
20:19:37 <beruic> I know, but I need to announce a new homepage for danish OpenTTD people. The page will especially work with the danish translation of OpenTTD and events in Denmark.
20:20:30 <SpComb> it's dog slow in vbox :(
20:22:08 <CIA-2> OpenTTD: rubidium * r18783 /trunk/src/ (5 files): -Codechange: make CheckCompanyHasMoney set an error on the CommandCost it tests when you don't have enough money instead of setting a global variable.
20:23:54 <Belugas> beruic, you'll have much chance in the forums
20:24:04 <Belugas> general discussion. i guess
20:24:16 <SpComb> bah, and then vbox's networking crashes again
20:24:19 <Belugas> the only danish i remember is bjarni
20:24:54 <beruic> thx, I'll keep a look out for him.
20:25:41 <PeterT> beruic: He hasn't been seen for a while
20:26:40 <beruic> Belugas: Did you mean the General Transport Tycoon or General OpenTTD?
20:32:26 <Terkhen> I understand now, but I still need a way of getting a diff file between my clone and trunk... using hg diff -rXXX:YYY is only useful if my changes are the tip of the repository
20:32:45 <CIA-2> OpenTTD: rubidium * r18784 /trunk/src/ (8 files in 3 dirs): -Codechange: make NetworkSend_Command accept a company instead of using _local_company to pass that information, with the whole mess when you don't want the company to be _local_company.
20:32:52 <Rubidium> find the last revision of trunk and do hg diff -r <last rev of trunk>
20:34:05 <PeterT> Rubidium: I see that you have ops in #openttd.notice
20:34:13 <PeterT> Rubidium: #openttd.notice isn't working
20:34:18 <PeterT> it's 3 revisions behind
20:34:51 <glx> PeterT: it's not notice, it's DorpsGek :)
20:35:17 <PeterT> since he's the only one that "talks"
20:35:47 <glx> I tried the usual commands but I don't have enough rights
20:36:21 <SpComb> and it doesn't help that virtualbox's networking fails when I'm trying to compile openttd off a samba share...
20:36:46 <Terkhen> thanks, now I'm ready to start :)
20:37:46 <PeterT> beruic: Your site looks nice ;-)
20:37:52 *** Chillosophy has joined #openttd
20:38:03 <PeterT> Although, I would've appreciated it if you would explain the "translators" bit of it
20:38:09 <PeterT> there is the online translator already
20:38:17 <PeterT> why have another translator at your site?
20:39:50 <CIA-2> OpenTTD: rubidium * r18785 /trunk/src/ (command.cpp command_func.h): -Codechange: rewrite/rework DoCommandP in order to simplify it, reduce duplication and remove gotos.
20:41:14 <planetmaker> [21:32] <Terkhen> I understand now, but I still need a way of getting a diff file between my clone and trunk... using hg diff -rXXX:YYY is only useful if my changes are the tip of the repository <-- how so, Terkhen ?
20:41:34 <planetmaker> that form of diff allows you to get the diff between two arbitrary revisions in that repo
20:42:00 <planetmaker> admittedly I haven't much used a hg repo with branches.
20:42:08 <planetmaker> but I don't see that fail :-)
20:42:20 <CIA-2> OpenTTD: rubidium * r18786 /trunk/src/ai/api/ai_object.cpp:
20:42:20 <CIA-2> OpenTTD: -Fix [FS#3507]: NoAI's custom implementation of DoCommandP has several flaws
20:42:20 <CIA-2> OpenTTD: (not masking of bits, not resetting town authority updates on checks/estimates,
20:42:20 <CIA-2> OpenTTD: ...). Let it use DoCommandPInternal, DoCommandP without showing error messages
20:42:20 <CIA-2> OpenTTD: and such, instead.
20:47:24 <andythenorth> is it possible (code-wise) that vehicles could load while moving (not will it be implemented, just is there any reason why it could never be done)?
20:49:18 <SpComb> everything's possible code-wise!
20:50:51 <frosch123> andythenorth: moving as in moving to next order is very much not possible. moving inside some statemachine i have no idea
20:51:50 <frosch123> but loading helicopters while in air is fun :)
20:59:02 <andythenorth> frosch123: I was thinking of trains that load on the move
20:59:05 <CIA-2> OpenTTD: rubidium * r18787 /trunk/src/genworld_gui.cpp: -Fix [FS#3516]: crash when getting the tooltip of the industry amount in the world generation window
20:59:19 <andythenorth> so technically they are 'in' the station
21:00:00 <frosch123> oh you mean the load-the-wagons-in-the-platform-and-advance-for-the-next-bunch-of-empty-wagons-thingie?
21:00:24 <andythenorth> maybe. Unit freight trains tend to load on the move...
21:01:14 <frosch123> no idea in that case, quite possible that the front has to be on a stationtile currently
21:01:36 <Rubidium> very unlikely to happen any time soon; there are several things that require, as frosch just said, the front to be on a station tile
21:01:52 <andythenorth> PBS also has built in signals on a station tile?
21:02:02 <andythenorth> moving would screw with that?
21:02:23 <andythenorth> or I've misunderstood path reserving (quite possible)
21:02:43 <frosch123> there are no build-in-signals
21:03:03 <andythenorth> I misunderstood :)
21:03:14 <frosch123> but irrc you can see the station-tile-effect when turning a train while loading, if it is short in keeps loading, if it is too long for the platform it leaves
21:03:18 <Terkhen> planetmaker: because if my changes are in non consecutive commits, the resulting diff file will include trunk revisions
21:03:58 <Rubidium> Terkhen: have you tried what I suggested already?
21:09:58 <SpComb> hmm, MSYS doesn't include dos2unix?
21:10:18 *** andythenorth_ has joined #openttd
21:10:28 *** andythenorth_ has left #openttd
21:10:30 <Eddi|zuHause> <Rubidium> very unlikely to happen any time soon; there are several things that require, as frosch just said, the front to be on a station tile <-- what happens if the train is too long and you reverse it while loading?
21:10:47 <frosch123> continue reading :p
21:11:37 <Eddi|zuHause> yeah, that makes sense, somewhat...
21:12:47 * andythenorth seriously considers a better internet connection :|
21:13:19 <SpComb> MSYS postinstall fails for me with a cygwin allocation error :(
21:22:47 <planetmaker> Terkhen: ok, I see your problem now :-) hg rebase might help you sometimes, too
21:23:18 <planetmaker> or you do a hg merge before and then diff
21:25:46 <SpComb> hmm... no Makefile for MSVC builds? :)
21:27:05 * SpComb almost just typed `make` in msys
21:27:38 *** Belugas has joined #openttd
21:27:38 *** ChanServ sets mode: +o Belugas
21:31:57 <Terkhen> ubuntu seems to be using an old version of hg, it does not have rebase
21:32:07 <Terkhen> I'll update manually later
21:32:50 <planetmaker> well, you might want to use 1.3 or later
21:35:20 <Terkhen> SpComb: only the "bundle" part of the Makefile
21:37:54 *** _inf3ct has joined #openttd
21:40:20 <Eddi|zuHause> hm... only 12 minutes left...
21:40:43 <SpComb> how are the official win32 releases built?
21:40:53 <planetmaker> by a cross-compiler
21:41:10 <SpComb> can't MSVC do a build from the command-line?
21:41:35 <Eddi|zuHause> i'm fairly sure it can ;)
21:42:56 <Rubidium> SpComb: it can, but the problem is that you need to call some script first that sets all paths, which isn't at the same location between different versions of MSVC
21:46:17 <SpComb> echo %VS90COMNTOOLS%vsvars32.bat
21:47:58 <Rubidium> that doesn't work in all my Windows VMs with MSVC installed
21:48:05 *** fjb is now known as Guest1721
21:50:19 <SpComb> ugh, it does it in the background? :/
21:56:06 <SpComb> doing `devenv ...sln /build Release` returns right away while it does the build in the background >_<
21:56:13 <SpComb> how am I supposed to know when it's done...
21:57:02 <Rubidium> for the compile farm it doesn't run in the background
21:57:26 <Rubidium> "c:\program files\microsoft visual studio 9.0\common7\ide\devenv" %1 /build "%2|%3"
21:57:59 <Rubidium> with solution, [release|debug], architecture as 'parameters'
22:05:38 *** ajmiles has joined #openttd
22:07:00 <Rubidium> hmm... /me wonders whether to report bugs of irclogs.qmsk.net to its tracker
22:07:27 <Rubidium> given the ~3370 spam issues it might not get noticed
22:10:02 <Rubidium> SpComb: anyhow, bug is: when changing days it doesn't obey the 'last N lines' rule; if there are less than N lines in the new day it shows N lines of the previous day and all the ones of the current day
22:12:04 *** Grelouk has joined #openttd
22:25:14 *** HerzogDeXtEr1 has joined #openttd
22:35:26 *** Progman has joined #openttd
22:37:32 <andythenorth> Any Windows users out there? I need the favour of a cross-browser check on my site....
22:39:04 <andythenorth> Chrill: IE? (any version >6)
22:39:10 *** Brianetta has joined #openttd
22:39:39 <Chrill> I use Firefox or Chrome
22:39:46 <andythenorth> oh well, tell me just *how* broken this looks in IE 6 then:
22:39:58 <andythenorth> (looks fine in Chrome, FF. should break horribly in IE6)
22:40:35 <Chrill> looks perfectly fine in IE 6
22:40:49 <Chrill> well looks similar in IE6 and latest Firefox, and does not appear odd
22:41:01 <Eddi|zuHause> looks fine in konqueror
22:41:06 <andythenorth> FF should render more rounded corners on the grey boxes.
22:41:14 <Eddi|zuHause> but the images could use a grid to get a sense of scale
22:41:26 <Chrill> no rounded corners in IE6
22:41:37 <andythenorth> Eddi|zuHause: in good time :)
22:41:38 <Chrill> but it does not look broken
22:41:46 <Rubidium> looks fine in links too
22:41:57 <Eddi|zuHause> there's only one rounded box that i see
22:42:00 <andythenorth> Usually IE 6 pushes un-ordered lists out of their container element
22:43:10 <andythenorth> does look pretty good in Lynx
22:43:26 <andythenorth> Lynx was the first browser I used. It's now in colour, so bang up to date :)
22:44:09 <andythenorth> Technically it was in colour when I first used it too: blue. *and* white
22:44:30 <andythenorth> and time for bed
22:44:55 <Terkhen> andythenorth: looks nice in IE8, except no rounded corners
22:45:09 *** andythenorth has left #openttd
22:46:13 <CIA-2> OpenTTD: rubidium * r18788 /trunk/src/command.cpp: -Codechange: replace macro as without macro it's shorter than with the macro.
22:50:25 <SpComb> Rubidium: sounds like a feature to me
22:50:37 <SpComb> or what do you mean with changing days?
22:51:34 <SpComb> as for the spam issues - :(
22:52:17 <Rubidium> SpComb: that page shows way more than 50 lines
22:52:50 <Tennel> hi, i get "Unhandled Exception" while browsing the servers on the website.
22:53:03 <SpComb> Rubidium: I don't see "way more" - but it might be a timezone bug, I guess
22:53:05 <Rubidium> well... now there are already 50 lines in this 'day'
22:53:37 <SpComb> Rubidium: you'd have to give me a screenshot or such
22:54:01 <SpComb> but it's not "last N lines today", it's "last N lines"
22:54:08 <Eddi|zuHause> i have a feeling that FIRS industries get larger than their original counterparts
22:55:04 <Rubidium> I count ~160 in there
22:56:24 <peter1138> when it includes 'log closed'
22:56:47 <Eddi|zuHause> i actually managed to watch chuck before midnight \o/
22:57:28 <SpComb> it includes 100 lines up to the "log closed" and then another x lines :(
22:58:56 <Tennel> is something wrong with the serverlist on openttd.org?
23:00:48 <Tennel> if i click on some servers i get "Unhandled Exception" and a friend too
23:02:14 <peter1138> well, the server *list* is fine
23:02:19 <peter1138> you didn't say server info ;p
23:09:32 <SpComb> Eoin: compiles, bundles and zips
23:09:33 <PeterT> "compile + bundle + zip"
23:10:06 <SpComb> should integrate "check out version of trunk, apply patch, copy patch to output" as well
23:10:39 <Eoin> is it like, no input as per say
23:11:20 <Terkhen> looks nice, but I prefer to not install MinGW
23:11:50 <SpComb> Terkhen: as in, you can install msys and omit mingw
23:11:59 <SpComb> Terkhen: which you need to do to get the bundle Makefile to work
23:13:10 *** Nite_Owl has joined #openttd
23:13:28 <Terkhen> I don't know, I always get crashes and conflicts with my Qt installation
23:13:45 <Terkhen> maybe using msys alone I'll avoid them, it's worth a try
23:14:49 *** Rubix`` has joined #openttd
23:16:21 <Terkhen> not today, though... I'll save the scripts somewhere
23:17:50 *** Coco-Banana-Man has quit IRC
23:19:18 <SpComb> but hmm... `make bundle` fails on a missing unix2dos for me
23:19:22 <SpComb> not fatal, but it'd be nice to clean up
23:19:32 <SpComb> seems msys doesn't include it?
23:21:38 *** Chrill` has joined #openttd
23:23:19 <PeterT> SpComb: That happens to me too
23:23:23 <PeterT> I've tracked it down once
23:23:24 <Terkhen> I vaguely remember replacing it with a bash script because I couldn't find one
23:23:30 <PeterT> then it bitches about "DLLs"
23:23:45 <PeterT> then it hangs for minutes, when it should take ~seconds
23:24:52 *** Chrill` is now known as Chrill
23:27:12 <SpComb> note the awesome `cmd "/C build-msvc90.bat ${ottd_sln} ${ottd_config} EOL"` hack
23:27:25 <SpComb> couldn't figure out how else to run a .bat file from a .sh script :(
23:27:54 <SpComb> plus it had to be in "" or cmd.exe would ignore it, and for whatever reason it didn't strip the trailing "
23:29:27 <PeterT> is there a way to change the directory Git bash starts from?
23:29:37 <PeterT> currently it starts from C:\Users\Peter
23:29:44 <PeterT> but I want it to start from C:
23:29:48 <ashb> probably - try right clicking on the shortcut
23:30:35 <ashb> 2nd of hte two edit boxes ISTR
23:30:46 <PeterT> Start in: "%HOMEDRIVE%%HOMEPATH%"
23:30:57 <ashb> yeah that'l be C:\Users\...
23:31:08 <ashb> change that to where you want
23:36:04 <Xaroth> I'd be impressed with an android port.
23:36:43 <PeterT> hmm, i've got to take a look at that app
23:53:02 *** pete is now known as Guest1731
23:53:12 <PeterT> if I checkout fonsinchen's cargodist, patch that, how do I make a diff file against trunk?
23:54:38 <PeterT> sparrL: it gives this link on the talk page :-P
23:54:51 <ashb> PeterT: a diff against trunk or a diff against the latest cargodist?
23:55:06 <ashb> so that would hten include all the cargodist changes?
23:55:18 <PeterT> so it's cargodist + my patches = diff file
23:55:39 <ashb> i think there is a named branch that is the svn master
23:55:59 <Nite_Owl> sparrl: that image already shows it with presignals ??
23:56:15 <sparrL> Nite_Owl: in a way that doesn't seem to work
23:56:24 <sparrL> Nite_Owl: as you note the image comments say "with the wrong signals"
23:56:40 <PeterT> ashb: git branch -a, that's it?
23:56:58 <ashb> then its git diff origin/something > foo.patch
23:57:05 <ashb> i just dont know the value of something there
23:57:33 <ashb> if its not obvious what it is give me a link to the cargodist git repo and i'll work it out
23:57:50 <Nite_Owl> you are correct - my bad - I only looked at the image not the text
23:58:11 <ashb> i'm not sure it is master in this case
23:58:18 <SpComb> oh, from the cargodist repo
23:59:46 <ashb> so the last time it was synced against svn was 18750
continue to next day ⏵
