19801 Commits

Author SHA1 Message Date
Chris Beck
5a64d43fae add [has_ally],[has_enemy] tags for standard side filter
Unlike [allied_with] and [enemy_of], these will match if only if
there is *any* ally or enemy matching the filter. The other versions
of the tag match only if all sides matching the filter are
allied / opposed.

This commit also adds a unit test that checks that it works as
expected.
2014-07-12 10:33:56 -04:00
Ignacio R. Morelle
76a7e47225 Give the Deterministic mode checkbox a compliant tooltip and label
Fixes bug #22229.
2014-07-07 17:19:26 -04:00
Ignacio R. Morelle
cc6674bca8 Improve WML menu items count option name and description 2014-07-07 16:46:30 -04:00
Chris Beck
1cb74d62f8 Merge pull request #229 from cbeck88/wmi_items_preference
add adv. preference for number of menu items displayed at once,

and remaining fixups there
2014-07-07 14:09:46 -04:00
ln-zookeeper
cdaab083d2 Fixed Darken's buggy ellipse 2014-07-05 15:17:37 +03:00
ln-zookeeper
c5de1c4ed8 Un-passivied Darken but prevented suicidal behavior 2014-07-05 15:06:27 +03:00
ln-zookeeper
982d868b94 Fix SCATTER_UNITS placing units on map borders 2014-07-05 14:04:41 +03:00
Ignacio R. Morelle
e527969bdc wmlindent pass on data/test/scenarios/, safe subset
This commit only includes files that weren't incorrectly modified by
wmlindent as the result of bugs; in other words, all files but the
following:

 * break_replay_with_lua_random.cfg
 * characterize_pathfinding.cfg
 * event_handlers_in_events.cfg
 * recruit_facing.cfg
2014-07-03 19:56:35 -04:00
Chris Beck
cee6874786 Merge branch 'refactor_unit_filter' 2014-07-03 19:27:36 -04:00
Ignacio R. Morelle
1799d5eb0d wmlindent pass on data/test/, safe subset
There is some WML in data/test/scenarios/ that causes wmlindent to
misbehave (bug #22264 and possibly others awaiting a more thorough
diagnosis), so that subdir is not part of this commit.
2014-07-02 22:04:52 -04:00
Ignacio R. Morelle
cc6766d12b wmlindent pass on data/
data/test/ excluded for now.
2014-07-02 21:43:02 -04:00
Ignacio R. Morelle
b79e531bf0 wmlindent pass on data/multiplayer/ 2014-07-02 21:42:31 -04:00
Ignacio R. Morelle
3a782bfcc3 wmlindent pass on data/campaigns/ 2014-07-02 21:41:49 -04:00
Ignacio R. Morelle
455e13ffcc wmlindent pass on data/core/ 2014-07-02 21:41:24 -04:00
Ignacio R. Morelle
e55458f2c6 wmlindent pass on data/themes/ 2014-07-02 21:40:59 -04:00
Chris Beck
4046666bee fixup lines with two closers on a line in wml test directory
wmlindent chokes on these

commit made with the following command:

find data/test/scenarios/ -type f -print0 | xargs -0 sed -i
"s|^\([[:space:]]*\[\/.*\]\)[[:space:]]*)\}[[:space:]]*$|\1\n)}|"
2014-07-02 21:29:04 -04:00
Chris Beck
b1b493bb57 add TODO notes about improving the wmi pager 2014-07-01 17:11:37 -04:00
Chris Beck
df44636990 add [show_if]'s to the test scenario for this feature 2014-07-01 14:22:00 -04:00
Turuk
fdf9b7daa8 Nightblade:Updated animation WML to current format 2014-06-30 21:45:51 -04:00
Chris Beck
6d09ea7d4f remove a utf8 BOM from data/core/Nightblade.cfg 2014-06-30 20:21:00 -04:00
Turuk
060de03798 Orcish Nightblade Addition
Adding base unit file as well as images/animations for Orcish
Nightblade unit.
2014-06-30 19:02:01 -04:00
ln-zookeeper
5dccaa20a7 Fixed various income issues 2014-06-30 22:59:49 +03:00
Turuk
f9cad251d0 LoW S10: Use alternate objective macro
{ALTERNATIVE_OBJECTIVE_CAPTION} used instead to remove translation
issues.
2014-06-29 08:11:26 -04:00
Chris Beck
fe3b5f4576 add adv. preference for number of menu items displayed at once
See earlier commit: f24f6adee142c088595647d5506737c48892bf38

Forum discussion: http://forums.wesnoth.org/viewtopic.php?f=6&t=40668
2014-06-28 22:47:56 -04:00
Ignacio R. Morelle
8ebc3bcd0d Fix missing images in the test scenario context menu
Both instances refer to the "All" editor palette's icon in 1.10.x, moved
and redrawn during 1.11.x so it doesn't really fit in this menu anymore.
So my logic is, why not put the BLEND() IPF to test?
2014-06-28 21:31:17 -04:00
Ignacio R. Morelle
9e447d1e3a gui2/taddon_filter_options: Allow filtering TC core add-ons 2014-06-26 20:54:37 -04:00
Ignacio R. Morelle
991b68a128 wam/html: Add add-on type labels for campaign_sp_mp and mod_mp 2014-06-26 19:17:54 -04:00
Turuk
d8514c3275 LoW S10: Added "or" to objectives
Previously the objectives were written in a way that indicated the
player would need to complete both.
2014-06-26 16:37:58 -04:00
Turuk
f24eed9efd LoW S9: Message on Dwarf Recruitment
Current message read as if Kalenz could recruit dwarves.  It has been
changed to make it clear that only Olurf can recruit dwarves for Kalenz.
2014-06-26 11:26:24 -04:00
Turuk
4fbcb93372 LoW S7: Dialogue change/Message Fix
Dialogue changed to have proper English formatting.  Eradion death
message fixed to remove potential of an enemy side expressing concern
over his death.
2014-06-26 10:08:21 -04:00
aquileia
74cb12eea0 German translation: Map overlays
Full set of the mainline campaign map overlays.

[ci skip]
2014-06-25 15:40:36 +02:00
aquileia
54218c8729 Remove all old style bigmap overlays but the titlescreen
Without the corresponding maps, the overlays are completely unnecessary.

The titlescreen is preserved for UMC use - all other cases are from
campaigns and aren't guaranteed to be included with the game.

[ci skip]
2014-06-25 15:40:35 +02:00
aquileia
f97ee90a82 Map localization: Remove duplicate old generation overlays
For those languages where new overlays are available, we don't need
to keep the old ones.

[ci skip]
2014-06-25 15:40:35 +02:00
Elvish_Hunter
9fd8ba5ef9 wmllint GUI: now the focus follows the mouse pointer, allowing use of the mouse wheel on the disabled Text widget 2014-06-25 14:54:56 +02:00
Elvish_Hunter
0ac30c7d0e Replaced the old description for wmllint_gui with the new one for GUI.pyw 2014-06-25 14:54:56 +02:00
Elvish_Hunter
ebb4a80f46 wmllint GUI: fixed a bug on Python 2.7.7 that froze the application on Windows 2014-06-25 14:54:56 +02:00
Alexander van Gessel
5ca7121822 Merge pull request #216 from Rift-Walker/scenario_era_mod_defines_mergable
Add define functionality to scenarios, eras, and mods
2014-06-25 09:20:38 +02:00
ln-zookeeper
6144517825 Updated bigmap credits 2014-06-24 22:47:51 +03:00
Turuk
6698f59e25 DM 07: Objective Change/DM 10: Add Ghast to [role] 2014-06-23 21:39:10 -04:00
Turuk
9af0b83de2 Altered objectives to reflect carryover bonus.
Player destroying standing stones would give the bonus, but the
objectives indicated otherwise.
2014-06-23 21:27:50 -04:00
Alexander van Gessel
0286032dd2 Remove non-existent unit ID from filter
Spotted by necrosporus.
2014-06-23 23:10:41 +02:00
Nathan Walker
be366af523 Implemented defines for largest mainline scenarios 2014-06-22 15:37:53 -05:00
Nathan Walker
b5fbda3530 Implement define= for mp scenarios and eras
Implemented reloading of configs with define= attributes in both mp_create and mp_wait::join_game().
Added myself to about.cfg and updated changelog.

Conflicts:
	changelog
	src/gamestatus.cpp
	src/gamestatus.hpp
	src/multiplayer_wait.cpp
2014-06-22 15:29:14 -05:00
Alain O'Dea
877e897f72 Grammar: missing preposition in tutorial 1 victory 2014-06-22 16:37:44 +00:00
Chris Beck
14808e186b add unit test for an object-based "feeding" ability
based on tekelili's forum post here:
http://forums.wesnoth.org/viewtopic.php?f=8&t=40449#p572206
2014-06-21 22:08:32 -04:00
Chris Beck
762efc278f add error reporting to [insert_tag] if it has no variable= field
The lack of reporting here is somewhat annoying so i patched it.
2014-06-21 18:13:42 -04:00
Chris Beck
5e9d356c9f unit tests for defining custom event handlers in events and firing 2014-06-21 16:58:40 -04:00
Ignacio R. Morelle
da8f3c824c NR: Search for White Magi respawn locs only within map edges (bug #22097)
Without this, the engine may match map borders and send the respawnee
back to the player's recall list as those count as invalid locations
like "recall","recall".
2014-06-21 10:17:42 -04:00
Ignacio R. Morelle
ce33ba394a NR: Refactor the White Magi respawn location finding code into a macro
This bit was subject to a particularly bad case of code copy-pasting
when the only real variable is the id of the first respawn hub
candidate.

Added a statement to clear the respawn_hub WML variable after running
the code since it's never used again afterwards.
2014-06-21 10:07:33 -04:00
Ignacio R. Morelle
6e90e01d70 Add a test case for bug #22215 2014-06-20 21:51:17 -04:00