[Commits] [wesnoth/wesnoth] 9bcfb8: Correct then/than mix-up.
GitHub
noreply at github.com
Mon Sep 21 11:08:03 UTC 2015
Branch: refs/heads/sdl2
Home: https://github.com/wesnoth/wesnoth
Commit: 9bcfb8dff583641866c51df49b880071a538af7f
https://github.com/wesnoth/wesnoth/commit/9bcfb8dff583641866c51df49b880071a538af7f
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-08-27 (Thu, 27 Aug 2015)
Changed paths:
M data/core/encyclopedia/geography.cfg
Log Message:
-----------
Correct then/than mix-up.
Commit: 27f6aea2150f26b8eb0d597dbab16c475400db70
https://github.com/wesnoth/wesnoth/commit/27f6aea2150f26b8eb0d597dbab16c475400db70
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-08-29 (Sat, 29 Aug 2015)
Changed paths:
M data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
M data/campaigns/Liberty/utils/utils.cfg
Log Message:
-----------
Correcting born -> borne
born -> borne
Plus unguessable isn't really a word...
Commit: f74796809aa478b102bf74d74cd91b2f83e72118
https://github.com/wesnoth/wesnoth/commit/f74796809aa478b102bf74d74cd91b2f83e72118
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-08-30 (Sun, 30 Aug 2015)
Changed paths:
M data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
Log Message:
-----------
Correct its vs it's
Commit: a5aed635eb651dccd69b36408942439910241737
https://github.com/wesnoth/wesnoth/commit/a5aed635eb651dccd69b36408942439910241737
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-08-30 (Sun, 30 Aug 2015)
Changed paths:
M data/campaigns/The_Rise_Of_Wesnoth/scenarios/21_The_Plan.cfg
Log Message:
-----------
Add missing full stop.
Commit: f2eadeb5511c62efa95d84789d404729ce96eb5e
https://github.com/wesnoth/wesnoth/commit/f2eadeb5511c62efa95d84789d404729ce96eb5e
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-08-30 (Sun, 30 Aug 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
Log Message:
-----------
Grammatical corrections in Elves' Last Stand.
Commit: 48c2098902a7221adacd202621e38dc85f180790
https://github.com/wesnoth/wesnoth/commit/48c2098902a7221adacd202621e38dc85f180790
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-08-30 (Sun, 30 Aug 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
Log Message:
-----------
maybe = perhaps vs may be = might be
Commit: f3d23218a8e6022f04fe5a5f559f0d3a165ee9f2
https://github.com/wesnoth/wesnoth/commit/f3d23218a8e6022f04fe5a5f559f0d3a165ee9f2
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-08-30 (Sun, 30 Aug 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/15_The_Treaty.cfg
Log Message:
-----------
Separated 'can not' is more common where 'not' forms part of a construction with subsequent words.
Commit: 2db2e81e7c3f3335cf2fffd980aa2d80e9d4eb87
https://github.com/wesnoth/wesnoth/commit/2db2e81e7c3f3335cf2fffd980aa2d80e9d4eb87
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-08-30 (Sun, 30 Aug 2015)
Changed paths:
M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg
Log Message:
-----------
In this context, referring to the city forming the Saurians' central city, capital is the correct spelling.
Commit: 73b10f315a02c753d7b57c3b3c51194486633236
https://github.com/wesnoth/wesnoth/commit/73b10f315a02c753d7b57c3b3c51194486633236
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-08-31 (Mon, 31 Aug 2015)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
M data/core/macros/abilities.cfg
Log Message:
-----------
Separated 'can not' is more common where 'not' forms part of a construction with subsequent words.
Commit: 52f8080a9285c28d2f020c52ee93338c9b118fde
https://github.com/wesnoth/wesnoth/commit/52f8080a9285c28d2f020c52ee93338c9b118fde
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-08-31 (Mon, 31 Aug 2015)
Changed paths:
M doc/manual/manual.en.html
M doc/manual/manual.en_GB.html
Log Message:
-----------
Some grammatical corrections.
Commit: 531c1d9dbd0e511026befc6d3282499049b7f425
https://github.com/wesnoth/wesnoth/commit/531c1d9dbd0e511026befc6d3282499049b7f425
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-08-31 (Mon, 31 Aug 2015)
Changed paths:
M data/core/units/humans/Loyalist_Royal_Guard.cfg
Log Message:
-----------
Surely 'capital' is referring to Weldyn, not some government building within it, especially given the reference to palace grounds.
Commit: 3a0dd3ed2442a73309f2c2450bb98cb32f3180bb
https://github.com/wesnoth/wesnoth/commit/3a0dd3ed2442a73309f2c2450bb98cb32f3180bb
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-02 (Wed, 02 Sep 2015)
Changed paths:
M data/campaigns/Dead_Water/scenarios/02_Flight.cfg
M data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
M data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg
M data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
Log Message:
-----------
Add missing apostrophe in contraction of 'let us'.
Commit: 496e5b5437a084307a69fda531f8db1d93759048
https://github.com/wesnoth/wesnoth/commit/496e5b5437a084307a69fda531f8db1d93759048
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-02 (Wed, 02 Sep 2015)
Changed paths:
M data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
Log Message:
-----------
Repositioned 'south' to make more sense.
Commit: c9fbe1315607fb6e20b928a5ea1fdadaa89ab98f
https://github.com/wesnoth/wesnoth/commit/c9fbe1315607fb6e20b928a5ea1fdadaa89ab98f
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-03 (Thu, 03 Sep 2015)
Changed paths:
M data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_of_Peace.cfg
Log Message:
-----------
Make hyphenation consistent
Commit: 0b9fbb9678bf73b9b7626f5fbcbb3be2c3340dc7
https://github.com/wesnoth/wesnoth/commit/0b9fbb9678bf73b9b7626f5fbcbb3be2c3340dc7
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-03 (Thu, 03 Sep 2015)
Changed paths:
M data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_the_Harbor_of_Tirigaz.cfg
Log Message:
-----------
Punctuation, for clarity on who is heading to Tirigaz.
Commit: 45dcb6893563782746bd4bb167584fffb9da2777
https://github.com/wesnoth/wesnoth/commit/45dcb6893563782746bd4bb167584fffb9da2777
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-03 (Thu, 03 Sep 2015)
Changed paths:
M data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_the_Smug.cfg
Log Message:
-----------
Grammatical correction.
Commit: c355cd95032f842408b053f610f45d0fa1a71e28
https://github.com/wesnoth/wesnoth/commit/c355cd95032f842408b053f610f45d0fa1a71e28
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-03 (Thu, 03 Sep 2015)
Changed paths:
M data/campaigns/Son_Of_The_Black_Eye/scenarios/16_The_Coward.cfg
Log Message:
-----------
Add missing 'he' to make more sense of the sentence.
Commit: 210ba16c6e764d9eb1e0428b6bf8cd283950023b
https://github.com/wesnoth/wesnoth/commit/210ba16c6e764d9eb1e0428b6bf8cd283950023b
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-04 (Fri, 04 Sep 2015)
Changed paths:
M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg
M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
Log Message:
-----------
Grammar correction: 'have taken' vs 'have took'
Commit: d0006da05d3d13a88b9541b37308882861f4a0bc
https://github.com/wesnoth/wesnoth/commit/d0006da05d3d13a88b9541b37308882861f4a0bc
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-04 (Fri, 04 Sep 2015)
Changed paths:
M data/campaigns/Dead_Water/utils/items.cfg
M data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
Log Message:
-----------
Remove redundant wording.
Commit: 529bb982a77e0f874912d70ffe2a657d25dc2a04
https://github.com/wesnoth/wesnoth/commit/529bb982a77e0f874912d70ffe2a657d25dc2a04
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-05 (Sat, 05 Sep 2015)
Changed paths:
M doc/manual/manual.en.html
Log Message:
-----------
Official name is just OS X now.
Commit: 971243975bb0da488ef22b7fbf85a06d8e5e7ca8
https://github.com/wesnoth/wesnoth/commit/971243975bb0da488ef22b7fbf85a06d8e5e7ca8
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-05 (Sat, 05 Sep 2015)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/04_Clearing_the_Mines.cfg
Log Message:
-----------
'Most vile' vs 'most vilest' + other minor changes to make more sense of sentences
Commit: c55cd29297bd8447124767842b8d5605a631cd19
https://github.com/wesnoth/wesnoth/commit/c55cd29297bd8447124767842b8d5605a631cd19
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-05 (Sat, 05 Sep 2015)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
Log Message:
-----------
Added missing comma.
Commit: e14333bad0dffff10e5ed23fefb5c5bfadf930de
https://github.com/wesnoth/wesnoth/commit/e14333bad0dffff10e5ed23fefb5c5bfadf930de
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-05 (Sat, 05 Sep 2015)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/05a_02_Dealings.cfg
Log Message:
-----------
Correcting a typo.
Commit: 53191251fc11e7baed83b743a3d6c219c9b9330d
https://github.com/wesnoth/wesnoth/commit/53191251fc11e7baed83b743a3d6c219c9b9330d
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-05 (Sat, 05 Sep 2015)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/07a_Dealing_with_Dwarves.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
Log Message:
-----------
Remove redundant wording.
Commit: 6043550999deabb8f44b48226834e7c23f35f90d
https://github.com/wesnoth/wesnoth/commit/6043550999deabb8f44b48226834e7c23f35f90d
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-05 (Sat, 05 Sep 2015)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg
Log Message:
-----------
Remove duplicate word.
Commit: bcece91e9a2c330585684aa85454c35b974cb7fd
https://github.com/wesnoth/wesnoth/commit/bcece91e9a2c330585684aa85454c35b974cb7fd
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-05 (Sat, 05 Sep 2015)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg
Log Message:
-----------
'guys' seems excessively colloquial here.
Commit: 464646978d870e6c3bfb33e4254961cc5d0a108f
https://github.com/wesnoth/wesnoth/commit/464646978d870e6c3bfb33e4254961cc5d0a108f
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-05 (Sat, 05 Sep 2015)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/09b_Judgment.cfg
Log Message:
-----------
Correct nonsensical text.
Commit: 473548cc89ed19bacf10363b2f4c9e0b6432a9e0
https://github.com/wesnoth/wesnoth/commit/473548cc89ed19bacf10363b2f4c9e0b6432a9e0
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-05 (Sat, 05 Sep 2015)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
Log Message:
-----------
Sentence structure may be a bit confusing but it seems to follow the pattern of 'no sooner *than*'.
Commit: 87acd93626691e681eb5fa12c71e3914f7f0d482
https://github.com/wesnoth/wesnoth/commit/87acd93626691e681eb5fa12c71e3914f7f0d482
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-05 (Sat, 05 Sep 2015)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
Log Message:
-----------
Added missing comma.
Commit: 643d55e4670488d80023b540eb1a5415cb465f15
https://github.com/wesnoth/wesnoth/commit/643d55e4670488d80023b540eb1a5415cb465f15
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-05 (Sat, 05 Sep 2015)
Changed paths:
M data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg
M data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
M data/campaigns/Northern_Rebirth/scenarios/14a_Epilogue.cfg
Log Message:
-----------
'x and I' vs 'me and x'
Commit: e1c1b5c4befa0a52030bfbe27df83a8b40781e2f
https://github.com/wesnoth/wesnoth/commit/e1c1b5c4befa0a52030bfbe27df83a8b40781e2f
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-05 (Sat, 05 Sep 2015)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/14a_Epilogue.cfg
Log Message:
-----------
'gonna' sounds rather informal for Eryssa + 'Father' is Morvin's title, not his relationship to Abhai.
Commit: f42e386d364e26bffe744e3016f89be7cf44466b
https://github.com/wesnoth/wesnoth/commit/f42e386d364e26bffe744e3016f89be7cf44466b
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-05 (Sat, 05 Sep 2015)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
Log Message:
-----------
Slight re-arrangement of 'than' after discussion with vultraz and shadowm.
Commit: a6fc91090e87cad593952b5f906ae7a778d1d3b0
https://github.com/wesnoth/wesnoth/commit/a6fc91090e87cad593952b5f906ae7a778d1d3b0
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-05 (Sat, 05 Sep 2015)
Changed paths:
M data/core/encyclopedia/geography.cfg
Log Message:
-----------
Turns out it wasn't a then/than mix-up. Still needed correcting, though.
Commit: 00b3c7b214f83779372a65c1720d16d48a7702da
https://github.com/wesnoth/wesnoth/commit/00b3c7b214f83779372a65c1720d16d48a7702da
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-09-15 (Tue, 15 Sep 2015)
Changed paths:
M src/game_state.cpp
Log Message:
-----------
Code style and spelling fixes
Commit: 424d1e45ff3f9ab6f1436f6bdd49543d35980ba8
https://github.com/wesnoth/wesnoth/commit/424d1e45ff3f9ab6f1436f6bdd49543d35980ba8
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-09-15 (Tue, 15 Sep 2015)
Changed paths:
M src/serialization/ucs4_convert_impl.hpp
M src/serialization/unicode.hpp
M src/serialization/unicode_cast.hpp
M src/serialization/unicode_types.hpp
Log Message:
-----------
Doxygen fixes
Commit: 7dd19632732a445efbbcc0b745f6a632d33a38a2
https://github.com/wesnoth/wesnoth/commit/7dd19632732a445efbbcc0b745f6a632d33a38a2
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-09-15 (Tue, 15 Sep 2015)
Changed paths:
M src/play_controller.cpp
M src/play_controller.hpp
Log Message:
-----------
Doxygen or code formatting fixes
Commit: b2900a310a240fb57b08690af48f2a407eea03c0
https://github.com/wesnoth/wesnoth/commit/b2900a310a240fb57b08690af48f2a407eea03c0
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-09-15 (Tue, 15 Sep 2015)
Changed paths:
M src/server/game.cpp
Log Message:
-----------
Comment spelling or formatting fixes
Commit: 928b6e80089055ae9b9cadc05caea64eaac287d3
https://github.com/wesnoth/wesnoth/commit/928b6e80089055ae9b9cadc05caea64eaac287d3
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-09-15 (Tue, 15 Sep 2015)
Changed paths:
M src/replay.cpp
M src/scripting/game_lua_kernel.cpp
M src/scripting/lua_gui2.cpp
Log Message:
-----------
Comment spelling fixes
Commit: e8caf1fac476027f7bdea4c3c5c762dabbcdcf1f
https://github.com/wesnoth/wesnoth/commit/e8caf1fac476027f7bdea4c3c5c762dabbcdcf1f
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-09-16 (Wed, 16 Sep 2015)
Changed paths:
M changelog
M src/game_events/action_wml.cpp
Log Message:
-----------
Remove unnecessary y scrolling offset from [message] implementation
The problem this tried to solve was solved long ago, when the new GUI2
[message] dialog was introduced in 1.5.x. Formerly, [message] was
displayed at the top of the screen, so with sufficiently long messages
and a small screen resolution, the viewport could be scrolled in such a
way that the target unit was covered by the dialog.
Nowadays [message] is displayed at the bottom and the scrolling
algorithm is more or less sane, so this hack is completely unneeded.
(For reference, this was originally introduced in commit
83a332a8692260f50ab76bb7f0ae754baf6507d7. For a reference screenshot of
what it would do back in the day, see
<http://www.wesnoth.org/images/sshots/wesnoth-1.1.9-shot3.jpg>.)
Thanks to celticminstrel and vultraz for bringing this up on IRC.
Commit: 0a8abb8328ef326caada108c9c2ebf8947936ff9
https://github.com/wesnoth/wesnoth/commit/0a8abb8328ef326caada108c9c2ebf8947936ff9
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-09-16 (Wed, 16 Sep 2015)
Changed paths:
M src/game_events/action_wml.cpp
Log Message:
-----------
Remove unneeded temporary copy of a variable
Commit: 17b3c98a5e1237decc96631a7ed22250754ab517
https://github.com/wesnoth/wesnoth/commit/17b3c98a5e1237decc96631a7ed22250754ab517
Author: gfgtdf <tischpapier at gmail.com>
Date: 2015-09-16 (Wed, 16 Sep 2015)
Changed paths:
M src/game_events/action_wml.cpp
Log Message:
-----------
fix side_for in [message]s with input
the previous impleentation could casue OOS.
Commit: ac3118508318d8898d1094c77d9bd7ed2a230fc8
https://github.com/wesnoth/wesnoth/commit/ac3118508318d8898d1094c77d9bd7ed2a230fc8
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2015-09-16 (Wed, 16 Sep 2015)
Changed paths:
M data/tools/wmllint-1.4
Log Message:
-----------
wmllint-1.4: use 'with' statement when handling files
Commit: 2877a6a489e423e962e0c12cd7892363c6c23985
https://github.com/wesnoth/wesnoth/commit/2877a6a489e423e962e0c12cd7892363c6c23985
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2015-09-16 (Wed, 16 Sep 2015)
Changed paths:
M data/tools/wmllint-1.4
Log Message:
-----------
wmllint-1.4: use enumerate() to iterate over lines
Commit: f4f11c03fc7da0942d481b59959be8facc10959e
https://github.com/wesnoth/wesnoth/commit/f4f11c03fc7da0942d481b59959be8facc10959e
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2015-09-16 (Wed, 16 Sep 2015)
Changed paths:
M data/tools/wmllint-1.4
Log Message:
-----------
wmllint-1.4: simplify a line modification
Commit: 3afe74b5de5847415d136508d9bbff9d926bf229
https://github.com/wesnoth/wesnoth/commit/3afe74b5de5847415d136508d9bbff9d926bf229
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2015-09-16 (Wed, 16 Sep 2015)
Changed paths:
M data/tools/wmllint-1.4
Log Message:
-----------
wmllint-1.4: renamed a variable
'i' wasn't used in places visible from within the cycle, so using 'j' was pointless.
Commit: 53ee364bab1b7e3ce0e81131ad67766720f5c904
https://github.com/wesnoth/wesnoth/commit/53ee364bab1b7e3ce0e81131ad67766720f5c904
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2015-09-16 (Wed, 16 Sep 2015)
Changed paths:
M data/tools/wmllint-1.4
Log Message:
-----------
wmllint-1.4: renamed two variables
Used 'r' instead of 'm' if the code refers to ranged attacks (instead of melee); also, ensure that the regexps check the modified versions of the line.
Commit: bce13542b15e52c31bdd2e7defcdc488d45a7095
https://github.com/wesnoth/wesnoth/commit/bce13542b15e52c31bdd2e7defcdc488d45a7095
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-09-17 (Thu, 17 Sep 2015)
Changed paths:
M src/game_events/action_wml.cpp
Log Message:
-----------
Fixup 17b3c98a5e12
Commit: e9be2324b5844e925b6b557e190bdc33253c20b6
https://github.com/wesnoth/wesnoth/commit/e9be2324b5844e925b6b557e190bdc33253c20b6
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2015-09-16 (Wed, 16 Sep 2015)
Changed paths:
M changelog
M players_changelog
M po/wesnoth-editor/hu.po
M po/wesnoth-help/hu.po
M po/wesnoth-lib/hu.po
M po/wesnoth-units/hu.po
M po/wesnoth/hu.po
Log Message:
-----------
updated Hungarian translation
Commit: af2e16f842b6edc8899fbdaa8449a65d678693b9
https://github.com/wesnoth/wesnoth/commit/af2e16f842b6edc8899fbdaa8449a65d678693b9
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-17 (Thu, 17 Sep 2015)
Changed paths:
M src/config.cpp
M src/config.hpp
M src/serialization/parser.cpp
M src/variable_info.cpp
Log Message:
-----------
Add sanity-checking for WML attribute/tag/variable names to prevent invalid save files
- It's now an error to set an invalid variable
- If an invalid key or tag is somehow set, it won't be written to the file (with an error message in the log)
- There's an API function config::valid_id() which can be used to catch issues earlier.
Commit: 91ac90db111eac4330478179622dd05afaf30cf5
https://github.com/wesnoth/wesnoth/commit/91ac90db111eac4330478179622dd05afaf30cf5
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-18 (Fri, 18 Sep 2015)
Changed paths:
M changelog
M src/scripting/lua_gui2.cpp
M src/scripting/lua_gui2.hpp
M src/scripting/lua_kernel_base.cpp
M src/scripting/lua_kernel_base.hpp
Log Message:
-----------
Lua API: Add wesnoth.show_message_dialog()
Commit: 2fd07684f2afbcd8f7d5d336c11589dab2702594
https://github.com/wesnoth/wesnoth/commit/2fd07684f2afbcd8f7d5d336c11589dab2702594
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-18 (Fri, 18 Sep 2015)
Changed paths:
M changelog
M players_changelog
Log Message:
-----------
Update changelog
Commit: 617fb262387d2a4977cf5f474ea4cbf85c870072
https://github.com/wesnoth/wesnoth/commit/617fb262387d2a4977cf5f474ea4cbf85c870072
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-18 (Fri, 18 Sep 2015)
Changed paths:
M changelog
M src/synced_commands.cpp
Log Message:
-----------
Add debug command :unit status=list,of,statuses,to,add,or,-remove
Commit: edce9ac64ae4e5e0c4b7d20cb9634b2165a29675
https://github.com/wesnoth/wesnoth/commit/edce9ac64ae4e5e0c4b7d20cb9634b2165a29675
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M run_wml_tests
Log Message:
-----------
run_wml_tests: Add some fallback cases and a few more options
- If timeout is missing, it disables timeout and skips any tests that expect it
- Pass -t0 to get the above behaviour even if timeout is present
- Detect if timeout doesn't support --kill-after
- Mac users: Pass -pxcode to automatically find the Wesnoth binary in XCode's DerivedProducts folder
- In non-verbose mode, give progress report by printing a dot before each test
This only happens in non-verbose mode because this method of reporting progress makes most sense
if nothing else is printed.
Commit: a5184181df15199da28cb62b2fdcea7dd3afad1d
https://github.com/wesnoth/wesnoth/commit/a5184181df15199da28cb62b2fdcea7dd3afad1d
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
A data/test/scenarios/filter_this_unit.cfg
M src/unit_filter.cpp
M src/variable.cpp
M src/variable.hpp
M wml_test_schedule
Log Message:
-----------
Fix SUF $this_unit only working within [filter_wml]
Commit: 12c96a94d24d9a353df82f342a695e6e6d5f8409
https://github.com/wesnoth/wesnoth/commit/12c96a94d24d9a353df82f342a695e6e6d5f8409
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M changelog
M data/core/macros/abilities.cfg
M src/actions/attack.cpp
M src/unit.hpp
M src/unit_abilities.cpp
M src/unit_filter.cpp
M src/unit_filter.hpp
Log Message:
-----------
New autostored WML variable $other_unit for [filter_adjacent]
Also accessible in:
- Weapon specials ([filter_self], [filter_opponent], [filter_attacker], [filter_defender])
- Abilities ([affect_adjacent][filter])
The backstab weapon special is now implemented using this.
(In a weapon special filter, units are guaranteed to be facing each other.)
Commit: 9940ee40366715afefb68a09501231fbb14ebdfd
https://github.com/wesnoth/wesnoth/commit/9940ee40366715afefb68a09501231fbb14ebdfd
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M changelog
M src/map_location.cpp
Log Message:
-----------
New rotate operators for directions
Commit: f54d6b5d28cb15ff9adbb452331358032339af92
https://github.com/wesnoth/wesnoth/commit/f54d6b5d28cb15ff9adbb452331358032339af92
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M data/campaigns/Dead_Water/units/Soldier_King.cfg
M data/campaigns/Dead_Water/units/Warrior_King.cfg
M data/campaigns/Dead_Water/units/Young_King.cfg
M data/campaigns/Delfadors_Memoirs/units/King_of_Wesnoth.cfg
M data/campaigns/Delfadors_Memoirs/units/Mage_Commander.cfg
M data/campaigns/Delfadors_Memoirs/units/Mage_Leader.cfg
M data/campaigns/Delfadors_Memoirs/units/Mage_Magister.cfg
M data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg
M data/campaigns/Heir_To_The_Throne/units/Commander.cfg
M data/campaigns/Heir_To_The_Throne/units/Lord.cfg
M data/campaigns/Heir_To_The_Throne/units/Princess.cfg
M data/campaigns/Liberty/units/Death_Squire.cfg
M data/campaigns/Liberty/units/Shadow_Lord.cfg
M data/campaigns/Liberty/units/Shadow_Mage.cfg
M data/campaigns/Sceptre_of_Fire/units/Haldric_II.cfg
M data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg
M data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg
M data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg
M data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Lady.cfg
M data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg
M data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg
M data/campaigns/The_South_Guard/units/Horseman_Commander.cfg
M data/campaigns/The_South_Guard/units/Infantry_Commander.cfg
M data/campaigns/The_South_Guard/units/Infantry_Lieutenant.cfg
M data/campaigns/The_South_Guard/units/Junior_Commander.cfg
M data/campaigns/The_South_Guard/units/Mounted_General.cfg
M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Captain.cfg
M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Marshal.cfg
M data/campaigns/Under_the_Burning_Suns/units/elves/Kaleh.cfg
M data/campaigns/Under_the_Burning_Suns/units/humans/Human_Commander.cfg
M data/core/macros/abilities.cfg
M data/core/macros/deprecated-utils.cfg
M data/core/units/drakes/Flameheart.cfg
M data/core/units/drakes/Flare.cfg
M data/core/units/elves/Captain.cfg
M data/core/units/elves/Marshal.cfg
M data/core/units/goblins/Rouser.cfg
M data/core/units/humans/Loyalist_General.cfg
M data/core/units/humans/Loyalist_Grand_Marshal.cfg
M data/core/units/humans/Loyalist_Lieutenant.cfg
M data/core/units/humans/Loyalist_Sergeant.cfg
M data/core/units/monsters/Fire_Dragon.cfg
M data/core/units/orcs/Leader.cfg
M data/core/units/orcs/Ruler.cfg
M data/core/units/orcs/Sovereign.cfg
M data/core/units/undead/Skele_Death_Knight.cfg
M data/tools/wmllint
Log Message:
-----------
Rewrite leadership ability as a single macro using $other_unit
Note: It's no longer supported to use the macro in a unit with a non-matching level,
for example giving a 2nd-level unit 4th-level leadership.
Commit: 421b34d04a8ed4d5ead6322167ef36df24a15026
https://github.com/wesnoth/wesnoth/commit/421b34d04a8ed4d5ead6322167ef36df24a15026
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M src/unit_abilities.cpp
Log Message:
-----------
Add deprecation warning for backstab=
Commit: 6200f60c79ea6b75a5417e63249258da5a967a40
https://github.com/wesnoth/wesnoth/commit/6200f60c79ea6b75a5417e63249258da5a967a40
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M data/lua/wml-tags.lua
A data/lua/wml-utils.lua
Log Message:
-----------
Split some utility functions from wml-tags.lua into a new file
Commit: d4835b0157bc83880f316479abfef8101084ae42
https://github.com/wesnoth/wesnoth/commit/d4835b0157bc83880f316479abfef8101084ae42
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M data/lua/wml-tags.lua
A data/lua/wml/message.lua
M src/game_events/action_wml.cpp
M src/game_events/pump.cpp
M src/game_events/pump.hpp
M src/scripting/game_lua_kernel.cpp
M src/scripting/game_lua_kernel.hpp
Log Message:
-----------
Port [message] ActionWML tag from C++ to Lua
Lua API additions:
- wesnoth.skipping_replay()
- wesnoth.deselect_hex()
Note: vultraz and aetheryn deserve partial credit for the Lua implementation
Commit: 376020097fbce1409d59838437c7510736038b88
https://github.com/wesnoth/wesnoth/commit/376020097fbce1409d59838437c7510736038b88
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M data/lua/wml-tags.lua
A data/lua/wml/object.lua
M src/game_events/action_wml.cpp
M src/game_events/manager.cpp
M src/game_events/manager.hpp
M src/scripting/game_lua_kernel.cpp
M src/scripting/lua_gui2.cpp
M src/scripting/lua_gui2.hpp
M src/scripting/lua_kernel_base.cpp
M src/scripting/lua_kernel_base.hpp
Log Message:
-----------
Port [object] ActionWML tag from C++ to Lua
Lua API additions:
- wesnoth.show_popup_dialog()
- optional write_to_mods parameter to wesnoth.add_modification
Commit: e3fc258ce9f46a26979fc10632716d8714c9ec54
https://github.com/wesnoth/wesnoth/commit/e3fc258ce9f46a26979fc10632716d8714c9ec54
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M changelog
M src/scripting/lua_gui2.cpp
Log Message:
-----------
Simplify wesnoth.show_message_dialog implementation
Commit: 65256c61aa41d7c83d4074d3bf83f0601dcaef5a
https://github.com/wesnoth/wesnoth/commit/65256c61aa41d7c83d4074d3bf83f0601dcaef5a
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M src/savegame.cpp
Log Message:
-----------
Convert used items from old saves
Commit: a93ce122ff8881e11c6af4855dbbe8223e655298
https://github.com/wesnoth/wesnoth/commit/a93ce122ff8881e11c6af4855dbbe8223e655298
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M changelog
M data/lua/wml/object.lua
Log Message:
-----------
Add [found_item] ConditionalWML that checks if an [object] ActionWML has been taken
Commit: 03580ed9a9ca685da3e201799c1743715d055180
https://github.com/wesnoth/wesnoth/commit/03580ed9a9ca685da3e201799c1743715d055180
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M data/lua/wml-utils.lua
M data/lua/wml/object.lua
Log Message:
-----------
Allow spaces in [object]id= and show error if invalid characters are present
Commit: 907d527cc38f5d4a26ec124ddced4542c1226308
https://github.com/wesnoth/wesnoth/commit/907d527cc38f5d4a26ec124ddced4542c1226308
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M changelog
M data/lua/wml/message.lua
M src/game_events/pump.cpp
M src/game_events/pump.hpp
M src/scripting/game_lua_kernel.cpp
M src/scripting/game_lua_kernel.hpp
Log Message:
-----------
Lua API: Replace wesnoth.skipping_replay() with is_skipping_messages() and skip_messages()
Commit: e841252f19e657794a2dbf07b9faf57215f90e20
https://github.com/wesnoth/wesnoth/commit/e841252f19e657794a2dbf07b9faf57215f90e20
Author: CelticMinstrel <CelticMinstrel at users.noreply.github.com>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M changelog
M data/lua/wml-tags.lua
A data/lua/wml-utils.lua
A data/lua/wml/message.lua
A data/lua/wml/object.lua
M src/game_events/action_wml.cpp
M src/game_events/manager.cpp
M src/game_events/manager.hpp
M src/savegame.cpp
M src/scripting/game_lua_kernel.cpp
M src/scripting/game_lua_kernel.hpp
M src/scripting/lua_gui2.cpp
M src/scripting/lua_gui2.hpp
M src/scripting/lua_kernel_base.cpp
M src/scripting/lua_kernel_base.hpp
Log Message:
-----------
Merge pull request #492 from CelticMinstrel/lua-message-object
Port [message] and [object] ActionWML to Lua
Commit: fb1a84594ad51bad05dd706be0677aabdd33f06b
https://github.com/wesnoth/wesnoth/commit/fb1a84594ad51bad05dd706be0677aabdd33f06b
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M changelog
M src/unit_abilities.cpp
Log Message:
-----------
Enhance ability/weapon special [filter_adjacent] and [filter_adjacent_location]
- Now supports count=
- Now supports is_enemy= in [filter_adjacent]
Commit: 4ca0aeb50656ccff554c82e05d336e72fd0c0311
https://github.com/wesnoth/wesnoth/commit/4ca0aeb50656ccff554c82e05d336e72fd0c0311
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M src/scripting/game_lua_kernel.cpp
Log Message:
-----------
Expose the extra filter unit to the Lua API
Commit: 34b0a9ca6f4a146d3cdf59f48bf920490df7073d
https://github.com/wesnoth/wesnoth/commit/34b0a9ca6f4a146d3cdf59f48bf920490df7073d
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M src/map_location.cpp
Log Message:
-----------
Change direction rotation syntax to not be confused with variable substitution
Commit: e96f1c1bc11ec3655cad13f89fc4f621740ca291
https://github.com/wesnoth/wesnoth/commit/e96f1c1bc11ec3655cad13f89fc4f621740ca291
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M data/lua/backwards-compatibility.lua
Log Message:
-----------
Cleaned out implementation of legacy function
Commit: 660647f7d8ce730fa6a93ed9eef95291cd6ff266
https://github.com/wesnoth/wesnoth/commit/660647f7d8ce730fa6a93ed9eef95291cd6ff266
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M data/lua/wml/message.lua
M data/lua/wml/object.lua
Log Message:
-----------
Strip newline whitespace
Commit: 6dd554c97904c7abdb6543e0133bd47c1b2f8237
https://github.com/wesnoth/wesnoth/commit/6dd554c97904c7abdb6543e0133bd47c1b2f8237
Author: aquileia <sk.aquileia at gmail.com>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M projectfiles/VC9/wesnoth.vcproj
M projectfiles/VC9/wesnothd.vcproj
Log Message:
-----------
Update vcproj for 7875501, 20fafde & 0abde38
Commit: 7ca65c819ecdebe847c7820fe2ec50fd6eb817a5
https://github.com/wesnoth/wesnoth/commit/7ca65c819ecdebe847c7820fe2ec50fd6eb817a5
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M changelog
M data/core/macros/abilities.cfg
Log Message:
-----------
Clarify changelog
Commit: e74c119b9b2b05f7c4c6d18ac223a4d3d56aa4f8
https://github.com/wesnoth/wesnoth/commit/e74c119b9b2b05f7c4c6d18ac223a4d3d56aa4f8
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M changelog
M data/campaigns/Dead_Water/units/Soldier_King.cfg
M data/campaigns/Dead_Water/units/Warrior_King.cfg
M data/campaigns/Dead_Water/units/Young_King.cfg
M data/campaigns/Delfadors_Memoirs/units/King_of_Wesnoth.cfg
M data/campaigns/Delfadors_Memoirs/units/Mage_Commander.cfg
M data/campaigns/Delfadors_Memoirs/units/Mage_Leader.cfg
M data/campaigns/Delfadors_Memoirs/units/Mage_Magister.cfg
M data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg
M data/campaigns/Heir_To_The_Throne/units/Commander.cfg
M data/campaigns/Heir_To_The_Throne/units/Lord.cfg
M data/campaigns/Heir_To_The_Throne/units/Princess.cfg
M data/campaigns/Liberty/units/Death_Squire.cfg
M data/campaigns/Liberty/units/Shadow_Lord.cfg
M data/campaigns/Liberty/units/Shadow_Mage.cfg
M data/campaigns/Sceptre_of_Fire/units/Haldric_II.cfg
M data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg
M data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg
M data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg
M data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Lady.cfg
M data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg
M data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg
M data/campaigns/The_South_Guard/units/Horseman_Commander.cfg
M data/campaigns/The_South_Guard/units/Infantry_Commander.cfg
M data/campaigns/The_South_Guard/units/Infantry_Lieutenant.cfg
M data/campaigns/The_South_Guard/units/Junior_Commander.cfg
M data/campaigns/The_South_Guard/units/Mounted_General.cfg
M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Captain.cfg
M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Marshal.cfg
M data/campaigns/Under_the_Burning_Suns/units/elves/Kaleh.cfg
M data/campaigns/Under_the_Burning_Suns/units/humans/Human_Commander.cfg
M data/core/macros/abilities.cfg
M data/core/macros/deprecated-utils.cfg
M data/core/units/drakes/Flameheart.cfg
M data/core/units/drakes/Flare.cfg
M data/core/units/elves/Captain.cfg
M data/core/units/elves/Marshal.cfg
M data/core/units/goblins/Rouser.cfg
M data/core/units/humans/Loyalist_General.cfg
M data/core/units/humans/Loyalist_Grand_Marshal.cfg
M data/core/units/humans/Loyalist_Lieutenant.cfg
M data/core/units/humans/Loyalist_Sergeant.cfg
M data/core/units/monsters/Fire_Dragon.cfg
M data/core/units/orcs/Leader.cfg
M data/core/units/orcs/Ruler.cfg
M data/core/units/orcs/Sovereign.cfg
M data/core/units/undead/Skele_Death_Knight.cfg
M data/tools/wmllint
M src/actions/attack.cpp
M src/map_location.cpp
M src/scripting/game_lua_kernel.cpp
M src/unit.hpp
M src/unit_abilities.cpp
M src/unit_filter.cpp
M src/unit_filter.hpp
Log Message:
-----------
Merge pull request #488 from CelticMinstrel/backstab
Commit: bec40a3c39222b163375ded48d5e21a1e1483a9c
https://github.com/wesnoth/wesnoth/commit/bec40a3c39222b163375ded48d5e21a1e1483a9c
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M data/campaigns/Dead_Water/scenarios/02_Flight.cfg
M data/campaigns/Dead_Water/utils/items.cfg
M data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg
M data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/15_The_Treaty.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg
M data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
M data/campaigns/Liberty/utils/utils.cfg
M data/campaigns/Northern_Rebirth/scenarios/04_Clearing_the_Mines.cfg
M data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
M data/campaigns/Northern_Rebirth/scenarios/05a_02_Dealings.cfg
M data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
M data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
M data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg
M data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg
M data/campaigns/Northern_Rebirth/scenarios/09b_Judgment.cfg
M data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
M data/campaigns/Northern_Rebirth/scenarios/14a_Epilogue.cfg
M data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
M data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
M data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_of_Peace.cfg
M data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_the_Harbor_of_Tirigaz.cfg
M data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_the_Smug.cfg
M data/campaigns/Son_Of_The_Black_Eye/scenarios/16_The_Coward.cfg
M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg
M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
M data/campaigns/The_Rise_Of_Wesnoth/scenarios/21_The_Plan.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/07a_Dealing_with_Dwarves.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
M data/core/encyclopedia/geography.cfg
M data/core/macros/abilities.cfg
M data/core/units/humans/Loyalist_Royal_Guard.cfg
M doc/manual/manual.en.html
M doc/manual/manual.en_GB.html
Log Message:
-----------
Merge pull request #483 from Wedge009/Spelling_Corrections
Spelling and Grammar Corrections
Commit: 205b82da697cef3fb13fd884f9b19ddcd3875641
https://github.com/wesnoth/wesnoth/commit/205b82da697cef3fb13fd884f9b19ddcd3875641
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M data/gui/default/window/title_screen.cfg
Log Message:
-----------
Pluralize campaigns main menu item
This makes sense since there is no single campaign for the game
Commit: 6a3a346e41946ddb51ed956b31781b41f6216303
https://github.com/wesnoth/wesnoth/commit/6a3a346e41946ddb51ed956b31781b41f6216303
Author: mattsc <mattsc at MSMB.local>
Date: 2015-09-19 (Sat, 19 Sep 2015)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Xcode project: do not warn about unused local typedefs
Otherwise Xcode 7 (and its version of clang) produce more than 100
boost related unused typedef warnings.
Commit: 9ea9c88356feecd20311f57b8fd706dad73a3913
https://github.com/wesnoth/wesnoth/commit/9ea9c88356feecd20311f57b8fd706dad73a3913
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M data/lua/wml/object.lua
Log Message:
-----------
Fixed bug where unit at x1,y1 would be considered for object even if filter failed
Note that this was only present the 1.13 Lua implementation of [object]
and as such does not affect 1.12
Commit: 45aa0d4ae84eb9ec19482c0be9e597aed431b8b1
https://github.com/wesnoth/wesnoth/commit/45aa0d4ae84eb9ec19482c0be9e597aed431b8b1
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M data/lua/wml/object.lua
Log Message:
-----------
Fixup 9ea9c88356fe
Commit: e39f6376c8adda1de47b6b676f3dfc4df5e80dd9
https://github.com/wesnoth/wesnoth/commit/e39f6376c8adda1de47b6b676f3dfc4df5e80dd9
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M data/tools/wmllint-1.4
Log Message:
-----------
wmllint-1.4: use string formatting or interpolation instead of concatenation
Commit: 48def4ff0a8bedf8ed775830c80d22195ddae3ee
https://github.com/wesnoth/wesnoth/commit/48def4ff0a8bedf8ed775830c80d22195ddae3ee
Author: Ignacio R. Morelle <shadowm at wesnoth.org>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M src/scripting/lua_gui2.cpp
Log Message:
-----------
Replace alphanumeric and operator spelling
Some (all?) versions of MSVC++ doesn't like it without including
<ciso646>, and we don't really want to use the alternate operator
spellings anyway.
Commit: 00d96b3016c17cb47b96e96a1ee9176a809a9f27
https://github.com/wesnoth/wesnoth/commit/00d96b3016c17cb47b96e96a1ee9176a809a9f27
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M data/lua/wml/object.lua
Log Message:
-----------
Fixed a variable typo pointed out by Elvish_Hunter
Commit: 040351949108ebd8d0a8fdfcfd7ede6ee0a60fe4
https://github.com/wesnoth/wesnoth/commit/040351949108ebd8d0a8fdfcfd7ede6ee0a60fe4
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-21 (Mon, 21 Sep 2015)
Changed paths:
M data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg
M data/campaigns/Northern_Rebirth/scenarios/14a_Epilogue.cfg
Log Message:
-----------
Reverting 'x and I' to 'me and x'
celticminstrel suggests the gramatically incorrect 'me and x' form works better in an informal, spoken context so, for the most part, reverting this change.
Commit: eb05d043e0370ac95680830f5cf4b9fb65c28717
https://github.com/wesnoth/wesnoth/commit/eb05d043e0370ac95680830f5cf4b9fb65c28717
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2015-09-21 (Mon, 21 Sep 2015)
Changed paths:
M doc/manual/manual.en_GB.html
Log Message:
-----------
Reverting some hyphenation.
celticminstrel objects to some of the hyphenation. Geven the American English origin and nature of the majority of the English-speaking Internet, I suppose it's okay to allow American-style compound words where they've already proven dominant in computing/programming/Internet contexts.
One exception here is 'hot seat', where its use has not yet been established in mainstream lanugage.
Also, the made-up phrase 'goto-mode' has had spacing introduced.
Commit: 4c034d770576031d85804dc39d7ecdba79232724
https://github.com/wesnoth/wesnoth/commit/4c034d770576031d85804dc39d7ecdba79232724
Author: Elias Pschernig <elias at users.sourceforge.net>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M data/tools/unit_tree/helpers.py
M data/tools/wesnoth/wmlparser3.py
M data/tools/wmlunits
Log Message:
-----------
Clean up wmlparser3.py a bit, fix json and xml output.
Commit: 9c9f8f5a6e1245188007d47e4e5a4da4b56946ad
https://github.com/wesnoth/wesnoth/commit/9c9f8f5a6e1245188007d47e4e5a4da4b56946ad
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M src/scripting/game_lua_kernel.cpp
M src/scripting/game_lua_kernel.hpp
M src/scripting/push_check.hpp
Log Message:
-----------
split wesnoth.synchronize_choice function
previously there was one function which sometimes returned a wml table
and sometimes a map integer to wml tables dependent on its parameters.
Now there are 2 different functions: wesnoth.synchronize_choice and
wesnoth.synchronize_choices. the first one handles the case where you just
want to get a choice from one side and thus it returns just one wml
table. The second function handles the case where you want to get
choices from multiple sides. that function retruns a table of wml
tables.
I also added an optional string parameter to that function specifying
the type of that choice (this is useful to make replays more robust and
readable)
Commit: cce53d5aa99075a3f62b1edbb6869c9f32c64de4
https://github.com/wesnoth/wesnoth/commit/cce53d5aa99075a3f62b1edbb6869c9f32c64de4
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M src/scripting/lua_gui2.cpp
Log Message:
-----------
fix a compiler warning
Commit: 663db4f70fb2193647e4a247286e91bee5998b50
https://github.com/wesnoth/wesnoth/commit/663db4f70fb2193647e4a247286e91bee5998b50
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M src/actions/attack.cpp
M src/persist_var.cpp
M src/replay.cpp
M src/replay.hpp
Log Message:
-----------
show notification when waiting for remote choices.
The game now shows a notification when waiting for a remove user choice
(like for example a unit advancement choice) for longer than 2 seconds.
This does not work during prestart events yet.
Commit: 3c11aa63f89ccb4e02f2dcca2eb5a8b49a22ab44
https://github.com/wesnoth/wesnoth/commit/3c11aa63f89ccb4e02f2dcca2eb5a8b49a22ab44
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M src/CMakeLists.txt
M src/SConscript
M src/actions/attack.cpp
M src/game_events/action_wml.cpp
M src/persist_var.cpp
M src/replay.cpp
M src/replay.hpp
M src/scripting/game_lua_kernel.cpp
M src/synced_checkup.cpp
M src/synced_commands.cpp
A src/synced_user_choice.cpp
A src/synced_user_choice.hpp
M src/wesnoth.cpp
Log Message:
-----------
move get_user_choice function to a new file
Commit: de3db534477ce989904b3b3627a7791a0b4c084f
https://github.com/wesnoth/wesnoth/commit/de3db534477ce989904b3b3627a7791a0b4c084f
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M src/synced_context.cpp
M src/synced_user_choice.cpp
M src/synced_user_choice.hpp
Log Message:
-----------
refactor get_user_choice
this prepares a patch to implement wait dialogs for user choices during
prestart events.
Commit: 3ed4eed9fcf493110615c39b2ad3f8a7f464b3b8
https://github.com/wesnoth/wesnoth/commit/3ed4eed9fcf493110615c39b2ad3f8a7f464b3b8
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
A data/gui/default/window/synced_choice_wait.cfg
M src/CMakeLists.txt
M src/SConscript
A src/gui/dialogs/synced_choice_wait.cpp
A src/gui/dialogs/synced_choice_wait.hpp
M src/synced_user_choice.cpp
M src/tests/gui/test_gui2.cpp
Log Message:
-----------
wait dialog for user choices during prestart events
gna.org/bugs/?23297
If we are waiting for a synced user choice during a prestart events we
now show a gui2 dialog that informs the player about why the client is
waiting and also offers the player the option to quit the game.
Commit: 61fabacd36a489a90c454299fe6780426e6fef63
https://github.com/wesnoth/wesnoth/commit/61fabacd36a489a90c454299fe6780426e6fef63
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M src/scripting/game_lua_kernel.cpp
Log Message:
-----------
fix compiler warnings.
Commit: c7c1b750fc385f706b336e8966f43e2b5c10efb3
https://github.com/wesnoth/wesnoth/commit/c7c1b750fc385f706b336e8966f43e2b5c10efb3
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M src/synced_user_choice.cpp
Log Message:
-----------
fix compiler wanring.
Commit: fd2e513dc99bf2a358920217c834b9fbc4661044
https://github.com/wesnoth/wesnoth/commit/fd2e513dc99bf2a358920217c834b9fbc4661044
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M src/synced_user_choice.cpp
Log Message:
-----------
simplify user_choice_notifer_ingame
Commit: e3c47bf4821f9afa5068db7fc9252aa21c8cd932
https://github.com/wesnoth/wesnoth/commit/e3c47bf4821f9afa5068db7fc9252aa21c8cd932
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-09-21 (Mon, 21 Sep 2015)
Changed paths:
M data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg
M data/campaigns/Northern_Rebirth/scenarios/14a_Epilogue.cfg
M doc/manual/manual.en_GB.html
Log Message:
-----------
Merge pull request #495 from Wedge009/Spelling_Corrections
Reverting some spelling/grammar changes from #483
Commit: a4fe9c0474a5f948a5136f7ae34e409caf638f92
https://github.com/wesnoth/wesnoth/commit/a4fe9c0474a5f948a5136f7ae34e409caf638f92
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-09-21 (Mon, 21 Sep 2015)
Changed paths:
M projectfiles/CodeBlocks/wesnoth.cbp
Log Message:
-----------
Updated codeblocks projectfile
Commit: c20a807a87bf91a9c632aff097fdd92954551204
https://github.com/wesnoth/wesnoth/commit/c20a807a87bf91a9c632aff097fdd92954551204
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-21 (Mon, 21 Sep 2015)
Changed paths:
M src/synced_user_choice.cpp
Log Message:
-----------
fix assertion failure in wesnoth.synchronize_choice(s)
Commit: 2c245afdc2ab55f3a1ac8ba6e54db154b8894c01
https://github.com/wesnoth/wesnoth/commit/2c245afdc2ab55f3a1ac8ba6e54db154b8894c01
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-21 (Mon, 21 Sep 2015)
Changed paths:
M src/scripting/game_lua_kernel.cpp
Log Message:
-----------
add description parameter to wesnoth.synchronize_choice(s)
and removed the 'tagname' parmaeter which is now always "input"
Commit: 5a584381f371e29ad2c7748f124b239ffd01bc33
https://github.com/wesnoth/wesnoth/commit/5a584381f371e29ad2c7748f124b239ffd01bc33
Author: Randypk <randypkdev1 at gmail.com>
Date: 2015-09-21 (Mon, 21 Sep 2015)
Changed paths:
M data/themes/default.cfg
Log Message:
-----------
Bug Fix#23060: unit status tooltips do not show.
The rectangle for the unit_stats was overlapping other rectangles, making
it not function properly. Just resized it to fit. Tested with single
poison effect, both poison and slow, and no effects, all worked.
Commit: 504cdb69d1cb9ee58d4c6997a05bd547c6a0dddc
https://github.com/wesnoth/wesnoth/commit/504cdb69d1cb9ee58d4c6997a05bd547c6a0dddc
Author: Randypk <randypkdev1 at gmail.com>
Date: 2015-09-21 (Mon, 21 Sep 2015)
Changed paths:
M changelog
Log Message:
-----------
Updated changelog for bug 23060.
Commit: 167199bd164cafe118297ad847a782434215993d
https://github.com/wesnoth/wesnoth/commit/167199bd164cafe118297ad847a782434215993d
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-21 (Mon, 21 Sep 2015)
Changed paths:
M src/synced_user_choice.cpp
M src/synced_user_choice.hpp
Log Message:
-----------
attempt to fix replays
previously replays were broken becasue the game would ask the viewer for
user choices rather than searching for them in the replay.
We fix this by searching in the replay in user_choice_managers
constructor.
Commit: 6a09ef61e76d3a7d5bad87f70125d7bfe1cef40f
https://github.com/wesnoth/wesnoth/commit/6a09ef61e76d3a7d5bad87f70125d7bfe1cef40f
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Update XCode project file
Commit: 7f7f0f48d5b134eba011cddaeec8cabf53342825
https://github.com/wesnoth/wesnoth/commit/7f7f0f48d5b134eba011cddaeec8cabf53342825
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M src/scripting/lua_gui2.cpp
Log Message:
-----------
Lua API: show_message_dialog now assumes options are translatable
Commit: a3e3f5e719d83608101d6c43a7f65dd4bfce068b
https://github.com/wesnoth/wesnoth/commit/a3e3f5e719d83608101d6c43a7f65dd4bfce068b
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-20 (Sun, 20 Sep 2015)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Update XCode project file
Commit: acdc67fe56b6ed6456a5d5fced743fdafa388641
https://github.com/wesnoth/wesnoth/commit/acdc67fe56b6ed6456a5d5fced743fdafa388641
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-09-21 (Mon, 21 Sep 2015)
Changed paths:
M data/lua/wml/object.lua
Log Message:
-----------
[object] don't show unit reach when highlighting unit
Commit: 650f21e5823c4eede614235c13be7639bc199d54
https://github.com/wesnoth/wesnoth/commit/650f21e5823c4eede614235c13be7639bc199d54
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2015-09-21 (Mon, 21 Sep 2015)
Changed paths:
M data/lua/wml-tags.lua
Log Message:
-----------
Fixed [role] not working if type= was not specified
Commit: fc89dfa6dbb365e81c623ccc7f2ec51b50e89de5
https://github.com/wesnoth/wesnoth/commit/fc89dfa6dbb365e81c623ccc7f2ec51b50e89de5
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-21 (Mon, 21 Sep 2015)
Changed paths:
M src/synced_user_choice.cpp
Log Message:
-----------
attempt to fix replays
previously search_in_replay would search for choices in replays even if
it already found all choices. Resulting in error mesages becasue it
finds different unexpected things.
Commit: 9ae3b29f4a2eaad56fa95c6e9f3f02e6bd39aea1
https://github.com/wesnoth/wesnoth/commit/9ae3b29f4a2eaad56fa95c6e9f3f02e6bd39aea1
Author: Andreas Löf <andreas at alternating.net>
Date: 2015-09-21 (Mon, 21 Sep 2015)
Changed paths:
M changelog
M data/campaigns/Dead_Water/scenarios/02_Flight.cfg
M data/campaigns/Dead_Water/units/Soldier_King.cfg
M data/campaigns/Dead_Water/units/Warrior_King.cfg
M data/campaigns/Dead_Water/units/Young_King.cfg
M data/campaigns/Dead_Water/utils/items.cfg
M data/campaigns/Delfadors_Memoirs/units/King_of_Wesnoth.cfg
M data/campaigns/Delfadors_Memoirs/units/Mage_Commander.cfg
M data/campaigns/Delfadors_Memoirs/units/Mage_Leader.cfg
M data/campaigns/Delfadors_Memoirs/units/Mage_Magister.cfg
M data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
M data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg
M data/campaigns/Heir_To_The_Throne/units/Commander.cfg
M data/campaigns/Heir_To_The_Throne/units/Lord.cfg
M data/campaigns/Heir_To_The_Throne/units/Princess.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/15_The_Treaty.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg
M data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
M data/campaigns/Liberty/units/Death_Squire.cfg
M data/campaigns/Liberty/units/Shadow_Lord.cfg
M data/campaigns/Liberty/units/Shadow_Mage.cfg
M data/campaigns/Liberty/utils/utils.cfg
M data/campaigns/Northern_Rebirth/scenarios/04_Clearing_the_Mines.cfg
M data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
M data/campaigns/Northern_Rebirth/scenarios/05a_02_Dealings.cfg
M data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
M data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
M data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg
M data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg
M data/campaigns/Northern_Rebirth/scenarios/09b_Judgment.cfg
M data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
M data/campaigns/Northern_Rebirth/scenarios/14a_Epilogue.cfg
M data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
M data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
M data/campaigns/Sceptre_of_Fire/units/Haldric_II.cfg
M data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_of_Peace.cfg
M data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_the_Harbor_of_Tirigaz.cfg
M data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_the_Smug.cfg
M data/campaigns/Son_Of_The_Black_Eye/scenarios/16_The_Coward.cfg
M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg
M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
M data/campaigns/The_Rise_Of_Wesnoth/scenarios/21_The_Plan.cfg
M data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg
M data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg
M data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg
M data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Lady.cfg
M data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg
M data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg
M data/campaigns/The_South_Guard/units/Horseman_Commander.cfg
M data/campaigns/The_South_Guard/units/Infantry_Commander.cfg
M data/campaigns/The_South_Guard/units/Infantry_Lieutenant.cfg
M data/campaigns/The_South_Guard/units/Junior_Commander.cfg
M data/campaigns/The_South_Guard/units/Mounted_General.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/07a_Dealing_with_Dwarves.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Captain.cfg
M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Marshal.cfg
M data/campaigns/Under_the_Burning_Suns/units/elves/Kaleh.cfg
M data/campaigns/Under_the_Burning_Suns/units/humans/Human_Commander.cfg
M data/core/encyclopedia/geography.cfg
M data/core/macros/abilities.cfg
M data/core/macros/deprecated-utils.cfg
M data/core/units/drakes/Flameheart.cfg
M data/core/units/drakes/Flare.cfg
M data/core/units/elves/Captain.cfg
M data/core/units/elves/Marshal.cfg
M data/core/units/goblins/Rouser.cfg
M data/core/units/humans/Loyalist_General.cfg
M data/core/units/humans/Loyalist_Grand_Marshal.cfg
M data/core/units/humans/Loyalist_Lieutenant.cfg
M data/core/units/humans/Loyalist_Royal_Guard.cfg
M data/core/units/humans/Loyalist_Sergeant.cfg
M data/core/units/monsters/Fire_Dragon.cfg
M data/core/units/orcs/Leader.cfg
M data/core/units/orcs/Ruler.cfg
M data/core/units/orcs/Sovereign.cfg
M data/core/units/undead/Skele_Death_Knight.cfg
A data/gui/default/window/synced_choice_wait.cfg
M data/gui/default/window/title_screen.cfg
M data/lua/backwards-compatibility.lua
M data/lua/wml-tags.lua
A data/lua/wml-utils.lua
A data/lua/wml/message.lua
A data/lua/wml/object.lua
A data/test/scenarios/filter_this_unit.cfg
M data/themes/default.cfg
M data/tools/unit_tree/helpers.py
M data/tools/wesnoth/wmlparser3.py
M data/tools/wmllint
M data/tools/wmllint-1.4
M data/tools/wmlunits
M doc/manual/manual.en.html
M doc/manual/manual.en_GB.html
M players_changelog
M po/wesnoth-editor/hu.po
M po/wesnoth-help/hu.po
M po/wesnoth-lib/hu.po
M po/wesnoth-units/hu.po
M po/wesnoth/hu.po
M projectfiles/CodeBlocks/wesnoth.cbp
M projectfiles/VC9/wesnoth.vcproj
M projectfiles/VC9/wesnothd.vcproj
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
M run_wml_tests
M src/CMakeLists.txt
M src/SConscript
M src/actions/attack.cpp
M src/config.cpp
M src/config.hpp
M src/game_events/action_wml.cpp
M src/game_events/manager.cpp
M src/game_events/manager.hpp
M src/game_state.cpp
A src/gui/dialogs/synced_choice_wait.cpp
A src/gui/dialogs/synced_choice_wait.hpp
M src/map_location.cpp
M src/persist_var.cpp
M src/play_controller.cpp
M src/play_controller.hpp
M src/replay.cpp
M src/replay.hpp
M src/savegame.cpp
M src/scripting/game_lua_kernel.cpp
M src/scripting/game_lua_kernel.hpp
M src/scripting/lua_gui2.cpp
M src/scripting/lua_gui2.hpp
M src/scripting/lua_kernel_base.cpp
M src/scripting/lua_kernel_base.hpp
M src/scripting/push_check.hpp
M src/serialization/parser.cpp
M src/serialization/ucs4_convert_impl.hpp
M src/serialization/unicode.hpp
M src/serialization/unicode_cast.hpp
M src/serialization/unicode_types.hpp
M src/server/game.cpp
M src/synced_checkup.cpp
M src/synced_commands.cpp
M src/synced_context.cpp
A src/synced_user_choice.cpp
A src/synced_user_choice.hpp
M src/tests/gui/test_gui2.cpp
M src/unit.hpp
M src/unit_abilities.cpp
M src/unit_filter.cpp
M src/unit_filter.hpp
M src/variable.cpp
M src/variable.hpp
M src/variable_info.cpp
M src/wesnoth.cpp
M wml_test_schedule
Log Message:
-----------
Merge with master
Compare: https://github.com/wesnoth/wesnoth/compare/a815d3537070...9ae3b29f4a2e
More information about the Commits
mailing list