54993 Commits

Author SHA1 Message Date
Groggy Dice
20bc51302e wmllint: rewrite test of permitted tags in [part]
The tags are now tested directly, rather than as a parent of a key. The old
test was probably not missing tags like the test for illegal child of [if]
did, because [part] could be anywhere in ancestors. Anyway, [part] rarely
contains other tags.
2014-01-03 10:35:25 -05:00
Groggy Dice
b68feb74f4 wmllint: clean up detection of "illegal children of [if]"
Previously, only lines that parse_attribute could process got passed to
local_sanity_check. So tags survived as ancestors of attribute lines, but
the lines with the tags themselves got discarded. Hence, the "illegal child
of [if]" error was actually triggered by attributes, and the line number
referred to that line rather than the child tag.

While working on [aspect] and [facet] (which originally preceded this commit),
I changed the TypeError exception to pass all lines to local_sanity_check. This
allows for a direct test of the child tags. It turns out many child tags were
not tested because all the attributes were nested deeper inside other tags,
so that the child tag was not the parent of any attribute.

Two core macros failed the new test with the tags [filter_second] and
[filter_second_attack]. This pointed up the fact that these were not in the
list of valid child tags.

It also turns out that tags inside #ifdefs didn't fit the original test,
because "#ifdef" was considered an ancestor, interrupting the link between
"[if]" and the child tag.
2014-01-03 10:35:23 -05:00
Groggy Dice
98abe1ea42 wmllint: rewrite "who" magic comment to match exact macro name
Previously, the string only needed to match part of the macro. However, this
left too much room for unintended matches. This change is also quicker for
wmllint to process.
2014-01-03 10:35:22 -05:00
Ignacio R. Morelle
01d0a49a1d sound: Call Mix_HaltChannel() directly for muted channels (bug #21426)
As described in detail in the bug report <https://gna.org/bugs/?21426>,
SDL_mixer's notion of a channel that's "not playing" appears to include
channels with their volume set to zero (a direct consequence of setting
Wesnoth's sound effects volume to zero in preferences or through the
[volume] WML action), which results in Mix_FadeOutChannel() doing
nothing, letting the channel resume playing at a later time once the
volume is reset.

For sound sources removed with [remove_sound_source] while the sound
effects volume is zero, this effectively means that once the volume is
reset, the sound sources will continue playing in SDL_mixer-land and
Wesnoth (or more specifically, WML) can't do anything about it because
the associated data structures have been released and the sound sources
don't exist in Wesnoth-land anymore.

Calling Mix_HaltChannel() directly when the channel's volume is already
set to zero avoids this issue and does not negate the point of the
fade-out effect since there is no way to fade out a channel when it's
muted anyway.

Needs backporting to 1.10.
2014-01-03 02:26:23 -03:00
Turuk
2831eacd83 Khalifate: Khalid Description 2014-01-02 22:50:27 -05:00
Turuk
7ca58d978f Khalifate: Shuja Description 2014-01-02 22:42:13 -05:00
Turuk
0bdaac38b9 Khalifate: Ghazi Description
Turuk learns how to spell 'the' properly.
2014-01-02 22:35:41 -05:00
Turuk
3da8428070 Khalifate: Ghazi Description 2014-01-02 22:34:27 -05:00
Turuk
b6c07634aa Khalifate: Arif Description 2014-01-02 22:15:12 -05:00
Turuk
f656453f66 Khalifate: Elder Falcon Description 2014-01-02 21:45:33 -05:00
Turuk
902dd14646 Khalifate: Tabib Description 2014-01-02 21:35:10 -05:00
Turuk
146b902c9d Khalifate: Hakim Description 2014-01-02 20:19:34 -05:00
Turuk
a4fa7fc1a3 Khalifate: Falcon Description 2014-01-02 20:18:05 -05:00
Alexander van Gessel
d1de043ea9 Merge branch 'master' of github.com:wesnoth/wesnoth-old 2014-01-03 01:14:11 +01:00
Alexander van Gessel
3a2c24d2d0 Fix invalid vector index (bug #21402) 2014-01-03 01:13:07 +01:00
fendrin
9ee891db99 Context menu item for saving areas. 2014-01-03 00:33:37 +01:00
ln-zookeeper
8967551e28 Updated changelogs. 2014-01-02 21:51:41 +02:00
mattsc
3ec1702835 Update changelog with AI aggression changes 2014-01-02 11:01:56 -08:00
mattsc
c01e534567 Mainline campaigns: don't use aggression > 1
aggression=1 is the largest sensible value.  For larger values, the AI
actually prefers attacks in which it receives more damage, leading to
it choosing the wrong attacks.
2014-01-02 10:52:32 -08:00
fendrin
aa51ee8eee Small code cleanups. 2014-01-02 19:46:44 +01:00
fendrin
87be0f688a Fix the alias attribute of the "cloud" terrain. 2014-01-02 19:46:44 +01:00
Nils Kneuper
2b210da5c9 make sure the OpenPandora build does not crash because of libvorbis
Extension of commit 329e7cea968a by fendrin. Now when a build parameter
is defined, the cmake recipe will no longer link in libvorbisfile (just
linking it in makes the app crash when ogg-vorbis music is played).
2014-01-02 19:04:01 +01:00
fendrin
4a9ca54455 Made the "Pandora" theme the default one for the Pandora handheld. 2014-01-02 18:38:20 +01:00
fendrin
329e7cea96 Disable the use of vorbisfile on the Pandora.
This is an attempt to fix the Segfault at the title screen on the named
system.
2014-01-02 16:47:21 +01:00
fendrin
bebcefb587 Save the team_name and user_team_name attribute. 2014-01-02 15:02:28 +01:00
fendrin
71f808e9d9 Corrected the id of the default fg terrain. 2014-01-02 13:43:49 +01:00
fendrin
ab90eedd5f Remove obsolete overlay= attributes from actions which have own icons. 2014-01-02 11:53:06 +01:00
fendrin
c0e2795cba Rename the minimap action icons to match the action name. 2014-01-02 11:52:00 +01:00
fendrin
105763c5ca Check for the smallest (25px) size if to use an action icon. 2014-01-02 11:50:50 +01:00
fendrin
89576acca6 Made use of the new bigmap macro in LoW1 2014-01-02 10:44:20 +01:00
fendrin
1c2527df9a A macro for the new LoW bigmap from Zookeeper. 2014-01-02 10:44:19 +01:00
fendrin
99ae84f32a Fix the loading of embedded and referenced maps. 2014-01-02 10:44:19 +01:00
fendrin
657f3c4c80 Added image_icon with CROP argument making in fiting the sidebar box. 2014-01-02 10:44:19 +01:00
fendrin
10b56130b1 Replaced forest segments with those from the different climate zone.
This is just an attempt to make the map look more like "Prairie".
2014-01-02 10:44:19 +01:00
fendrin
03f33bfc30 Just 4 pieces of terrain to beautify the map. 2014-01-02 10:44:19 +01:00
Andrius Silinskas
54caecc3c0 Added missing 'virtual' for some class dtors. 2014-01-02 09:30:54 +00:00
Ignacio R. Morelle
f779202f44 display: Drop trailing underscore from the color_adjust_blue_ WML option
This was used in saved games during the serialization of the display
configuration (see the display::write() method) since around 1.10.x. The
trailing underscore was clearly not intentional, as the siblings of this
attribute for the red and green channels don't have it, so drop it.

Resulting from this commit, saved games from previous versions that did
have the trailing underscore and were affected by a [color_adjust]
action may be loaded with the wrong color channel configuration (blue
will be reset to the default of zero), but this situation should be rare
enough to not absolutely require backwards-compatibility code.
2014-01-02 04:00:21 -03:00
Ignacio R. Morelle
ba212d70f8 about: Split multi-line section headers for the credits screen
Multi-line section headers such as those generated by campaigns with
multi-line titles result in slight scrolling glitches because the
scrolling code assumes every entry in the text vector to comprise a
single line.

We don't want to split those headers for the help screen because the
current approach results in nicely formatted headers for the
Contributors page there, so a hacky compromise for now should be to only
split multiline headers for the scrolling credits.

An alternative would have been to make the text vector a linked list so
about::show_about could deal with this issue directly, but that seems
rather wasteful.
2014-01-02 02:48:35 -03:00
ln-zookeeper
4d004b8575 Removed the old-style map from the credits. 2014-01-01 16:55:34 +02:00
ln-zookeeper
61effe50fd Removed images-only [about] tag which does nothing anymore. 2014-01-01 13:12:30 +02:00
Ignacio R. Morelle
6c58f9539a Remove file that doesn't belong in the Git repository 2014-01-01 02:23:47 -03:00
Ignacio R. Morelle
1d2a59b0ab addons.w.o: New Year copyright update 2014-01-01 02:18:05 -03:00
Ignacio R. Morelle
503492dc96 website: New Year copyright update 2014-01-01 02:17:42 -03:00
Ignacio R. Morelle
785d6c8a17 units.w.o: New Year copyright update 2014-01-01 02:16:52 -03:00
Ignacio R. Morelle
a4f47a63c7 New Year copyright update 2014-01-01 02:08:52 -03:00
Espreon
8d16e1630c leanto.png depicts a lean-to; not a lectern. 2013-12-31 21:42:01 -05:00
ln-zookeeper
2570d7345b Merge branch 'master' of https://github.com/wesnoth/wesnoth-old 2014-01-01 03:05:31 +02:00
ln-zookeeper
461a2573aa Changed the gold carryover to "inverse early finish bonus" and made a bunch of balancing changes. 2014-01-01 03:03:09 +02:00
Ignacio R. Morelle
74e933bcc0 Revert wmlindent pass on data/gui/ by bumbadadabum
Commit ef2bdfbc12d97f7bde074cc1b14435abb9659182 includes a wmlindent
pass on data/gui/ which is currently not intended to be wmlindent-ed
(see the 'reindent' data/tools/Makefile target).

One adverse effect of the commit includes portraits being rendered near
the top of the screen instead of the bottom in the [message] GUI2
dialogs.
2013-12-31 19:45:17 -03:00
Ignacio R. Morelle
9e3815fda1 Fix broken terrain alias causing lit Mushroom Groove to be unwalkable 2013-12-31 17:24:46 -03:00