patchFreeciv - Patches: patch #2270, [metaticket] allow recursive...

 
 
Show feedback again

patch #2270: [metaticket] allow recursive transports

Submitted by:  Matthias Pfafferodt <syntron>
Submitted on:  Mon Jan 3 23:04:24 2011  
 
Category: generalPriority: 5 - Normal
Status: DonePrivacy: Public
Assigned to: Matthias Pfafferodt <syntron>Open/Closed: Closed
Planned Release: 2.4.0Contains string changes: None

Add a New Comment (Rich MarkupRich Markup):
   

You are not logged in

Please log in, so followups can be emailed to you.

 

(Jump to the original submission Jump to the original submission)

Sun Oct 30 20:26:43 2011, comment #14:

all tickets are closed; closing also this one as done

Matthias Pfafferodt <syntron>
Project MemberIn charge of this item.
Tue Oct 25 21:02:57 2011, comment #13:

found the bug - units on the client there not marked as unloaded; rebased & fixed patches are added to all tickets

Matthias Pfafferodt <syntron>
Project MemberIn charge of this item.
Thu Oct 20 20:15:28 2011, comment #12:

there seems to be a bug on client exit - some more work to do ...

Matthias Pfafferodt <syntron>
Project MemberIn charge of this item.
Tue Oct 18 17:34:03 2011, comment #11:

I will commit this patch set to trunk this week if there are no objections.

autogame tests show small differences in the last seen time (I suspect the order of movement of transported units). For large games this can result in bigger differences, i.e one unit not seen by an AI. But I think it is working and should go into 2.4 ...

Matthias Pfafferodt <syntron>
Project MemberIn charge of this item.
Mon Oct 3 07:31:58 2011, comment #10:

