headers
Nils Kneuper | 1 Jan 2007 18:53
Picon

Wesnoth: String changes for the 1.2 branch

Hiho everybody!
I just wanted to ask you to commit all your little string changes you 
have for 1.2 asap. I did promise translators to at least wait one week 
after the last string changes that were followed by a pot-update. We 
only had some very small bugs in 1.2 and it looks like all the known 
ones that appeared after the release are fixed. So it might be nice to 
release 1.2.1 in one or two weeks. That is why I ask you to commit 
string changes meant for 1.2 ASAP. If you have no changes: fine. If you 
have some that take more time, please mail me so that we can decide if 
we should wait for the changes and another week of string freeze before 
releasing 1.2.1, or if we should first release and change afterwards.
I also wanted to thank you one more time for your hard work on 1.2, it 
looks like it was an almost bug free and so to say perfect release. Thanks.
Greets,
Nils Kneuper aka Ivanovic

PS: It would be nice if you mentioned string changes for the 1.2 branch 
in your commit messages.
Permalink | Reply | 0 comments |
headers
Mark de Wever | 1 Jan 2007 21:17
Picon
Picon
Favicon

Re: Merge of the terrain branch

On Sun, Dec 31, 2006 at 06:07:44PM +0100, Isaac Clerencia wrote:
> On Sunday, 31 December 2006 17:59, Moritz Göbelbecker wrote:
> > So I'd prefer to merge the new terrain system soon.
> I'm all for including it in 1.3.1 if it's ready soon :)

I'm also in favour of merging before 1.3.1 :) 
Here's a status update
* mog finished the conversion of the terrain config files
* Darth Fool wrote a conversion script for the current maps
* most of the code in the branch is ready and had minor testing (the 
cavegenerator is the biggest expection but this will be done while
converting Httt since it's the only user of this part of the code).

I want to test some more this week and start to convert the campaigns
first. Therefore I want to ask a freeze on the relevant files so I can
make the changes without merge problems. I want to start the freeze at
Saturday the 6th of January 00:00:01 (GMT). The following files / 
directories will fall under the freeze

data/campaigns/
data/factions/
data/utils.cfg
data/abilities.cfg
data/scenario-test.cfg

If people know more files / directories I should look at please let me
know.

While looking for users of terrains I ran into these files, does anybody
know whether these files are still used and need an update or that they
(Continue reading)

Permalink | Reply | 0 comments |
headers
Mark de Wever | 6 Jan 2007 00:41
Picon
Picon
Favicon

Partial trunk freeze

As stated before I wanted to freeze the trunk today, since I've got zero
objections I assume all agreed.

The following files/directories are frozen for now
data/campaigns/*
data/factions/*
data/utils.cfg
data/abilities.cfg
data/scenario-test.cfg
data/tutorial/*
data/scenarios/multiplayer/Random*

Regards,
Mark de Wever aka Mordante/SkeletonCrew
Permalink | Reply | 0 comments |
headers
Mark de Wever | 20 Jan 2007 20:37
Picon
Picon
Favicon

Terrain branch update + trunk locking + merge plans

Hi,

I've converted and tested all campaigns except UtbS and the terrain
branch seems to work correctly (expect for some bugs inherited from
trunk.) UtbS will be converted this week.

Next weekend I'd like to convert all MP stuff and request a lock on
these files. Note the freeze of the Campaigns has been broken more than
once but thusfar it hasn't caused me trouble. Changing a map after
conversion _will_ give trouble so if somebody objects against a freeze
let it know now. If I don't get objections I regards the MP stuff being
frozen starting on the 27th of January (GMT).

Once I've converted all stuff I would like other people to also test my
branch especially the MP part, since I'm not familiar with MP there
might be things I miss. Once the conversion is done I'll also post the
test request in the forum.

At the moment I'm targetting for a mergeback on the 10th of February and
I would like to have a short full trunk freeze in order to merge the
stuff back. I'll post more about that when the merge back is getting
closer.

Regards,

Mark aka Morante/SkeletonCrew
Permalink | Reply | 5 comments |
headers
Nils Kneuper | 20 Jan 2007 22:31
Picon

Re: Terrain branch update + trunk locking + merge plans

Mark de Wever schrieb:
> Hi,
>
> I've converted and tested all campaigns except UtbS and the terrain
> branch seems to work correctly (expect for some bugs inherited from
> trunk.) UtbS will be converted this week.
>
> Next weekend I'd like to convert all MP stuff and request a lock on
> these files. Note the freeze of the Campaigns has been broken more than
> once but thusfar it hasn't caused me trouble. Changing a map after
> conversion _will_ give trouble so if somebody objects against a freeze
> let it know now. If I don't get objections I regards the MP stuff being
> frozen starting on the 27th of January (GMT).
>
> Once I've converted all stuff I would like other people to also test my
> branch especially the MP part, since I'm not familiar with MP there
> might be things I miss. Once the conversion is done I'll also post the
> test request in the forum.
>
> At the moment I'm targetting for a mergeback on the 10th of February and
> I would like to have a short full trunk freeze in order to merge the
> stuff back. I'll post more about that when the merge back is getting
> closer.
>   

I would really welcome having the merge done right now. This way it is 
possible to state "XYZ is broken atm and needs to be converted" and the 
stuff already converted can be tested in a nice manner. I know that UTBS 
would not work if this happens but at least the already converted 
content gets testing. I think atm there are not many users for the
(Continue reading)

Permalink | Reply | 4 comments |
headers
Rusty Russell | 21 Jan 2007 02:41
Picon
Gravatar

Re: Terrain branch update + trunk locking + merge plans

On Sat, 2007-01-20 at 22:31 +0100, Nils Kneuper wrote:
> Does anyone have other reasons to wait with the merge? Anyone agreeing 
> with me that it should be done now? I would really welcome that merge to 
> happen ASAP so that the engine gets as much testing from anyone as 
> possible. As long as it is in an extra branch I think there are not many 
> people testing it...

Is there a nice description of (1) the scenario author's view of
changes, and (2) the coder's view of changes?

I'd vote for merge...
Rusty.
Permalink | Reply | 2 comments |
headers
Mark de Wever | 21 Jan 2007 08:31
Picon
Picon
Favicon

Re: Terrain branch update + trunk locking + merge plans

On Sun, Jan 21, 2007 at 12:41:34PM +1100, Rusty Russell wrote:
> On Sat, 2007-01-20 at 22:31 +0100, Nils Kneuper wrote:
> > Does anyone have other reasons to wait with the merge? Anyone agreeing 
> > with me that it should be done now? I would really welcome that merge to 
> > happen ASAP so that the engine gets as much testing from anyone as 
> > possible. As long as it is in an extra branch I think there are not many 
> > people testing it...
> 
> Is there a nice description of (1) the scenario author's view of
> changes, and (2) the coder's view of changes?

(1) There is my user page with the system changes 
www.wesnoth.org/wiki/User:SkeletonCrew
which I'm still busy with also moving to the general wiki.
For UMC creators I'll post an announcement on the forum which will
explain to them what they've to to convert their campaigns to the new
format.

(2) Since the entire wesnoth developer documentation is virtually
non-existant I didn't write explicit documentation about it other than
the comment in the code and the my wiki page.

Of course both changelogs will also get updated before the merge.

Regards,

Mark
Permalink | Reply | 1 comment |
headers
jeremy rosen | 21 Jan 2007 18:37
Picon
Picon

Re: Terrain branch update + trunk locking + merge plans

I also am in favor of an early merge

Boucman

2007/1/21, Mark de Wever <koraq <at> xs4all.nl>:
> On Sun, Jan 21, 2007 at 12:41:34PM +1100, Rusty Russell wrote:
> > On Sat, 2007-01-20 at 22:31 +0100, Nils Kneuper wrote:
> > > Does anyone have other reasons to wait with the merge? Anyone agreeing
> > > with me that it should be done now? I would really welcome that merge to
> > > happen ASAP so that the engine gets as much testing from anyone as
> > > possible. As long as it is in an extra branch I think there are not many
> > > people testing it...
> >
> > Is there a nice description of (1) the scenario author's view of
> > changes, and (2) the coder's view of changes?
>
> (1) There is my user page with the system changes
> www.wesnoth.org/wiki/User:SkeletonCrew
> which I'm still busy with also moving to the general wiki.
> For UMC creators I'll post an announcement on the forum which will
> explain to them what they've to to convert their campaigns to the new
> format.
>
> (2) Since the entire wesnoth developer documentation is virtually
> non-existant I didn't write explicit documentation about it other than
> the comment in the code and the my wiki page.
>
> Of course both changelogs will also get updated before the merge.
>
> Regards,
(Continue reading)

Permalink | Reply | 0 comments |
headers
john w. bjerk | 22 Jan 2007 17:37

Re: AW: Terrain branch update + trunk locking + merge plans

Agreed.

On Jan 21, 2007, at 1:23 PM, Hansenet Mail wrote:

> I have no objections whatsoever. Thanks for the great work and the  
> lots of
> effort you have put into this, Mark :-)
>
> Greetings,
>
> Yogi
>
>
>
> -----Ursprüngliche Nachricht-----
> Von: wesnoth-dev-bounces <at> gna.org [mailto:wesnoth-dev- 
> bounces <at> gna.org] Im
> Auftrag von Nils Kneuper
> Gesendet: Samstag, 20. Januar 2007 22:32
> An: Mark de Wever
> Cc: wesnoth-dev <at> gna.org
> Betreff: Re: [Wesnoth-dev] Terrain branch update + trunk locking +  
> merge
> plans
>
> Mark de Wever schrieb:
>> Hi,
>>
>> I've converted and tested all campaigns except UtbS and the terrain
>> branch seems to work correctly (expect for some bugs inherited from
(Continue reading)

Permalink | Reply | 1 comment |
headers
Mark de Wever | 23 Jan 2007 20:09
Picon
Picon
Favicon

Re: Terrain branch update + trunk locking + merge plans

On Sat, Jan 20, 2007 at 10:31:57PM +0100, Nils Kneuper wrote:
> Mark de Wever schrieb:
> I would really welcome having the merge done right now. 
<cut> 
> Does anyone have other reasons to wait with the merge? Anyone agreeing 
> with me that it should be done now? I would really welcome that merge to 
> happen ASAP so that the engine gets as much testing from anyone as 
> possible. As long as it is in an extra branch I think there are not many 
> people testing it...
> Greets,
> Nils Kneuper aka Ivanovic

Since I've seen no objections to the merge I would like to merge next
weekend. (The MP stuff will be converted directly after the merge for
practical reasons.) I've posted a forum thread with the information
about the conversion [1] if there are questions about it ask them here
or on the forum.

I would like to request a full trunk freeze starting on Saturday the
27th of January (GMT) in order to do this merge. I expect the freeze to
last less than 1 day and will post once the merge has been completed.

If there are any objections against merging the terrain branch then
reply to the mailing list before the 27th. 

Regards,
Mark de Wever aka Mordante/SkeletonCrew

[1] http://www.wesnoth.org/forum/viewtopic.php?t=14910
(Continue reading)

Permalink | Reply | 0 comments |

Gmane