Freeciv

freeciv:S2_3

  1. Git
  2. lp:freeciv
  3. S2_3
Last commit made on 2015-08-11
Get this branch:
git clone -b S2_3 https://git.launchpad.net/freeciv

Branch merges

Branch information

Name:
S2_3
Repository:
lp:freeciv

Recent commits

a6876a9... by Marko Lindqvist

Updated fsf snail mail address

See patch #6189

[[originally from svn r29458]]

598cd04... by Jacob Nevins <email address hidden>

Document distribution policy for original graphics materials.

Requested by Marko Lindqvist (cazfi@gna).

See gna patch #3719.

[[originally from svn r24391]]

a48bb0d... by Jacob Nevins <email address hidden>

Update ChangeLog as of S2_3 r24384.

[[originally from svn r24386]]

2bf68c2... by Jacob Nevins <email address hidden>

Bump version number to '2.3.5'.

[[originally from svn r24384]]

d69ecf9... by Jacob Nevins <email address hidden>

Refresh NEWS-2.3 for 2.3.5, from wiki.

[[originally from svn r24382]]

9387d0c... by Jacob Nevins <email address hidden>

Results of running "make update-po".

[[originally from svn r24380]]

bb39bd5... by Jacob Nevins <email address hidden>

Backport FAQ from S2_4. It's a bit 2.4.x centric but still an improvement
even for S2_3.

[[originally from svn r24379]]

5592c3d... by Jacob Nevins <email address hidden>

Updated Polish translation by Hubert Kowalewski (hubkow@gna).
Pulled from <https://www.dropbox.com/sh/71c35xdmxe53y2d/SycNW254Ga>.
100%: 6299 translated.

[[originally from svn r24376]]

86f81b2... by Sveinung Kvilhaugsvik

Fix Diplomat/Spy actions against a victim on the same tile as the Diplomat

The offending line cause silent failure unless the Spy/Diplomat action
dialog of another unit is open. Remove it in stead of inverting it. No
matter if the check is there or not the Spy/Diplomat action dialog currently
showing will remain the same. Without the check the new order will be queued
in stead of silently forgotten.

See bug #21595

[[originally from svn r24370]]

1ac1f5d... by Sveinung Kvilhaugsvik

Don't battle your own on the behalf of the ally you spy on.

If a unit that has the Diplomat flag or the SuperSpy flag is on the same
tile as the target of certain diplomat actions it will try to stop them via
diplomatic combat. A unit should not try to stop an action done by it self
or another unit controlled by the same player.

See bug #21596

[[originally from svn r24369]]