I need more holiday - that's the svn version on my laptop - it's the one you have tried :-(

Got into some hassle to get an up-to-date freeciv version to rebase it (svn20296). I did not compile test this version but it does include some helpers to do autogames (patch #2972; hints from patch #2973).

Matthias Pfafferodt <syntron>
Project MemberIn charge of this item.
Mon Oct 3 07:14:38 2011, comment #9:

updated all-in-one patch (svn20285); I will send updated versions of the patch series then I'm back home from holiday

(file #14194)

Matthias Pfafferodt <syntron>
Project MemberIn charge of this item.
Sat Oct 1 17:06:23 2011, comment #8:

I know - and there are rebased patches on my computer at home (git is your friend); I will upload it at the time I'm back ...

Anonymous
Sat Oct 1 15:43:15 2011, comment #7:

For info, the last trunk rev I've been able to apply the latest all-in-one (file #13932) to is r20285; it seems to conflict with patch #2965 (haven't investigated).

Jacob Nevins <jtn>
Project Administrator
Fri Aug 19 23:16:25 2011, comment #6:

and an all-in-one patch

(file #13932)

Matthias Pfafferodt <syntron>
Project MemberIn charge of this item.
Fri Aug 19 23:00:58 2011, comment #5:

I did update the entire patch series. It is working but tests are still running. Due to changes in unit_move() autogames differ (transported units are moved after it is sure that the transporter survives). I'm working on an (optional) patch which will restore the old behaviour.

Order of the patches:

- [01/09] patch #2477 [transport09] use pointer for transported units (server/common)
- [02/09] patch #2547 [transport19] cleanup unit_move()
- [03/09] patch #2478 [transport10] use pointer for transported units (client)
- patch [04/09] patch #2479 [transport11] clean up network (occupied information of transporters)
- [05/09] patch #2482 [transport14] redo location selection
- [06/09] patch #2483 [transport15] add function to create unit type sprite
- [07/09] bug #17236 [transport18] unit selection dialog
- [08/09] patch #2480 [transport12] allow recursive transports
- [09/09] patch #2481 [transport13] allow Missiles on Mech. Inf. (experimental ruleset) - optional

An image of the new unit selection dialog (only gtk2 at the moment) can be found in file #13928 (experimental ruleset with patch #2481)

Matthias Pfafferodt <syntron>
Project MemberIn charge of this item.
Wed Mar 23 22:02:24 2011, comment #4:

I've played with this and been meaning to post some constructive comments for some time, but haven't got round to marshalling them, so for now I'll just say: good show, unit selection has been a weak point of Freeciv.

Hopefully I'll get to post my detailed comments at some point.

For anyone else wanting to play with this: the latest all-in-one patch doesn't apply to current trunk; the last version I've successfully applied it to is r19263. (You might also want the fix for bug #17677 to get a usable system.)

Jacob Nevins <jtn>
Project Administrator
Fri Feb 4 16:54:47 2011, comment #3:

this meta ticket implements recursive transports (transporters can be transported) as well as a new unit selection dialog for the gtk client with a common backend which can be used by other clients.

For easy testing an all-in-one patch will be available here

(file #12279)

Matthias Pfafferodt <syntron>
Project MemberIn charge of this item.
Thu Feb 3 10:57:28 2011, comment #2:

This is the current status for recursive transports. It also includes a new unit slection dialog (usdlg) for the gtk client (bug #17236). See attached images.

The patch is not perfect (some gtk errors and debug messages) but it is working. Included is a change to the experimental ruleset to allow Missile on Mech.Inf.

I will work on this patch then I find time.

(file #12233, file #12234, file #12235)

Matthias Pfafferodt <syntron>
Project MemberIn charge of this item.
Mon Jan 3 23:56:13 2011, comment #1:

This needs more changes; at the moment the units of level 2 and up are not moved with their transporter ...

Matthias Pfafferodt <syntron>
Project MemberIn charge of this item.
Mon Jan 3 23:04:24 2011, original submission:
  • up to level 3
  • please test and report bugs!
Matthias Pfafferodt <syntron>
Project MemberIn charge of this item.

 

(Note: upload size limit is set to 1024 kB, after insertion of the required escape characters.)

Attach File(s):
   
   
Comment:
   

Attached Files
file #14194:  20111003-transport.diff.bz2 added by syntron (35kB - application/x-bzip)
file #13932:  20110819-transport.patch added by syntron (170kB - text/x-patch)
file #12279:  20110204-transport.diff.bz2 added by syntron (66kB - application/x-bzip)
file #12233:  transport.diff.bz2 added by syntron (64kB - application/x-bzip)
file #12234:  transport01.jpg added by syntron (42kB - image/jpeg)
file #12235:  transport02.jpg added by syntron (41kB - image/jpeg)
file #11692:  rekursive_transport.jpg added by syntron (38kB - image/jpeg)

 

Digest:
   bug dependencies, patch dependencies.

Items that depend on this one: None found

 

Carbon-Copy List
  • -unavailable- added by jtn (Posted a comment)
  • -unavailable- added by syntron (Submitted the item)
  •  

    Do you think this task is very important?
    If so, you can click here to add your encouragement to it.
    This task has 0 encouragements so far.

    Only logged-in users can vote.

     

    Error: not logged in

     

     

    Follow 25 latest changes.

    Date Changed By Updated Field Previous Value => Replaced By
    Sun Oct 30 20:26:43 2011syntronStatusIn Progress=>Done
      Open/ClosedOpen=>Closed
    Mon Oct 3 07:32:55 2011syntronAttached File-=>Added 20111003-svn20296-transport.diff.bz2, #14195
    Mon Oct 3 07:14:38 2011syntronAttached File-=>Added 20111003-transport.diff.bz2, #14194
    Fri Aug 19 23:16:25 2011syntronAttached File-=>Added 20110819-transport.patch, #13932
    Fri Feb 18 14:18:58 2011syntronDependencies-=>Depends on patch #2547
    Fri Feb 4 16:54:47 2011syntronAttached File-=>Added 20110204-transport.diff.bz2, #12279
    Fri Feb 4 16:52:54 2011syntronDependencies-=>Depends on bugs #17236
    Fri Feb 4 16:52:18 2011syntronDependencies-=>Depends on patch #2464
      Dependencies-=>Depends on patch #2426
    Fri Feb 4 16:52:17 2011syntronDependencies-=>Depends on patch #2483
      Dependencies-=>Depends on patch #2482
      Dependencies-=>Depends on patch #2481
      Dependencies-=>Depends on patch #2480
      Dependencies-=>Depends on patch #2479
      Dependencies-=>Depends on patch #2478
      Dependencies-=>Depends on patch #2477
      Dependencies-=>Depends on patch #2476
      Dependencies-=>Depends on patch #2475
      Dependencies-=>Depends on patch #2474
      Dependencies-=>Depends on patch #2473
      Dependencies-=>Depends on patch #2472
      Dependencies-=>Depends on patch #2471
    Fri Feb 4 16:51:50 2011syntronDependencies-=>Depends on bugs #17644
    Thu Feb 3 10:57:28 2011syntronAttached File-=>Added transport.diff.bz2, #12233
    Show feedback again

    Back to the top


    Powered by Savane 3.1-cleanup