Commit Graph

49068 Commits

Author SHA1 Message Date
Simon Forsyth
8af3e72cb5 add files to Xcode project 2012-02-14 22:51:43 +00:00
Simon Forsyth
8500a0fe27 update changelogs (includes typo fix) 2012-02-14 22:50:42 +00:00
Simon Forsyth
59bb405b0c Improve transitions between bridges and rails in same direction 2012-02-14 22:47:33 +00:00
Anonymissimus
288ffbce06 changelog update 2012-02-14 21:26:20 +00:00
Anonymissimus
b35ba6bec6 Visual Studio 2010 projectfiles update 2012-02-14 21:25:58 +00:00
Anonymissimus
5d0284a513 wmllint rule for the 2 deprecations in my latest revisions
No changes to mainline needed. These were only valid for
almost one year however.
2012-02-14 21:25:33 +00:00
Anonymissimus
5e311eb9b5 remove wmllint rule for empty side=...
...in remove/place_shroud,modify_side/ai,gold

The first three have "all sides" as default if no side info given,
the ladder two have inline SSF support and "all sides" as default
as well, so it's valid syntax which shouldn't be warned about.
2012-02-14 21:25:08 +00:00
Anonymissimus
75592984ce Introduce support for [filter_side]<SSF> in SLF.
For villages. Keeps backwards compatibility for inline owner_side= at
the cost of confusing syntax (due to (possible) duplicate side
information).

This also adds SSF support in [store_villages].
2012-02-14 21:24:50 +00:00
Anonymissimus
6594a06918 remove deprecation for empty side= in modify_side,place*,remove_shroud
final syntax for these: all sides if neither side= nor [filter_side] are
present, all sides matching the ssf in [filter_side] if the tag is
present regardless of inline side=, and the sides matching inline side=
otherwise.

modify_side can't have inline SSF due to key conflicts. The other two
(and capture_village) already have inline SLF so it's a bad idea to
add an inline SSF. After removing filter_side in [gold] and
[modify_ai] this leaves 4 tags with possibly redundant side info
and confusing syntax (especially capture_village),
at the benefit of more backwards compatibility.
2012-02-14 21:24:31 +00:00
Anonymissimus
e605fce758 remove a done todo 2012-02-14 21:24:06 +00:00
Anonymissimus
60e18fe9c2 Introduce inline SSF support...
...in modify_ai and deprecate [modify_ai][filter_side].
2012-02-14 21:23:41 +00:00
Anonymissimus
4c22c47303 remove confusing unused parameters from game_events::get_sides_vector() 2012-02-14 21:23:23 +00:00
Anonymissimus
6419bb4841 remove the rule making wmllint putting side=...
...into set*,allow*,disallow_recruit,store_gold

Since it is valid syntax now (again, but defaulting to all sides).
2012-02-14 21:23:06 +00:00
Anonymissimus
21544198e1 Remove unused confusing parameters from wesnoth.get_sides.
These were never documented and ment to be removed.
2012-02-14 21:22:50 +00:00
Anonymissimus
679f18801c Introduce inline SSF support in [gold] and deprecate [gold][filter_side].
Since it should never have been added and is now redundant.
2012-02-14 21:22:32 +00:00
Anonymissimus
c44e2ea3ad Activate SSF support in allow_recruit, disallow_recruit and set_recruit.
The default for empty side= is now "all sides".
2012-02-14 21:22:15 +00:00
Nils Kneuper
1fb57fd9d9 change order in the changelog(s) to be more like an alphabetical order 2012-02-14 20:22:23 +00:00
Nils Kneuper
6af9069eec changelog update for the last commit 2012-02-14 20:16:17 +00:00
Nils Kneuper
06a695f04b replace $unit.type by $unit.language_name...
...since in translateable strings .type will always be english (which
is obviously bad for translations) added pofix rules for this and
applied them
2012-02-14 20:13:41 +00:00
Nils Kneuper
37e0b5c819 updated French translation 2012-02-14 20:01:03 +00:00
Alexander van Gessel
34bb36d595 Point stable gettext.wesnoth.org to 1.10 2012-02-14 20:19:32 +01:00
Mark de Wever
885e028be3 Fix compilation after 2012-02-08T22:22:34Z!fabianmueller5@gmx.de.
Fendrin please review the patch since commit 2012-02-08T02:13:25Z!alarantalara@gmail.com
looks rather broken:

