[Freeciv-commits] r34091 - /branches/S2_6/doc/README.msys2
Author: cazfi Date: Tue Oct 11 07:27:04 2016 New Revision: 34091 URL: http://svn.gna.org/viewcvs/freeciv?rev=34091=rev Log: Updated documentation about location of the msys2 environment. See patch #7798 Modified: branches/S2_6/doc/README.msys2 Modified: branches/S2_6/doc/README.msys2 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README.msys2?rev=34091=34090=34091=diff == --- branches/S2_6/doc/README.msys2 (original) +++ branches/S2_6/doc/README.msys2 Tue Oct 11 07:27:04 2016 @@ -111,7 +111,7 @@ Premade msys2 environment is available for download from -http://download.gna.org/freeciv/packages/windows/testing/cazfi/installer_msys2/envs/ +http://download.gna.org/freeciv/packages/windows/msys2/ Current version is ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r34089 - in /trunk: configure.ac m4/gtk3.22-client.m4
Author: cazfi Date: Tue Oct 11 07:23:52 2016 New Revision: 34089 URL: http://svn.gna.org/viewcvs/freeciv?rev=34089=rev Log: Renamed m4-macro FC_GTK3X_CLIENT as FC_GTK3_22_CLIENT. See patch #7797 Modified: trunk/configure.ac trunk/m4/gtk3.22-client.m4 Modified: trunk/configure.ac URL: http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=34089=34088=34089=diff == --- trunk/configure.ac (original) +++ trunk/configure.ac Tue Oct 11 07:23:52 2016 @@ -978,8 +978,8 @@ dnl SDL2-specific overrides FC_SDL2_CLIENT - dnl Gtk-3.x-specific overrides - FC_GTK3X_CLIENT + dnl Gtk-3.22-specific overrides + FC_GTK3_22_CLIENT dnl Stub-specific overrides if test "x$gui_stub" = "xyes" || test "x$client" = "xall" ; then Modified: trunk/m4/gtk3.22-client.m4 URL: http://svn.gna.org/viewcvs/freeciv/trunk/m4/gtk3.22-client.m4?rev=34089=34088=34089=diff == --- trunk/m4/gtk3.22-client.m4 (original) +++ trunk/m4/gtk3.22-client.m4 Tue Oct 11 07:23:52 2016 @@ -3,7 +3,7 @@ # FC_GTK3X_CLIENT # Test for GTK+-3.0 libraries needed for gui-gtk-3.x -AC_DEFUN([FC_GTK3X_CLIENT], +AC_DEFUN([FC_GTK3_22_CLIENT], [ # Add check "x$client" = "xauto" when this becomes supported client if test "x$gui_gtk3x" = "xyes" || ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r34087 - /branches/S2_6/common/actions.c
Author: sveinung Date: Mon Oct 10 14:15:37 2016 New Revision: 34087 URL: http://svn.gna.org/viewcvs/freeciv?rev=34087=rev Log: Clarify action_enablers_for_action() header. Modified: branches/S2_6/common/actions.c Modified: branches/S2_6/common/actions.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/actions.c?rev=34087=34086=34087=diff == --- branches/S2_6/common/actions.c (original) +++ branches/S2_6/common/actions.c Mon Oct 10 14:15:37 2016 @@ -488,7 +488,7 @@ } /** - Get all enablers for an action. + Get all enablers for an action in the current ruleset. **/ struct action_enabler_list * action_enablers_for_action(enum gen_action action) ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r34084 - in /trunk: client/ client/gui-gtk-2.0/ client/gui-gtk-3.0/ client/gui-gtk-3.22/ client/gui-qt/ client/gui-sdl2/ com...
Author: sveinung Date: Mon Oct 10 13:57:30 2016 New Revision: 34084 URL: http://svn.gna.org/viewcvs/freeciv?rev=34084=rev Log: Make names of action UI name getters similar. Reaname action_get_ui_name() to action_id_name_translation() to make it like action_name_translation(). See patch #7796 Modified: trunk/client/control.c trunk/client/gui-gtk-2.0/menu.c trunk/client/gui-gtk-3.0/citydlg.c trunk/client/gui-gtk-3.0/menu.c trunk/client/gui-gtk-3.22/citydlg.c trunk/client/gui-gtk-3.22/menu.c trunk/client/gui-qt/citydlg.cpp trunk/client/gui-qt/menu.cpp trunk/client/gui-sdl2/citydlg.c trunk/client/gui-sdl2/mapctrl.c trunk/client/gui-sdl2/menu.c trunk/client/helpdata.c trunk/common/actions.c trunk/common/actions.h trunk/common/scriptcore/api_game_methods.c trunk/server/actiontools.c trunk/server/unithand.c trunk/server/unittools.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/client/control.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/control.c?rev=34084=34083=34084=diff Modified: trunk/client/gui-gtk-2.0/menu.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/menu.c?rev=34084=34083=34084=diff Modified: trunk/client/gui-gtk-3.0/citydlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/citydlg.c?rev=34084=34083=34084=diff Modified: trunk/client/gui-gtk-3.0/menu.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/menu.c?rev=34084=34083=34084=diff Modified: trunk/client/gui-gtk-3.22/citydlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.22/citydlg.c?rev=34084=34083=34084=diff Modified: trunk/client/gui-gtk-3.22/menu.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.22/menu.c?rev=34084=34083=34084=diff Modified: trunk/client/gui-qt/citydlg.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/citydlg.cpp?rev=34084=34083=34084=diff Modified: trunk/client/gui-qt/menu.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/menu.cpp?rev=34084=34083=34084=diff Modified: trunk/client/gui-sdl2/citydlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/citydlg.c?rev=34084=34083=34084=diff Modified: trunk/client/gui-sdl2/mapctrl.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/mapctrl.c?rev=34084=34083=34084=diff Modified: trunk/client/gui-sdl2/menu.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/menu.c?rev=34084=34083=34084=diff Modified: trunk/client/helpdata.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/helpdata.c?rev=34084=34083=34084=diff Modified: trunk/common/actions.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/actions.c?rev=34084=34083=34084=diff Modified: trunk/common/actions.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/actions.h?rev=34084=34083=34084=diff Modified: trunk/common/scriptcore/api_game_methods.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/scriptcore/api_game_methods.c?rev=34084=34083=34084=diff Modified: trunk/server/actiontools.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/actiontools.c?rev=34084=34083=34084=diff Modified: trunk/server/unithand.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/unithand.c?rev=34084=34083=34084=diff Modified: trunk/server/unittools.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/unittools.c?rev=34084=34083=34084=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r34085 - /trunk/common/actions.c
Author: sveinung Date: Mon Oct 10 13:57:47 2016 New Revision: 34085 URL: http://svn.gna.org/viewcvs/freeciv?rev=34085=rev Log: Clarify action_enablers_for_action() header. Modified: trunk/common/actions.c Modified: trunk/common/actions.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/actions.c?rev=34085=34084=34085=diff == --- trunk/common/actions.c (original) +++ trunk/common/actions.c Mon Oct 10 13:57:47 2016 @@ -786,7 +786,7 @@ } /** - Get all enablers for an action. + Get all enablers for an action in the current ruleset. **/ struct action_enabler_list * action_enablers_for_action(enum gen_action action) ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r34083 - in /trunk/data: alien/ civ1/ civ2/ civ2civ3/ classic/ experimental/ multiplayer/ ruledit/ sandbox/ stub/ webperimen...
Author: sveinung Date: Mon Oct 10 13:57:10 2016 New Revision: 34083 URL: http://svn.gna.org/viewcvs/freeciv?rev=34083=rev Log: Sort action needs utype field comment. See patch #7795 Modified: trunk/data/alien/units.ruleset trunk/data/civ1/units.ruleset trunk/data/civ2/units.ruleset trunk/data/civ2civ3/units.ruleset trunk/data/classic/units.ruleset trunk/data/experimental/units.ruleset trunk/data/multiplayer/units.ruleset trunk/data/ruledit/comments.txt trunk/data/sandbox/units.ruleset trunk/data/stub/units.ruleset trunk/data/webperimental/units.ruleset Modified: trunk/data/alien/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/units.ruleset?rev=34083=34082=34083=diff == --- trunk/data/alien/units.ruleset (original) +++ trunk/data/alien/units.ruleset Mon Oct 10 13:57:10 2016 @@ -357,6 +357,13 @@ ; type flag. ; ; Following actions require extra fields: +; "Attack" +; attack = base attack strength +; "Bombard" +; attack = base attack strength +; bombard_rate = the number of shots fired at enemy units when attacking +; "Join City" +; pop_cost = the number of population added to the target city ; "Paradrop Unit" ; paratroopers_range = the maximal range the unit can be paradropped to. ; Max range is 65534. @@ -364,15 +371,8 @@ ; paradropping (whole movement points) ; paratroopers_mr_sub = the move rate which is subtracted after paradropping ; (whole movement points) -; "Bombard" -; attack = base attack strength -; bombard_rate = the number of shots fired at enemy units when attacking -; "Join City" -; pop_cost = the number of population added to the target city ; "Upgrade Unit" ; obsolete_by = the unit type upgraded to. -; "Attack" -; attack = base attack strength ; ; ** Roles ** ; Modified: trunk/data/civ1/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/units.ruleset?rev=34083=34082=34083=diff == --- trunk/data/civ1/units.ruleset (original) +++ trunk/data/civ1/units.ruleset Mon Oct 10 13:57:10 2016 @@ -260,6 +260,13 @@ ; ; ; Following actions require extra fields: +; "Attack" +; attack = base attack strength +; "Bombard" (do not appear in Civ1) +; attack = base attack strength +; bombard_rate = the number of shots fired at enemy units when attacking +; "Join City" +; pop_cost = the number of population added to the target city ; "Paradrop Unit" (does not appear in Civ1) ; paratroopers_range = the maximal range the unit can be paradropped to. ; Max range is 65534. @@ -267,15 +274,8 @@ ; paradropping (whole movement points) ; paratroopers_mr_sub = the move rate which is subtracted after paradropping ; (whole movement points) -; "Bombard" (do not appear in Civ1) -; attack = base attack strength -; bombard_rate = the number of shots fired at enemy units when attacking -; "Join City" -; pop_cost = the number of population added to the target city ; "Upgrade Unit" ; obsolete_by = the unit type upgraded to. -; "Attack" -; attack = base attack strength ; ; ** Roles ** ; Modified: trunk/data/civ2/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/units.ruleset?rev=34083=34082=34083=diff == --- trunk/data/civ2/units.ruleset (original) +++ trunk/data/civ2/units.ruleset Mon Oct 10 13:57:10 2016 @@ -273,6 +273,13 @@ ; ; ; Following actions require extra fields: +; "Attack" +; attack = base attack strength +; "Bombard" +; attack = base attack strength +; bombard_rate = the number of shots fired at enemy units when attacking +; "Join City" +; pop_cost = the number of population added to the target city ; "Paradrop Unit" ; paratroopers_range = the maximal range the unit can be paradropped to. ; Max range is 65534. @@ -280,15 +287,8 @@ ; paradropping (whole movement points) ; paratroopers_mr_sub = the move rate which is subtracted after paradropping ; (whole movement points) -; "Bombard" -; attack = base attack strength -; bombard_rate = the number of shots fired at enemy units when attacking -; "Join City" -; pop_cost = the number of population added to the target city ; "Upgrade Unit" ; obsolete_by = the unit type upgraded to. -; "Attack" -; attack = base attack strength ; ; ** Roles ** ; Modified: trunk/data/civ2civ3/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/units.ruleset?rev=34083=34082=34083=diff
[Freeciv-commits] r34082 - in /trunk: client/ data/
Author: sveinung Date: Mon Oct 10 13:56:46 2016 New Revision: 34082 URL: http://svn.gna.org/viewcvs/freeciv?rev=34082=rev Log: Make darkness_layer layer_order controlled. Change the darknes_layer from something drawn on top of a tileset configurable mapview_layer to an independent layer. This makes it tileset configurable via the layer_order tileset option. Patch by Louis Moureaux See patch #7731 Modified: trunk/client/tilespec.c trunk/client/tilespec.h trunk/data/alio.tilespec trunk/data/amplio.tilespec trunk/data/amplio2.tilespec trunk/data/cimpletoon.tilespec trunk/data/hex2t.tilespec trunk/data/hexemplio.tilespec trunk/data/isophex.tilespec trunk/data/isotrident.tilespec trunk/data/toonhex.tilespec trunk/data/trident.tilespec [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/client/tilespec.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.c?rev=34082=34081=34082=diff Modified: trunk/client/tilespec.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.h?rev=34082=34081=34082=diff Modified: trunk/data/alio.tilespec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/alio.tilespec?rev=34082=34081=34082=diff Modified: trunk/data/amplio.tilespec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio.tilespec?rev=34082=34081=34082=diff Modified: trunk/data/amplio2.tilespec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2.tilespec?rev=34082=34081=34082=diff Modified: trunk/data/cimpletoon.tilespec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/cimpletoon.tilespec?rev=34082=34081=34082=diff Modified: trunk/data/hex2t.tilespec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/hex2t.tilespec?rev=34082=34081=34082=diff Modified: trunk/data/hexemplio.tilespec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/hexemplio.tilespec?rev=34082=34081=34082=diff Modified: trunk/data/isophex.tilespec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/isophex.tilespec?rev=34082=34081=34082=diff Modified: trunk/data/isotrident.tilespec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/isotrident.tilespec?rev=34082=34081=34082=diff Modified: trunk/data/toonhex.tilespec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/toonhex.tilespec?rev=34082=34081=34082=diff Modified: trunk/data/trident.tilespec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/trident.tilespec?rev=34082=34081=34082=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r34081 - in /trunk/server: rssanity.c ruleset.c
Author: sveinung
Date: Mon Oct 10 13:55:33 2016
New Revision: 34081
URL: http://svn.gna.org/viewcvs/freeciv?rev=34081=rev
Log:
Move "Attack" blocks "Conquer City" hard coding.
The rule doesn't depend on the ruleset. It therefore doesn't belong in
load_ruleset_game(). Move it to the other unconditional action blocking
rules in autoadjust_ruleset_data().
See patch #7794
Modified:
trunk/server/rssanity.c
trunk/server/ruleset.c
Modified: trunk/server/rssanity.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/rssanity.c?rev=34081=34080=34081=diff
==
--- trunk/server/rssanity.c (original)
+++ trunk/server/rssanity.c Mon Oct 10 13:55:33 2016
@@ -1382,6 +1382,12 @@
* semantics. */
{ ACTION_DISBAND_UNIT, ACTION_HELP_WONDER },
{ ACTION_DISBAND_UNIT, ACTION_RECYCLE_UNIT },
+
+ /* Hard code that the ability to perform a regular attack blocks city
+ * conquest. Is redundant as long as the requirement that the target
+ * tile has no units remains hard coded. Kept "just in case" that
+ * changes. */
+ { ACTION_CONQUER_CITY, ACTION_ATTACK },
};
int i;
Modified: trunk/server/ruleset.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=34081=34080=34081=diff
==
--- trunk/server/ruleset.c (original)
+++ trunk/server/ruleset.c Mon Oct 10 13:55:33 2016
@@ -5856,9 +5856,6 @@
BV_SET(action_by_number(ACTION_CONQUER_CITY)->blocked_by,
ACTION_NUKE);
}
-
- BV_SET(action_by_number(ACTION_CONQUER_CITY)->blocked_by,
- ACTION_ATTACK);
/* If the poison city action should empty the granary. */
/* TODO: empty granary and reduce population should become separate
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
