Infrastructure sharing 2.1.1

Forum for technical discussions regarding development. If you have a general suggestion, problem or comment, please use one of the other forums.

Moderator: OpenTTD Developers

ZxBiohazardZx
Tycoon
Tycoon
Posts: 1534
Joined: 14 Mar 2006 12:46
Location: Netherlands

Re: Infrastructure sharing 2.0 beta 3

Post by ZxBiohazardZx »

few quicky questions:

is this stil compatible with latest revision (or what is latest revision its compatible with)?
have there been any updates recently?
will this ever be included in trunk?
petert
Tycoon
Tycoon
Posts: 3008
Joined: 02 Apr 2009 22:43
Location: Massachusetts, USA

Re: Infrastructure sharing 2.0 beta 3

Post by petert »

ZxBiohazardZx wrote: have there been any updates recently?
no, this is the latest version, you can check for versions here
ZxBihazardZx wrote: will this ever be included in trunk?
i believe there is a page on the wiki that has suggestions for features to be in trunk.
Yexo
Tycoon
Tycoon
Posts: 3663
Joined: 20 Dec 2007 12:49

Re: Infrastructure sharing 2.0 beta 3

Post by Yexo »

petert wrote:i believe there is a page on the wiki that has suggestions for features to be in trunk.
That wiki page is named Suggestions and I'd like to quote the first line of it here:
This is a list of all discussed suggestions that may or may not make it into the game.
petert
Tycoon
Tycoon
Posts: 3008
Joined: 02 Apr 2009 22:43
Location: Massachusetts, USA

Re: Infrastructure sharing 2.0 beta 3

Post by petert »

Exactly, they are only suggestions. Thats what I said, isn't it?
dihedral
Tycoon
Tycoon
Posts: 1053
Joined: 14 Feb 2007 17:48

Re: Infrastructure sharing 2.0 beta 3

Post by dihedral »

suggestions that may or may not make it into the game is hardly a good answer to the question if the patch will be or not be accepted, it's as vague as could be!
User avatar
Gedemon
Traffic Manager
Traffic Manager
Posts: 150
Joined: 29 Apr 2004 21:53

Re: Infrastructure sharing 2.0 beta 3

Post by Gedemon »

great work on the patch :D

is there some sort of waypoint programming or route makers patch to use with it yet ?
2007Alain2007
Chief Executive
Chief Executive
Posts: 658
Joined: 11 Nov 2007 12:06
Contact:

Re: Infrastructure sharing 2.0 beta 3

Post by 2007Alain2007 »

how is the work going just wanted to hear what the patchers are doing with this
For Community Integrated Version http://code.google.com/p/civopenttd/
User avatar
Ammler
President
President
Posts: 953
Joined: 18 Jun 2006 18:18
Location: Switzerland
Contact:

Re: Infrastructure sharing 2.0 beta 3

Post by Ammler »

2007Alain2007 wrote:how is the work going just wanted to hear what the patchers are doing with this
http://dev.openttdcoop.org/search/index ... mit=Submit
2007Alain2007
Chief Executive
Chief Executive
Posts: 658
Joined: 11 Nov 2007 12:06
Contact:

Re: Infrastructure sharing 2.0 beta 3

Post by 2007Alain2007 »

Hi

I have seen that this has been Merge to r17683 but there is no patch file or any thing?
For Community Integrated Version http://code.google.com/p/civopenttd/
User avatar
planetmaker
OpenTTD Developer
OpenTTD Developer
Posts: 9432
Joined: 07 Nov 2007 22:44
Location: Sol d

Re: Infrastructure sharing 2.0 beta 3

Post by planetmaker »

There's no patch file. Check out the repository and compile that.
User avatar
Gremnon
Tycoon
Tycoon
Posts: 1517
Joined: 16 Sep 2005 12:23
Skype: the_gremnon
Location: /home
Contact:

Re: Infrastructure sharing 2.0 beta 3

Post by Gremnon »

This is going to sound really silly. But it has been a while since I used mercurial.
assuming (on linux) it's already installed... which damn command is it to checkout from a mercurial repo?

And, theory - if I checked out the matching trunk SVN revision too, and copied the changed files from the IS checkout over their SVN counterparts, would it not then be possible to generate a patchfile?
User avatar
jonty-comp
Tycoon
Tycoon
Posts: 2542
Joined: 22 Oct 2005 16:05
Location: Chesterfield, England
Contact:

Re: Infrastructure sharing 2.0 beta 3

Post by jonty-comp »

I'm hardly the expert on these things, but I want to get my 2000th post this evening. :P
Gremnon wrote:This is going to sound really silly. But it has been a while since I used mercurial.
assuming (on linux) it's already installed... which damn command is it to checkout from a mercurial repo?
Last time I checked it was

Code: Select all

hg clone <repo address>
then

Code: Select all

hg pull 
thereafter.
And, theory - if I checked out the matching trunk SVN revision too, and copied the changed files from the IS checkout over their SVN counterparts, would it not then be possible to generate a patchfile?
That sounds like it should work okay, but knowing computers there's probably some wacky restriction that means it won't work. :(
User avatar
planetmaker
OpenTTD Developer
OpenTTD Developer
Posts: 9432
Joined: 07 Nov 2007 22:44
Location: Sol d

Re: Infrastructure sharing 2.0 beta 3

Post by planetmaker »

Gremnon wrote:This is going to sound really silly. But it has been a while since I used mercurial.
assuming (on linux) it's already installed... which damn command is it to checkout from a mercurial repo?

And, theory - if I checked out the matching trunk SVN revision too, and copied the changed files from the IS checkout over their SVN counterparts, would it not then be possible to generate a patchfile?
It's even possible to generate a patch file straight from the repository as it's a full trunk repository which (besides all trunk revisions between r4517 and r17683) contains all changes which constitute all IS2 changes, past and present.

Code: Select all

hg clone http://dev.openttdcoop.org/hg/is2 is2
cd is2
./configure && make
hg diff -r13358:13456 > is2_r17683.diff
bin/openttd &
and you'll have a fully working OpenTTD-IS2 repository in the dir called is2, the patch file wrt r17683 trunk in is2_r17683.diff and just started the binary.
User avatar
Gremnon
Tycoon
Tycoon
Posts: 1517
Joined: 16 Sep 2005 12:23
Skype: the_gremnon
Location: /home
Contact:

Re: Infrastructure sharing 2.0 beta 3

Post by Gremnon »

Thanks - that worked perfect.
And since I'm feeling in a generous mood this evening, here's the patch for anyone else.
If I'm right, you'll have to use -p1 instead of -p0 to apply it.
Attachments
is2_r17683.diff
IS2 r17683
(1.28 MiB) Downloaded 105 times
rsdworker
Traffic Manager
Traffic Manager
Posts: 149
Joined: 18 Mar 2009 13:58

Re: Infrastructure sharing 2.0 beta 3

Post by rsdworker »

great what is fixed in that patch?
petert
Tycoon
Tycoon
Posts: 3008
Joined: 02 Apr 2009 22:43
Location: Massachusetts, USA

Re: Infrastructure sharing 2.0 beta 3

Post by petert »

I think it was just updated, maybe some bug fixes.
User avatar
Ammler
President
President
Posts: 953
Joined: 18 Jun 2006 18:18
Location: Switzerland
Contact:

Re: Infrastructure sharing 2.0 beta 3

Post by Ammler »

rsdworker wrote:great what is fixed in that patch?
Ammler wrote:
2007Alain2007 wrote:how is the work going just wanted to hear what the patchers are doing with this
http://dev.openttdcoop.org/search/index ... mit=Submit
Luckz
Engineer
Engineer
Posts: 20
Joined: 02 Aug 2006 03:48
Location: CGN / VLN

Re: Infrastructure sharing 2.0 beta 3

Post by Luckz »

Does anybody have win32 and maybe even win64 builds handy?
Rubidium
OpenTTD Developer
OpenTTD Developer
Posts: 3815
Joined: 09 Feb 2006 19:15

Re: Infrastructure sharing 2.0 beta 3

Post by Rubidium »

Luckz wrote:Does anybody have win32 and maybe even win64 builds handy?
Have you tried the links provided to you in the first post of this topic?
Luckz
Engineer
Engineer
Posts: 20
Joined: 02 Aug 2006 03:48
Location: CGN / VLN

Re: Infrastructure sharing 2.0 beta 3

Post by Luckz »

Ones based on that trunk patch thing from a few days ago.
The first post only gets me a patch, but I have no means to apply said patch and I just recently got rid of my VMWare install where I had some OS with compiling tools.
Post Reply

Return to “OpenTTD Development”

Who is online

Users browsing this forum: No registered users and 2 guests