55217 Commits

Author SHA1 Message Date
Alexander van Gessel
f9308f727d Merge branch 'wmlparser_metadata' 2014-01-15 18:02:50 +01:00
Allefant
92b02a6562 [wmlparser2] Parse multi-line WML tags.
Sigh. Probably should re-write the .plain file parser to first remove
all commands, keeping the meta-information in a separate class. Then
parse the result (which should be much simpler) and consult the
meta-information where necessary (text-domain for strings, source files
and line numbers for tokens).
2014-01-15 17:34:42 +01:00
mattsc
5b481e96aa SotBE S4: vary AI income with difficulty 2014-01-14 10:17:52 -08:00
ln-zookeeper
a93ca43d8c Removed Traveling Minstrels from the playlist due to it being too jolly for the occasion. 2014-01-14 17:53:19 +02:00
Ignacio R. Morelle
c9aaaed139 Don't force the .gz suffix on every entry of the save_index (bug #20849)
Quoting the code from savegame::save_index_class::data(const std::string&):

  /*
   * All saves are .gz files now so make sure we use that name when opening
   * a file. If not some parts of the code use the name with and some parts
   * without the .gz suffix.
   */

... A confusing statement that makes absolutely no amount of sense
whatsoever and comes from patch #3125! Not even back then it was true:
saved games could be either compressed (.gz) or uncompressed plain text
files (no extension). Nowadays we also have bzip2-compressed (.bz2)
files to add to the mix.

Most code actually calls the savegame-related functions with an explicit
file extension (if applicable), which is the source of a whole array of
maintainability concerns at this time; thus, I am not really sure what
the "some parts of the code" part refers to.
2014-01-14 02:19:19 -03:00
Ignacio R. Morelle
d110cd16d8 sound: Report missing tracks early in play_music_config() (bug #21479)
This makes it so play_once=yes tracks are caught in the check too.
2014-01-14 01:30:35 -03:00
Ignacio R. Morelle
da2ac22e28 Remove useless commented-out define 2014-01-14 01:23:03 -03:00
Ignacio R. Morelle
ab177e4a83 Remove useless commented-out define 2014-01-14 01:22:52 -03:00
Ignacio R. Morelle
3a09fadbbe License block formatting fix 2014-01-14 01:22:34 -03:00
Ignacio R. Morelle
406e055a65 License block formatting fix 2014-01-14 01:20:09 -03:00
Ignacio R. Morelle
fa9f139df0 Add missing source code license block 2014-01-14 01:19:58 -03:00
Ignacio R. Morelle
c57475c383 License block formatting fix 2014-01-14 01:19:32 -03:00
Ignacio R. Morelle
031dc8a213 Apply TC to the Unknown side leader icon in the Status Table unconditionally
Previously, the Unknown icon only received TC if the leader unit for
that side supported TC, and it'd only use the source palette specified
in the unit configuration. Our Unknown icon, however, always needs TC,
and it must always be on the magenta palette.
2014-01-14 01:12:06 -03:00
Ignacio R. Morelle
d8a74ab17e Indentation fix 2014-01-14 01:02:49 -03:00
Ignacio R. Morelle
c84989632a campaignd: Don't prefix errors sent to clients with "#Error: "
The string only worked as intended before the GUI2/Pango days (i.e.
before some 1.5.x version), meaning that the client would use a red
color for the font.

In other words, deplorable user interface design.

Nowadays, the add-ons client uses a dedicated error message path for
presenting this kind of alerts to the user, which uses a dialog with a
visible "Error" caption and everything. We don't really need extra
formatting, and in any case, *it should not be the server's mission to
do this*!
2014-01-14 00:58:02 -03:00
Ignacio R. Morelle
eb42dd2171 Update changelog 2014-01-13 15:42:50 -03:00
Ignacio R. Morelle
cc75d12088 Add wesnoth.set_dialog_markup Lua function
This adds functionality to enable or disable Pango markup on GUI2
widgets instantiated by Lua GUI2 dialogs.

The code is taken almost verbatim from patch #2759 by Exasperation
<https://gna.org/patch/?2759>, rebased against current master.
2014-01-13 15:41:48 -03:00
Ignacio R. Morelle
00442b4624 gui: Move Describe Terrain context menu item below Kill Unit
Only applies to the Pandora and Default themes since no other themes
have the Describe Terrain action.
2014-01-13 04:00:50 -03:00
Ignacio R. Morelle
bb52d6f5b3 gui: Remove empty context menu entry from the default theme 2014-01-13 03:59:13 -03:00
Ignacio R. Morelle
73b27c9c10 Merge two consecutive [clear_variable] actions in the IF_ALLIED WML macro 2014-01-13 02:46:25 -03:00
Ignacio R. Morelle
a7b25cad6f Reduce TRANSFER_VILLAGE_OWNERSHIP macro implementation to a single WML action 2014-01-13 02:30:42 -03:00
Ignacio R. Morelle
003aa541f0 Clear state variables used by the LIMIT_RECRUITS WML macro on victory 2014-01-13 02:21:36 -03:00
Ignacio R. Morelle
092031e5e1 Set the executable bit on data/tools/wmllint-1.4 2014-01-12 23:40:03 -03:00
Alexander van Gessel
548869fdfc Merge branch 'master' of github.com:wesnoth/wesnoth-old 2014-01-13 01:15:12 +01:00
Alexander van Gessel
724dd0f949 Fall back to variation_name if variation_id is not present (bug #21280) 2014-01-13 01:14:46 +01:00
Ignacio R. Morelle
9d6d59ee27 Display tooltips for Advanced Preferences list entries
This is intended to help in case any have been truncated. We add
tooltips for every entry for consistency.
2014-01-12 21:06:13 -03:00
Ignacio R. Morelle
02db755d70 Fallback to the entry name when an Advanced Preferences entry has no tooltip 2014-01-12 21:05:18 -03:00
Ignacio R. Morelle
152aa0b3f8 Shorten label for the savegame version prompt advanced preferences entry 2014-01-12 20:35:03 -03:00
Ignacio R. Morelle
b0417bc573 Truncate long Advanced Preferences entries with ellipses
This truncates long Advanced Preferences list entry labels and values
with ellipses using hardcoded character count limits in order to avoid
stretching out the listbox too much over the dialog's width.

Currently, this is notably necessary for the German translation.

The character count limits chosen for this commit (46 for the label, 8
for the value) only really work with the basic ASCII character set. Some
Unicode characters may be rendered wider. Furthermore, the Preferences
page selection list may container longer entries that push this listbox
further to the right, closer to the dialog's right edge.

Also, I really hope most languages have words for 'yes' or 'no' that are
at most 8 characters in length or can at least be read without ambiguity
when truncated to that limit. At least none of the translations we
support which have translated those words hit the limit.
2014-01-12 20:35:03 -03:00
Alarantalara
714bae2460 Make the trash terrains appear on the map again
They still need to be redone with standard macros or macroize the
existing code instead of leaving it all in terrain-graphics.cfg
2014-01-11 21:10:33 -05:00
Turuk
b282d315c4 UtBS: Adjusted for new Underground alias 2014-01-11 11:53:08 -05:00
Turuk
b74d723328 UtBS: Updating aliases to correct form. 2014-01-11 10:07:09 -05:00
Turuk
0ffa372f14 Villages fixed to give defense benefit again. 2014-01-11 09:50:30 -05:00
Emilien Rotival
6a531db9dc High res orb artwork for the Pandora theme 2014-01-10 17:06:48 +01:00
Ignacio R. Morelle
d6384695ec Fix broken image references in the Gameplay -> Time of Day help topic 2014-01-10 06:24:03 -03:00
Alarantalara
92b7e8fc39 Remove unneeded [and] 2014-01-09 16:20:38 -05:00
fendrin
a66a80efab Don't make assumptions on WML string value quote format. 2014-01-09 07:50:32 +01:00
fendrin
fa05514f5a Submenu for the "Back to turn x" autosave loading menu entries. 2014-01-09 07:17:57 +01:00
fendrin
159c91d492 Correct spelling in a comment. 2014-01-09 07:17:57 +01:00
fendrin
601b842709 Made an error message a little nicer. 2014-01-09 07:17:57 +01:00
fendrin
c25849b7ea Reduce the string for the village terrain from "Vit" to "Vt". 2014-01-09 07:17:57 +01:00
Ignacio R. Morelle
e9d5cecc27 Hide Village, Castle, and Keep Overlay terrains from help 2014-01-08 19:56:06 -03:00
Ignacio R. Morelle
614fe7d288 gui1: Gray out scrollbar buttons when the widget is first constructed
This makes it so the upwards scrolling arrow button is grayed out at
first when the scrollbar starts at the top; otherwise it was only grayed
out after the user scrolled down and then back to the top.
2014-01-08 05:44:13 -03:00
fendrin
708e0a7c94 Fix enemy moves not shown when hovering over the fiend's units. 2014-01-08 09:16:08 +01:00
Ignacio R. Morelle
e150c1d56f Don't list hide_help=yes unit type variations in the help system 2014-01-08 05:09:17 -03:00
Alexander van Gessel
0addcc7a11 Give '/' the same precedence as '*' (bug #18166) 2014-01-08 06:39:32 +01:00
Emilien Rotival
1c2f326dff Updated minimal artwork for small resolution themes.
The update is meant to accommodate an extra side button while giving more space to the map.
2014-01-08 00:33:14 +01:00
Allefant
66162c1374 [wmlparser2] Fixed another newline handling case.
The last commit fixed one issue but introduced yet another. Now both
should work. Need to investigate if parsing the .plain files really is
necessary, would make things much easier if there was no need for it.
2014-01-07 15:37:36 +01:00
Ignacio R. Morelle
164d632b54 New wesnoth-defaults utility script
I wrote this a long time ago and have been using it to ease testing of
Wesnoth's default configuration under different conditions ever since.

It creates a new configuration and data directory under /tmp that only
exists for the duration of the Wesnoth session, and disables WML cache
functionality.

This is extremely useful for quickly testing and debugging functionality
dependant on user configuration settings.
2014-01-07 02:39:31 -03:00
Alexander van Gessel
9c53daa2a5 Merge branch 'master' of github.com:trewe/wesnoth-old (PR #90) 2014-01-07 06:34:25 +01:00