55780 Commits

Author SHA1 Message Date
JaMiT
bd09e01992 Clean up the logic that decides when labels are created and shown.
Fixes bug #21434.
2014-02-23 16:32:07 -06:00
JaMiT
90501cf872 Some cleanup of map_labels::set_label.
Two changes might warrant further explanation:
1) No need to set a property of an object (current_label->second)
   that you are about to erase.
2) Setting res to NULL when it is already NULL is a no-op. (This
   line exists because at one time res was set to something other
   than NULL.)
2014-02-23 16:28:28 -06:00
JaMiT
ed3446a3e7 Simplify map_labels::set_label() by factoring out some find()s.
In two places, the code from get_label() was basically duplicated,
presumably because the public get_label() function returns a pointer
to a const object. I added a private version that returns a pointer
to a non-const object, and now set_label() is easier to read.
2014-02-23 16:28:28 -06:00
Alexander van Gessel
df002cdfa1 Hand-merge PR #74 2014-02-23 22:49:07 +01:00
Mark de Wever
8e21ab9fd9 Remove an anonymous namespace from a header.
The variable in the object is copied into every transition unit
including the header.
2014-02-23 16:45:17 +01:00
Mark de Wever
f7de93c685 Update valgrind suppression file.
Don't complain when strtod is called from luaO_str2d.
2014-02-23 15:19:16 +01:00
JaMiT
a0f03607e8 Remove vestiges of an earlier attempt to fix bug #21450. 2014-02-23 02:33:37 -06:00
JaMiT
3b69ba802b Make the mouse handler respect linger mode instead of assuming false.
Fixes bug #21450, restoring functionality lost in commit
7e46df919167c6906d7a782b8f77104444cdee5a.
2014-02-23 02:07:05 -06:00
JaMiT
4ae8e5fe3d Changelog entry for 46b87250cd7a. 2014-02-23 00:20:20 -06:00
JaMiT
46b87250cd Better support of removing fog from a single hex.
Fixes bug #21643, although artists might find room for improvement.
2014-02-22 21:44:11 -06:00
JaMiT
337fe6535c Rename some variables to reduce confusion.
The variable 'n' was declared within a scope that had already
declared 'n'. While each variable is only used in the line in which
it is defined (they are loop control variables for 'for' statements),
it's just bad style to have that potential confusion.

Plus, 'n' is not a descriptive name. (Not that the new names are
much better.)
2014-02-22 21:44:11 -06:00
Ignacio R. Morelle
b995ae5003 Add a 1.11.10 changelog entry I really should have added before tagging 2014-02-22 23:08:28 -03:00
Ignacio R. Morelle
2237bde02e editor: Fix a filechooser dialog caption to use Title Case 2014-02-22 22:07:24 -03:00
Ignacio R. Morelle
400b2b28c7 pofix: Add UI string case fix
See commit 0ed8c1a83717b04ac1dae9eab967462405b356ea.
2014-02-22 22:07:24 -03:00
JaMiT
7c17ae2970 Change a config to const config so operator[] does not add attributes. 2014-02-22 18:46:17 -06:00
JaMiT
f10eaeb0af Initialize members, and add a note why the constructor is needed.
This is a constructor needed (for some reason) by the C++ standard,
at least according to clang's interpretation of it.
2014-02-22 18:15:36 -06:00
Chris Beck
0ed8c1a837 Use sentence case in player disconnect menu 2014-02-22 19:03:57 -05:00
Ignacio R. Morelle
ee63153783 Bump Doxyfile version 2014-02-22 15:06:31 -03:00
mattsc
ad61b556dd Xcode project update for 1.11.10
Version number and ingame changelog
2014-02-22 08:10:35 -08:00
Bär Halberkamp
10eb2bd986 ran wmlindent 2014-02-22 16:35:31 +01:00
Bär Halberkamp
7d675e8712 EI: Made S12's map more wintery, as per zookeeper's request 2014-02-22 16:25:44 +01:00
Bär Halberkamp
3852c51992 EI: Made the map use snowy huts instead of the regular ones in snowy areas (thanks zookeeper) 2014-02-22 16:25:44 +01:00
Bär Halberkamp
b0a7938e14 EI: Updated S14, S16, and S17a's maps 2014-02-22 16:25:44 +01:00
Nils Kneuper
48f3651b25 post release version bump to 1.11.10+dev 2014-02-22 16:11:18 +01:00
Nils Kneuper
ce43713788 another pot-update, just to be sure 1.11.10 1.11.10-retag 2014-02-22 14:44:56 +01:00
Ignacio R. Morelle
95fc2306a6 Liberty: Revert accidental addition of UTF-8 BOMs 2014-02-22 10:28:23 -03:00
Nils Kneuper
07978ccbe5 bump version to 1.11.10 2014-02-22 14:19:53 +01:00
Nils Kneuper
f3f33217e8 pot-update, regenerated doc files (prepare for 1.11.10) 2014-02-22 14:17:16 +01:00
Mark de Wever
698eeb0e63 Initialize all members.
Issue found by cppcheck.
2014-02-22 13:11:35 +01:00
loonycyborg
e1a275682c Add a user-defined default constructor to handler_list to fix build with clang 2014-02-22 16:02:51 +04:00
Ignacio R. Morelle
bbdb45c237 parser: Print location and preprocessor substitution trail when skipping BOMs
Example:

> 20140222 08:42:34 error config: Skipping over a utf8 BOM at campaigns/Heir_To_The_Throne/_main.cfg:1
>     included from _main.cfg:24
2014-02-22 08:45:27 -03:00
Charles Dang
64930edbe4 Fixed a typo I made 2014-02-22 22:14:59 +11:00
Charles Dang
35cfa7b47d Tweaked a line, replaced a mention of Eloh with Yechnagoth, and fixed a typo 2014-02-22 22:05:02 +11:00
Charles Dang
69a188ef85 Defeat enemy leaders -> Defeat all enemy leaders 2014-02-22 21:46:25 +11:00
Charles Dang
280d646d17 Fixed misplaced comma 2014-02-22 21:44:18 +11:00
Ignacio R. Morelle
1810559e91 Add changelog entry for aliasof/mvt_alias/def_alias wmllint conversions 2014-02-22 07:42:13 -03:00
Charles Dang
807538c8bd more then -> more than 2014-02-22 21:41:41 +11:00
Charles Dang
769320e208 Defeat all enemies -> Defeat all enemy leaders 2014-02-22 21:35:43 +11:00
Ignacio R. Morelle
b4915f094a Minor help entry wording change
Players may not know what a 'gui' is, and 'dialog' is self-explanatory.
2014-02-22 07:29:06 -03:00
Chusslove Illich (Часлав Илић)
5501a281c5 Updated l10n-track. 2014-02-22 11:27:19 +01:00
Chusslove Illich (Часлав Илић)
51ffcbf65c Fixed too large size of pt map overlays. 2014-02-22 11:25:58 +01:00
Ignacio R. Morelle
a02f1dc49e mp: Simplify blindfold option label tooltip, eliminate contractions 2014-02-22 07:23:23 -03:00
Nils Kneuper
dd5be6a23c updated Scottish Gaelic translation 2014-02-22 10:38:55 +01:00
Ignacio R. Morelle
c4b2ea89c4 Fix a capitalization issue in the players_changelog too 2014-02-22 06:19:02 -03:00
Ignacio R. Morelle
35c2cea613 Bring the changelog back to sanity, sync with players_changelog 2014-02-22 06:16:16 -03:00
Ignacio R. Morelle
33d3a6e66e Merge branch 'master' of github.com:wesnoth/wesnoth-old 2014-02-22 06:13:00 -03:00
Ignacio R. Morelle
cdab0f2e84 Force grayscale font AA with Cairo on Windows (bug #21648)
Cairo on Windows (at least the latest available version from gtk.org
as of 2014-02-22, version 1.10.2) has issues with ClearType resulting
in glitchy anti-aliasing with CAIRO_ANTIALIAS_SUBPIXEL or
CAIRO_ANTIALIAS_DEFAULT, but not CAIRO_ANTIALIAS_GRAY, so we should
use that as a workaround until the Windows package is updated to use
a newer version of Cairo.
2014-02-22 06:08:01 -03:00
Chris Beck
011696388b fixup Release notes 2014-02-22 03:54:45 -05:00
Emilien Rotival
2abf696ef4 Update the giant mudcrawler attack frames
This fixes the reversed twist problem that was appearing during the attack sequence.
2014-02-22 09:38:55 +01:00
Chris Beck
1c4fcb08dd Merge pull request #109 from cbeck88/blindfold
Blindfold replays
2014-02-22 03:19:15 -05:00