[Freeciv-Dev] [bug #19957] Move Lua tile:set_label() from tolua_game to tolua_server

2012-07-18 Thread Jacob Nevins
URL:
  

 Summary: Move Lua tile:set_label() from tolua_game to
tolua_server
 Project: Freeciv
Submitted by: jtn
Submitted on: Thu Jul 19 01:41:49 2012
Category: None
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 
 Discussion Lock: Any
Operating System: None
 Planned Release: 2.5.0

___

Details:

Patch #3136 added the tile:set_label() method to tolua_game.pkg. This is used
for both server- and client-side scripting. Since this an "edit" rather than
"read" function, it should probably only be available on the server
(tolua_server.pkg) -- while it can be invoked on the client, it doesn't seem
very useful to do so.

For consistency, it might want to appear in the 'edit' module too.




___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #19956] Remove Lua create_road(tile, ...) in favour of tile:create_road(...) etc?

2012-07-18 Thread Jacob Nevins
Update of bug #19956 (project freeciv):

 Summary: Deprecate Lua create_road(tile, ...) in favour of
tile:create_road(...) etc? => Remove Lua create_road(tile, ...) in favour of
tile:create_road(...) etc?


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #19956] Deprecate Lua create_road(tile, ...) in favour of tile:create_road(...) etc?

2012-07-18 Thread Jacob Nevins
URL:
  

 Summary: Deprecate Lua create_road(tile, ...) in favour of
tile:create_road(...) etc?
 Project: Freeciv
Submitted by: jtn
Submitted on: Thu Jul 19 01:28:07 2012
Category: None
Severity: 2 - Minor
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 
 Discussion Lock: Any
Operating System: Any
 Planned Release: 2.5.0

___

Details:

In patch #2514, the existing "classless" create_XXX() functions were augmented
by edit.create_XXX() module functions and type:create_XXX() methods. From
Matthias' work-in-progress update
 to the Lua docs, it's
clear he intended for the unadorned functions to be deprecated, and indeed
new-since-2.3 things like civil_war() are not available in unadorned form.

Since then, patch #3391 has added create_road() in all three forms. We should
probably remove the unadorned create_road() function for consistency before
this escapes.




___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #19955] gtk_menus.xml not installed if only Gtk3 client built

2012-07-18 Thread anonymous
Follow-up Comment #2, bug #19955 (project freeciv):

One at a time:
1. this patch looks good to me - you'll add that file only once if both gtk
clients are build, which is a good thing, cause otherwise it could break with
parallel make

2. as for freeciv.rc-2.0, as I mentioned it a different patch/bug, while most
likely trivial, I'd prefer if such a large volume change as GTK_CHECK_VERSION
cleanup would come from Marko (why yes, it's CYA at its best); IIRC, this file
already isn't used (though only in part by design; then again
gtk_rc_parse_string wouldn't have any effect anyway), after this cleanup, I'll
most likely be able to remove parts using GtkStyle, making the file pointless

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #3432] "Core" nation group

2012-07-18 Thread Jacob Nevins
Follow-up Comment #1, patch #3432 (project freeciv):

I assume this is at least partially in reaction to the recent discussion on
-i18n .

I had the same idea, and I think something like this is the most we'll be able
to do for S2_4. Some drawbacks:
* Even if the single player, or all human players, pick nations from the
"Core" group, there's no guarantee that all nations in the game will come from
it (although I assume the match=3 tries to encourage this). This becomes a
problem if we say it's OK for translators to only translate the "Core" nations
-- as a player, there's no way to ensure that you don't suddenly have
untranslated strings thrown at you from non-"Core" nations. This could
presumably happen if matching falls back, or perhaps more likely, in case of
civil war.
** I've been wondering about doing something more radical on trunk: having a
nationset choice that is orthogonal to or a subset of ruleset choice, so
instead of selecting from group "Core", there's a separate drop-down where you
select "Core" or "Extended" nations, each with their own groups. That way you
guarantee no nations outside the set will ever be chosen. I haven't thought
hard about what to do about civilwar nations pointing outside the set though,
and I doubt it can be done for 2.4.
* Conversely, the match=3 will presumably distort random nation selection
where the user is happy with using the extended set, such that the same old
"core" nations will tend to come up over and over rather than the full
richness of the extended nation set.
* "Core" is a bit of a soulless name for a nation group, but it's exactly what
I've been referring to this idea as in my head, and I haven't thought of a
better suggestion.

> It consists of nations that appear in the games from the 
> Civilization series: 
We've already got some of that with the separate civ1/civ2 nations.rulesets
that appeared in patch #2243. Presumably you list includes Civ3 and up too.

> Celtic will be added to the game in patch #3316 
[...]
> Is this still on time for 2_4?
I don't see anything in this patch that can't go on S2_4 in principle, if we
accept the drawbacks (although I don't think this patch will apply cleanly,
the differences should be trivial).

WRT patch #3316, we said we wouldn't put any more nations in S2_4, but I
daresay we could make an exception given the rationale.
(Note that civ2/nations.ruleset already has a "Celtic" nation, this being the
only one not covered in the default nations -- it's quite different from patch
#3316.)

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #2228] Mon nation

2012-07-18 Thread Jacob Nevins
Follow-up Comment #3, patch #2228 (project freeciv):

(Also, while researching this, I noticed that Wikipedia
 at least refers to these people as
"the Mon", but our plural is "Mons".)

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #2228] Mon nation

2012-07-18 Thread Jacob Nevins
Follow-up Comment #2, patch #2228 (project freeciv):

I've just noticed that mon.svg and mon*.png in svn don't match.
mon.svg is a white bird shape on a blue background (which indeed seems
associated with the Mon); but the PNGs, which are actually used in the game,
appear to be a golden sun thing on a red background with a gold border. I
don't know whose flag that is; the md5sum isn't identical to any of the other
PNGs.

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #3432] "Core" nation group

2012-07-18 Thread J.M. Maalderink
URL:
  

 Summary: "Core" nation group
 Project: Freeciv
Submitted by: mixcoatl
Submitted on: Wed Jul 18 22:32:12 2012
Category: general
Priority: 5 - Normal
  Status: None
 Privacy: Public
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Planned Release: 

___

Details:

This patch adds a "core" nation group, consisting of the historically most
important nations. It's the first group that appears when pickign a nation.
This will ease selecting a nation for people who don't want to plow through
large nation lists can pick a core one immediately.

It consists of nations that appear in the games from the Civilization series:

American
Apache
Arab
Austrian
Aztec
Babylonian
Byzantine
Carthaginian
Celtic
Cherokee
Chinese
Danish
Dutch
Egyptian
English
Ethiopian
French
German
Greek
Hittite
Hunnic
Inca
Indian
Iroquois
Japanese
Khmer
Korean
Mali
Mayan
Mongolian
Persian
Polynesian
Portuguese
Roman
Russian
Sioux
Songhai
Sumerian
Swedish
TaĆ­no (replacement for Arawak)
Thai (replacement for Siamese)
Tupi
Turkish (replacement for Ottoman)
Viking
Zulu

I left out Native American (there are enough individual Native American
nations included already) and Holy Roman (too much overlap with
German/Austrian).

Celtic will be added to the game in patch #3316

Since this makes 45 I and 50 is a nice round number I decided to include an
additional 5 modern nations, based on a mix between population size,
historical importance and likelyhood that a player wants to play with this own
nation:

Brazilian
Indonesian
Italian
Polish
Vietnamese

Is this still on time for 2_4?



___

File Attachments:


---
Date: Wed Jul 18 22:32:13 2012  Name: core.patch  Size: 26kB   By: mixcoatl



___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #19955] gtk_menus.xml not installed if only Gtk3 client built

2012-07-18 Thread Jacob Nevins
Update of bug #19955 (project freeciv):

  Status: In Progress => Ready For Test 

___

Follow-up Comment #1:

Possibly this explains bug #19583.

(file #16131)
___

Additional Item Attachment:

File name: trunk-S2_4-gtk3-menus-xml-install.patch Size:0 KB


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #19583] No top menu in GTK3 client

2012-07-18 Thread Jacob Nevins
Follow-up Comment #2, bug #19583 (project freeciv):

Perhaps explained by bug #19955?
Did you build only the gtk3 client (none of the others), and if so, did you
install it and run it from the install location rather than directly from the
checkout?

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #19955] gtk_menus.xml not installed if only Gtk3 client built

2012-07-18 Thread Jacob Nevins
URL:
  

 Summary: gtk_menus.xml not installed if only Gtk3 client
built
 Project: Freeciv
Submitted by: jtn
Submitted on: Wed Jul 18 22:51:54 2012
Category: client-gtk-3.0
Severity: 4 - Important
Priority: 5 - Normal
  Status: In Progress
 Assigned to: jtn
Originator Email: 
 Open/Closed: Open
 Release: S2_4 r21580
 Discussion Lock: Any
Operating System: Any
 Planned Release: 2.4.0,2.5.0

___

Details:

Just noticed in a svn checkout where I'm building and installing only
freeciv-gtk3 (no other client), when run from the install location, I get no
menubar and the following on the console:


1: Gtk menus: file definition not found
1: Gtk menus: Failed to open file '': No such file or directory


In data/Makefile.am, a reference to gtk_menus.xml is conditionalised on
CLIENT_GUI_GTK_2_0, which probably explains it.

The attached patch fixes this, and my symptom.


A reference to data/freeciv.rc-2.0 is also in this conditionalisation. I'm
less clear whether we need this for gtk3.
In fact it's not clear to me whether it needs installing at all -- as far as I
can tell, it gets munged into gui-gtk-X.0/Freeciv.h by the shell script
"rc2c", and accessed as fallback_resources[], so I don't see how it's accessed
at all at runtime.
Perhaps it's included as an example?
In the Gtk3 client, fallback_resources[] is not accessed if actually built for
Gtk3. Perhaps this is a remnant of the gtk2x days, and all the rc2c stuff
should be stripped out at the same time as the "#if !GTK_CHECK_VERSION(3, 0,
0)"? Is there a gap here which is not implemented in the Gtk3 client? -- this
file seems to do things like making the beta label red.

In the face of this, my patch ignores freeciv.rc-2.0. Doing anything different
is probably the subject of a new ticket.




___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #3283] Marshallese nation

2012-07-18 Thread J.M. Maalderink
Update of patch #3283 (project freeciv):

 Open/Closed:Open => Closed 


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #3277] Urartian nation

2012-07-18 Thread J.M. Maalderink
Update of patch #3277 (project freeciv):

  Status: In Progress => Ready For Test 


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #3276] Kushan nation

2012-07-18 Thread J.M. Maalderink
Update of patch #3276 (project freeciv):

  Status: In Progress => Ready For Test 


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #3272] Burgundic nation

2012-07-18 Thread J.M. Maalderink
Update of patch #3272 (project freeciv):

  Status: In Progress => Ready For Test 


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #19871] Leader name female forms: Chairman vs Chairwoman/Chairperson, etc

2012-07-18 Thread J.M. Maalderink
Follow-up Comment #1, bug #19871 (project freeciv):

>In nations with a Chairman, the female equivalent is often Chairwoman but
sometimes Chairperson. I much prefer Chairwoman. 

I prefer Chairwoman as well

>Dictator => Dictatress, Dictatrix, or ?female:Dictator. 

Dictatrix would be OK for Classical nations, but for modern ones I would
prefer ?female:Dictator

>Usually Stadtholder => Stadtholdress, but tyrolian has "Stadholdress" (just a
typo?)

That's a typo

Also Fulani accidentally has ?female:Calipha for Republic instead of
?female:Vizier

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #19951] Supplied scripts shouldn't use deprecated Lua functions

2012-07-18 Thread Jacob Nevins
Update of bug #19951 (project freeciv):

  Status:  Ready For Test => Fixed  
 Open/Closed:Open => Closed 


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #19950] Typo in Lua Player:give_technology() implementation

2012-07-18 Thread Jacob Nevins
Update of bug #19950 (project freeciv):

  Status:  Ready For Test => Fixed  
 Open/Closed:Open => Closed 


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #19947] Migrate "saveturns=0" setting in old savegames to appropriate "autosaves" value

2012-07-18 Thread Jacob Nevins
Update of bug #19947 (project freeciv):

  Status:  Ready For Test => Fixed  
 Open/Closed:Open => Closed 


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #3193] Make tech loss more fair

2012-07-18 Thread Marko Lindqvist
Update of patch #3193 (project freeciv):

  Status:None => Ready For Test 

___

Follow-up Comment #1:

Patch

Add ruleset option tech_loss_forgiveness. Tech loss occurs when bulbs balance
is lower than tech_loss_forgivess % of current research cost. Special value
"-1" disables tech loss completely.

Tech loss and tech upkeep can be configured separately -> even with ruleset
without tech upkeep one may lose techs due to multiple conquercosts etc

(file #16130)
___

Additional Item Attachment:

File name: TechLossForgiveness.patch  Size:7 KB


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #3376] fix for premultiplied alpha

2012-07-18 Thread Marko Lindqvist
Update of patch #3376 (project freeciv):

  Status:  Ready For Test => In Progress


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #19921] Intermediate animation steps in map update not visible

2012-07-18 Thread Marko Lindqvist
Update of bug #19921 (project freeciv):

  Status:None => Ready For Test 
 Assigned to:None => cazfi  


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #3424] City dialog created for Qt Version

2012-07-18 Thread Marko Lindqvist
Update of patch #3424 (project freeciv):

  Status:None => Ready For Test 
 Assigned to:None => cazfi  
 Planned Release: => 2.5.0  

___

Follow-up Comment #3:

Generally each patch should contain just one change, and no unrelated things.
No need to split this patch, but keep it in mind when writing future patches.

Changes in attached version:

- Minor style corrections
- Replaced includes in citydlg.h with class forward declarations as only
pointers are needed
- Corrected a couple of errors in translatable strings
- Use population_to_text() instead of just adding string "000"


(file #16129)
___

Additional Item Attachment:

File name: QtCityDlg.patch.bz2Size:11 KB


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev