Commit Graph

448 Commits

Author SHA1 Message Date
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
3edb598556 fix keys which got lost on some macro deprecation (fix for bug #19400) 2012-02-08 01:54:57 +00:00
Anonymissimus
8d814efa59 Fix an accidental terrain type change.
reported in the forums:
http://forums.wesnoth.org/viewtopic.php?f=15&t=36067&p=520268#p520268
http://forums.wesnoth.org/viewtopic.php?f=4&t=36047&p=520105#p520105

Ported from 1.10.
2012-02-07 00:47:32 +00:00
Jérémy Rosen
cbb063f0f8 apply patch #2642 by faab with khalifate removed.
a similar changed needs to be made there when it's added back to mainline
2012-02-06 20:04:35 +00:00
Anonymissimus
631e73b1d3 Make PLACE_HALO a local macro where it's needed. 2012-01-21 19:56:06 +00:00
Anonymissimus
8256ce533a fix some cropped unit images with previous 2 revisions 2012-01-21 19:26:29 +00:00
Anonymissimus
adeffd0027 move lua code in 2p_Hornshark_Island into an own embeddable file
(workaround for wmllint getting confused by this lua code)
2012-01-20 23:12:02 +00:00
Anonymissimus
fa78722b61 remove a new translatable string I introduced in 2012-01-14T22:08:45Z!anonymissimus@arcor.de
Can be reverted as soon as the stringfreeze is thawed.
2012-01-20 21:37:53 +00:00
Anonymissimus
18b67149a9 Added unit sets for the "not a default faction" case composed by Doc Paterson.
If any faction is not one of the default factions (e.g. Khalifate)
it gets these units now instead of both factions getting no units
at all. If the other faction is a default one it still gets the set
composed for it in particular in the same game.

(bug #19281)

http://forums.wesnoth.org/viewtopic.php?p=518542&sid=73489ef47cba8b3a39ac219353f64613#p518542
2012-01-14 22:08:45 +00:00
Steven Panek
78ae63c3d7 Removed pointless reliance on the Wesnoth Lua Pack. 2012-01-14 13:27:28 +00:00
Anonymissimus
478db11354 implement better faction detection (bug #19281)
Whenever default era is used the units should be placed for sure now,

this was IMHO not guaranteed since the recruits are internally a std::set,

so the first entry can change.

In case that one or both of the players have another faction than the
ones in the default era, none of the players gets the extra units.
Support for Khalifate can and should IMHO be added (given a suggested
set of units + locations).
2012-01-14 04:04:07 +00:00
Anonymissimus
fb5bc52c84 fix missing {IS_LOYAL}s (patch by kernigh, bug #19281) 2012-01-14 04:03:31 +00:00
Steven Panek
9ea9de3518 'villages_value' -> 'village_value'; fixes bug #19260. 2012-01-12 07:27:26 +00:00
Steven Panek
b3b83f9780 Made the strings in TURNS_OVER_ADVANTAGE translatable. 2011-12-13 21:38:58 +00:00
Steven Panek
b5655f30ba Applied patch #3061. 2011-11-28 19:44:49 +00:00
Eric S. Raymond
5432361b25 Fix a bad macro call detected by wmlscope. 2011-11-15 05:09:43 +00:00
Eric S. Raymond
65ab58a574 Fix wmllint glitches. 2011-11-15 04:58:47 +00:00
Eric S. Raymond
9488506827 Fix or work around broken image references. 2011-11-15 04:32:40 +00:00
Anonymissimus
1685311668 some wmllint fixes (the ones I feel confident about) 2011-11-08 17:26:00 +00:00
Steven Panek
24cb009342 Converted a hyphen-minus to an em dash; corrected a factual error. 2011-11-06 19:18:01 +00:00
Gunter Labes
1facd9eb65 New map: Aethermaw
Updated maps: Hamlets, Howling Ghost Badlands, Thousand Stings Garrison
2011-11-06 11:58:47 +00:00
Nils Kneuper
7965124be1 removal of khalifate (part1):
the khalifate are not stable enough so far to be in 1.10, they need a
lot more playtesting, rebalancing as well as adding d escriptions

because of this they can't be allowed in at the time of the string and
feature freeze since adjustments would basically be impossible then

"someone" will have to move the khalifate into an addon so that
development of them can be continued this way

this commit includes:

* removal of unit definition files

* removal of unit images

* removal of faction definition

* removal of era definition (khalifate+default era)

* removal of movement types

what was not removed:

* definition of the unit names

what someone else has to edit:

* khalifate still appear in tools/emacs_mode/wesnoth-wml-data.el but I
  have no idea how to handle that file...

TODO:
* add the removal to the (players_)changelog and the release notes
2011-11-06 11:27:36 +00:00
Steven Panek
d2c84fd1c1 'colour' -> 'color'. 2011-11-05 20:30:28 +00:00
Ignacio R. Morelle
a7a3599ddd Fixed remaining time of day areas...
...that should affect map borders in mainline campaigns and MP
scenarios (bug #16508)
2011-10-28 02:46:19 +00:00
Anonymissimus
8d18a0c440 remove lots of void terrain, reduce map size (FR bug #18825) 2011-10-20 23:27:05 +00:00
Steven Panek
b46538f0e8 Improved a couple of strings in Dark Forecast. 2011-10-15 04:38:34 +00:00
Steven Panek
db4277aedb Some improvements for Dark Forecast. 2011-10-14 22:46:32 +00:00
Steven Panek
fcc6f2e95d Killed instance of the singular 'they'. 2011-09-24 18:03:19 +00:00
Gunter Labes
0ac9a6075b integrated KOTF tournament prize into Silverhead Crossing 2011-08-16 19:20:49 +00:00
Eric S. Raymond
d3740f939e wmllint cleanup. 2011-08-14 22:02:16 +00:00
Steven Panek
bcbb34c0da Added tracking variable for the number of troops acquired;...
...simplifies the [show_if] for researching warfare; fixes bug #14822.
2011-08-12 06:04:33 +00:00
Steven Panek
2ed505497e Cleansed ANL of excessive macro use, expanded tabs,
...touched up a couple of strings; made stuff consistent.
2011-08-12 04:56:58 +00:00
Gunter Labes
616fdfa5cf Updated maps: Aethermaw, Hornshark Island, Sablestone Delta,
...Thousand Stings Garrison
2011-08-04 22:28:23 +00:00
Steven Panek
22cfb93509 Unhyphenated more directional words. 2011-07-25 23:36:33 +00:00
Steven Panek
b2cbebacdf Unhyphenate words such as 'South-East'. 2011-07-25 23:34:10 +00:00
Steven Panek
c911d3dc07 Use the transparent portraits. 2011-07-25 22:27:20 +00:00
Steven Panek
74f6b6eb3a Added Pango markup that should have been added awhile ago;...
...removed some TODOs.
2011-07-25 22:03:55 +00:00
Steven Panek
1f98792c19 Fixed bug #16477. 2011-07-25 21:31:31 +00:00
Eric S. Raymond
c4adb689e7 wmllint, spelling, and punctuation cleanup. 2011-05-08 15:13:41 +00:00
George Birthisel
10e8f23793 visual update to mp map 6p Volcano 2011-05-05 14:04:09 +00:00
Lukasz Dobrogowski
a3ba0a4af8 reverted 2011-04-28T12:11:25Z!lukasz.dobrogowski@gmail.com and 2011-05-04T13:38:34Z!lukasz.dobrogowski@gmail.com for now,
since it introduces a bug and isn't high priority
2011-05-05 08:01:41 +00:00
George Birthisel
6acbfe3d5b renamed Khalifate unit monawishy -> monawish 2011-05-05 00:52:49 +00:00
Ignacio R. Morelle
5f79ee3d04 Kalifa -> Khalifate, step 2 (directories and filenames) 2011-05-05 00:31:59 +00:00
Ignacio R. Morelle
ff215f2bfc Kalifa -> Khalifate, step 1 (WML) 2011-05-05 00:31:39 +00:00
Ignacio R. Morelle
934947b679 Rename all Khalifate unit type ids to match mainline conventions
Basically, this is: "unit-type" -> "Unit Type"

The exception to this rule is "qatif-al-nar", which became "Qatif-al-nar"
according to the translatable unit type name.
2011-05-04 23:53:33 +00:00
Lukasz Dobrogowski
2c9926e051 changed default leader for Kalifa to random, as it is in other factions 2011-05-04 13:38:34 +00:00
Nils Kneuper
b2f79b2472 apply wmlindent on basically all of mainline 2011-05-04 10:04:57 +00:00
George Birthisel
a554d362d5 new era: default+Kalifa for multiplayer play.
Some issues remain: missing art for a few units.  CERTAINLY some
unknown minor bugs/issues remain with things like movetypes, wrong
defense or mp for some terrain, wrong attack icons, sounds etc.
Testing is welcome!

new map: 6p Volcano

changelog/players changelog updated as well.
2011-05-04 00:47:50 +00:00
Lukasz Dobrogowski
849ac0c1ff patch #2642 by faabumc: MP default era: Use random leader when pick faction 2011-04-28 12:11:25 +00:00
Steven Panek
57fc13b40f Ran umcpropfix. 2011-04-22 07:46:28 +00:00