19240 Commits

Author SHA1 Message Date
fendrin
6857b12767 Delete theme images, should have happened in the last commit... 2013-12-22 08:42:15 +01:00
fendrin
5ae5fb1f17 Moved images used by both, default and editor theme. 2013-12-22 08:40:07 +01:00
fendrin
99a7e282fa The test scenario no longer depends on wesnoth-utbs package installed. 2013-12-22 08:03:19 +01:00
fendrin
2709197594 Refactored the time of day schedule related images and macros.
This moves the after the fall schedule into core to grant that the
debian package wesnoth-editor does not depend on wesnoth-utbs.

Also, the images now life in their own subdirectories.

Wmllint has been updated to take care about the changed paths.
2013-12-22 07:32:12 +01:00
Alexander van Gessel
49c06cc943 Fix a unit image reference
Found by wmlscope
2013-12-22 04:46:40 +01:00
Alexander van Gessel
9571e899d4 Fix unit image reference
Found by wmlscope
2013-12-22 04:44:44 +01:00
Alexander van Gessel
c825dd0e72 Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-12-22 04:16:09 +01:00
Alexander van Gessel
47e311ab9b Fix some image references in ANL
Found by wmlscope
2013-12-22 04:15:10 +01:00
Ignacio R. Morelle
b5a996f2eb UtBS S13: add wmllint recognize directives for recall list units
These units are referenced to before they are ever recalled (well, in
Nym's case, Zhul doesn't ever get recalled) and wmllint doesn't like
that. It's the intended behavior, so tell wmllint to take them for
granted.
2013-12-21 23:13:27 -03:00
Ignacio R. Morelle
060c35d82c wmlindent pass on mainline 2013-12-21 23:06:43 -03:00
Ignacio R. Morelle
81bb3f8b0f Theme WML cleanup inspired by a wmlindent pass
Comment indentation only.
2013-12-21 23:05:30 -03:00
Ignacio R. Morelle
b8ce752221 Theme WML cleanup inspired by a wmlindent pass
Mostly comments and indentation only.
2013-12-21 23:05:29 -03:00
Ignacio R. Morelle
4c39592471 Theme WML cleanup inspired by a wmlindent pass
Mostly comments and indentation only. Also removed a big mid-line
whitespace chunk.
2013-12-21 23:05:29 -03:00
Boldizsár Lipka
88dda7bedd Khalifate era description by happygrue. 2013-12-22 03:45:12 +01:00
Alexander van Gessel
725f9e398e wmlindent run 2013-12-22 02:04:58 +01:00
Alexander van Gessel
7f61f8b081 Remove unneeded ellipses 2013-12-22 02:03:25 +01:00
Alexander van Gessel
55bd5e1729 Remove explicit nozoc ellipse 2013-12-22 02:01:47 +01:00
Alexander van Gessel
32fabf5489 Refactor lightfly movetype a bit 2013-12-22 02:00:18 +01:00
Alexander van Gessel
7eea4c5fb9 Import khalifate from wesnoth-umc-dev r19414 2013-12-22 01:55:00 +01:00
David Mikos
9780a8a53f Fix missing background dragonguard image in mp map Aethermaw 2013-12-22 10:20:45 +10:30
Ignacio R. Morelle
a371eee3ea gui2/tmp_depcheck_select_new: Convert title label to Title Case 2013-12-21 20:42:13 -03:00
Ignacio R. Morelle
1c4129a210 gui2/tmp_depcheck_confirm_change: Replace title label with a generic one
The generic label should be already translated (it's used in C++), and
also respects the Title Case rule on grounds of it not having a word
count greater than 1.
2013-12-21 20:41:12 -03:00
Bär Halberkamp
85c84b0124 Improved maps for EI scenario 1-3 2013-12-22 00:39:35 +01:00
Ignacio R. Morelle
0ab3c93c51 help: Revision of the prose revision of the Add-ons section
8680 requested some prepositions to be changed.
2013-12-21 20:03:31 -03:00
ln-zookeeper
8a55cc355f Removed obsolete TRoW bigmap images. 2013-12-21 22:01:29 +02:00
Ignacio R. Morelle
717e11c269 help: Prose revision of the Add-ons section
Done with additional proofreading support from Turuk and vultraz.
2013-12-21 13:13:56 -03:00
ln-zookeeper
994960c6aa Flipped Haldric's ship horizontally. 2013-12-21 13:06:52 +02:00
ln-zookeeper
df175d747f Merge branch 'master' of https://github.com/wesnoth/wesnoth-old 2013-12-21 13:02:52 +02:00
ln-zookeeper
c4dca8e309 Typo fixes in drake race description. 2013-12-21 13:01:20 +02:00
Ignacio R. Morelle
553c56b2bd preferences: Merge compress_saves and bzip2_savegame_compression options
Now that we have combo box options in Preferences -> Advanced, we can
finally present the saved game compression options in a user-friendly
fashion instead of having two separate options with an unclear
relationship.

However, in order to achieve this I had to move far more code than I am
normally comfortable with:

 * Moved the config_writer::compressor enum type to a separate header
   file, serialization/compression.hpp, in order to make it available to
   more units without pulling a bunch of heavy crap (such as the boost
   iostreams headers) that's normally unneeded. The new type is
   compression::format.

 * Added a compression::format_extension() function to determine a file
   extension string according to a compression type. This is needed more
   often than one would think, see below.

 * Changed all savegame-related classes to use the compression::format
   type instead of a single boolean flag and bzip2_savegame_compression
   queries. This is a code-heavy task by design.

 * Changed all code scattered around deciding whether to use ".gz" or
   ".bz2" for a save extension to use compression::format_extension()
   instead. This affects both saved game implementation and interface
   code for some reason (read: poor design).

 * Removed the bzip2_savegame_compression preferences option, reusing
   the previous compress_saves option for this feature, turning it from
   a boolean option to a string option ("none", "gzip", "bzip2",
   defaults to "gzip" per advanced_preferences.cfg).

 * preferences::compress_saves() became
   preferences::save_compression_format().

 * Without bzip2_savegame_compression, people who previously enabled
   bzip2 compression will revert to gzip compression. This seems to be a
   rare enough case to me to bother with providing backwards
   compatibility with a feature that only existed for [1.11.0, 1.11.8).

 * For preferences files from previous versions where compress_saves was
   set to either "yes" or "no", there will be a conspicuous value in the
   second column of the advanced preferences list, especially if they
   are using a translation; it'll be either "yes" or "no" as an
   untranslatable string. A value of "yes" is equivalent to "gzip", and
   a value of "no" is equivalent to "none". Any other unrecognized value
   is equivalent to "gzip". As soon as the user chooses a compression
   format again, one of the three supported values ("none", "gzip", or
   "bzip2") will be written to the compressed_saves attribute in the
   preferences file.

All in all, a ridiculously messy commit that's not particularly feasible
to break down into separate pieces because all of the involved code is
very closely related to the overarching feature that's being
implemented in it.

Note that the save_index currently only uses gzip regardless of whether
bzip2 is the current compression format choice. This was the case even
before this commit, and I'm not sure it's worth it to change it given
the potential CPU usage and the fact that save_index tends to be broken
most of the time anyway.
2013-12-20 23:36:46 -03:00
Boldizsár Lipka
ec7516f366 Some text about mp mods in the help. 2013-12-21 03:08:45 +01:00
ln-zookeeper
5d5aee134d New bigmaps and journey markers for TRoW. 2013-12-21 01:06:06 +02:00
Bär Halberkamp
9ce2dfbc84 ran wmlindent 2013-12-20 19:59:12 +01:00
mattsc
c65d8d4ae1 Wolves MAI: fix bug that sometimes kept predators from attacking
The attacks aspect may only be modified if the avoid_type= key is set
in the [micro_ai] tag, otherwise all attacks get disabled.
2013-12-20 09:00:01 -08:00
Groggy Dice
4dcce0083b THoT Dwarvish_Loremaster: fix typo in apparently unnecessary magic comment
The irony of turning off spellcheck and misspelling spellcheck is obvious.

This magic comment is apparently unnecessary, though, since it wasn't
working, yet the file was not failing the spellcheck.
2013-12-20 04:52:09 -05:00
Groggy Dice
e22e204d67 wmllint: recognize characters in RECALL_XY 2013-12-20 04:52:05 -05:00
Groggy Dice
05cb8bab2c NR 05a - The Pursuit: add dialogue when a unit steps on the dungeon signpost
Most of the other signposts elicit a remark when a unit steps on them, but
curiously not this one.

Not only do I give the discovering unit a line, I have Tallin speak as
well. This may give alert first-time NR players a clue that this corridor
is important.

Some may prefer that players continue stumbling about, and object.
Unfortunately, there's no NR maintainer or active lord of prose to resolve
any difference of opinion.
2013-12-20 04:52:02 -05:00
Groggy Dice
6ec0163f6e add RECALL_XY macro to core
Many UMC projects have a macro for this function, but the name isn't
standardized (RECALLXY and RECALL_POS are also in use). However, regardless
of name, all these macros follow the "id x y" order, so for compatibility
I have kept that order. UMC authors started with a RECALL macro and added
coordinates, while the unit-generating macros have to organize a lot of
extra fields that are irrelevant to [recall].
2013-12-20 04:51:59 -05:00
Groggy Dice
29bc800600 add RECALL to core unit macros
Many UMC projects already have a RECALL macro.
2013-12-20 04:51:55 -05:00
Groggy Dice
9b03262d04 parse whofield macros to recognize unit id fields
Also, explain usage of the "whofield" magic comment in the introduction
2013-12-20 04:51:52 -05:00
Groggy Dice
5c85e80487 create magic comment "whofield" for id fields of non-core macros
Although we can now auto-recognize characters in the core NAMED_*UNIT macros,
campaigns may have their own recruit/recall macros. This comment will tell
wmllint which field contains the macro's id.

The basic format is 'wmllint: whofield <macro> <num>'. This commit sets up the
dictionary, the next commit will actually parse the macros. It will explain
more details about how to use this magic comment in wmllint's introduction.
2013-12-20 04:51:48 -05:00
fendrin
91b5a57449 Renamed "current_tod" attribute of [time_area] to match the global one.
"current_tod" and "current_time" served the same purpose, one at
scenario toplevel, the other inside of [time_area].

For the sake of consistency and for enabling the usage of the same
schedule macros in both cases, they are now both called "current_time".
2013-12-20 04:45:18 +01:00
fendrin
f979609ccf area= SLF attribute support for filtering by [time_area]s. 2013-12-20 02:27:44 +01:00
Andrius Silinskas
597f5ad6a9 Added new CampaignWML attribute "allow_era_choice".
If attribute is set to "no" and campaign with it is selected, eras menu will be
hidden and text to indicate this will be displayed.

Attribute defaults to "yes" and has been added to LoW.

N.B. since current MP code is tighly coupled with eras, the default era will
still be used by the engine to properly initialize stuff. Later on, code should be
improved by making it more modular and independant of eras.
2013-12-19 21:37:41 +00:00
mattsc
473fc1d3f0 SotBE S8: increase enemy gold and reduce turn limit
The scenario was way too easy previously.
2013-12-19 13:05:52 -08:00
mattsc
296f39acbd SotBE S8: take lots of villages off the map
... to prevent huge gold carry-over.  To make up for that (for the
AIs), the enemies will be given larger income.
2013-12-19 13:05:52 -08:00
ln-zookeeper
b5591bbab9 Tweaked the timing of the undead recruitment dialogue. 2013-12-19 21:29:58 +02:00
ln-zookeeper
6f7c4363cc Prevent troll sighting event from triggering when a non-player side sees them. 2013-12-19 20:50:52 +02:00
Ignacio R. Morelle
80d093b2b9 Add support for flag and flag_icon to [store_side] 2013-12-18 23:30:39 -03:00
mattsc
c93420d4a4 Fix indenting 2013-12-18 13:29:08 -08:00