- The default_difficulty_ is not used in the class.

- default_difficulty_ is defined as both a std::string and int.
2012-02-14 18:36:48 +00:00
Ignacio R. Morelle
f2f14ea934 Add an option to reset all hotkeys in Hotkey Settings in Preferences
(bug #3797)

This involves some code refactoring and internal API changes necessary
to remember what the default hotkeys are in WML.
2012-02-14 18:17:09 +00:00
Mark de Wever
1fc5dccf19 Remove unneeded include. 2012-02-14 18:10:04 +00:00
Mark de Wever
6b9bfd580d Remove unneeded includes. 2012-02-14 18:10:01 +00:00
Mark de Wever
114fe8e64c Remove unneeded include. 2012-02-14 18:09:58 +00:00
Mark de Wever
0b3e27e90a Remove unneeded include. 2012-02-14 18:09:55 +00:00
Mark de Wever
db4a39a814 Remove unneeded include. 2012-02-14 18:09:52 +00:00
Mark de Wever
30bd7c80c0 Remove unneeded include. 2012-02-14 18:09:50 +00:00
Mark de Wever
26bd147f56 Remove unneeded include. 2012-02-14 18:09:47 +00:00
Mark de Wever
c483d94c73 Remove unneeded include. 2012-02-14 18:09:44 +00:00
Mark de Wever
8ac85a82d5 Remove unneeded includes. 2012-02-14 18:09:41 +00:00
Mark de Wever
50ec8072c4 Remove unneeded includes. 2012-02-14 18:09:38 +00:00
Mark de Wever
d01b96f04d Remove unneeded include. 2012-02-14 18:09:33 +00:00
Fabian Müller
ce246cc1a7 Throw the right exception if the dialog gets canceled.
Preselection for the current difficulty level.
2012-02-08 22:22:34 +00:00
Ignacio R. Morelle
2565dbb271 Remove unused support for saving hotkeys to arbitrary WML objects
This change is entirely internal and has no user-facing aspects.
2012-02-08 21:44:01 +00:00
Anonymissimus
6569d72ada update helper.lua to use wesnoth.wml_actions instead of wesnoth.fire
(patch #3040 by SigurdFireDragon, slightly modified)
2012-02-08 21:28:02 +00:00
Anonymissimus
b13e6e13a7 adapt mainline lua and embedded lua to the deprecations I made...
...in 2012-02-07T23:27:51Z!anonymissimus@arcor.de

(no occurrences in other files...)
2012-02-08 21:27:45 +00:00
Anonymissimus
a637b4b20d changelog update 2012-02-08 16:10:09 +00:00
Elvish_Hunter
e2eb3b8fea [find_path]: length -> hexes 2012-02-08 10:16:05 +00:00
Elvish_Hunter
270630a87d Fixed General's experience when using DISABLE_GRAND_MARSHAL 2012-02-08 10:11:00 +00:00
Simon Forsyth
a9d70f0082 update other changelog 2012-02-08 02:14:49 +00:00
Ignacio R. Morelle
30790b5736 Implement ~BLEND(r,g,b,o) image path function (bug #11590)
It takes a specified RGB color and blends it with the target image by
certain opacity, specified either as a factor (e.g. 0.25) or percentage
(25%).

I chose BLEND over TINT for consistency with AnimationWML. Feel free to
discuss.
2012-02-08 02:08:11 +00:00
Anonymissimus
3edb598556 fix keys which got lost on some macro deprecation (fix for bug #19400) 2012-02-08 01:54:57 +00:00
Simon Forsyth
81f3519ae4 Look in more locations for the description of mixed terrain
If overlay description not present, try overlay name, then base description
Fixes bug #19411
2012-02-08 01:30:49 +00:00
Fabian Müller
82215caef6 code cleanup 2012-02-07 23:55:53 +00:00
Fabian Müller
3331efe103 Separated the difficulty dialog call...
...from the filename one when loading a savefile.
2012-02-07 23:50:30 +00:00
Anonymissimus
cb630f1bc4 changelog update 2012-02-07 23:28:50 +00:00
Anonymissimus
8b898d26bd rename compatibility-1.8.lua to backwards-compatibility 2012-02-07 23:28:15 +00:00
Anonymissimus
fb982ed400 Implement scheduled deprecation warnings for the functions...
...in compatibility-1.8.lua.

Except for wesnoth.fire, which should better stay I think.
2012-02-07 23:27:51 +00:00