55819 Commits

Author SHA1 Message Date
Bär Halberkamp
8e6f147d8e Changed the minimap marker colors for darkred and lightred 2014-02-26 15:47:47 +01:00
Boldizsár Lipka
e2e4952d38 Properly redraw the credits screen when the window is resized. 2014-02-26 16:44:22 +01:00
JaMiT
7cb0f5b928 Split event names before filing handlers by name.
Fixes bug #21577.
2014-02-25 22:33:43 -06:00
JaMiT
5162b0584e Use print_modifier, not signed_value, when dealing with percentages.
Fixes bug #21577.
2014-02-25 22:13:42 -06:00
JaMiT
9c08880d51 Only need to check description != NULL once. 2014-02-25 22:13:42 -06:00
Nils Kneuper
954eb7b287 another fix... 2014-02-25 21:57:32 +01:00
Nils Kneuper
8fddbe13a5 fixed players_changelog style 2014-02-25 21:57:08 +01:00
Nils Kneuper
c77f8a2d92 updated Slovak translation 2014-02-25 21:57:08 +01:00
Chris Beck
1dcef7f8a3 Revert "Merge branch 'master' of https://github.com/wesnoth/wesnoth-old"
This reverts commit 2c201a162639b54f58e441f53edec4198edfc7d3, reversing
changes made to 76b9976b75842519acdd9150dd9b6463cb91aec8.

I accidentally merged a topic branch into master, I am attempting to go back
to the merge PR 94 status of master just previous to my accidental commit.
2014-02-25 15:37:07 -05:00
Chris Beck
2c201a1626 Merge branch 'master' of https://github.com/wesnoth/wesnoth-old 2014-02-25 03:47:25 -05:00
Alexander van Gessel
76b9976b75 Merge branch 'bug21486' of github.com:sachith500/wesnoth-old (PR #94) 2014-02-25 04:41:54 +01:00
Bär Halberkamp
a099a520b7 Updated changelogs 2014-02-25 03:23:44 +01:00
Bär Halberkamp
0efe12da4f Updates to the new EI maps 2014-02-25 03:19:47 +01:00
Chris Beck
bab03d554b Turn dialog used for hotseat mp games now applies a blindfold
This is intended to address bug #3856.

Following discussion on IRC, this is considered a feature request
and not a bug, and so cannot be addressed during feature freeze
for 1.12. Hence I am pushing it to a topic branch.

I can't push a changelog change either as we don't know what version
this will go in, but the changelog entry should be something like:

"Fix bug #3856: The turn dialog used in hotseat MP play now applies
a blindfold to the map for the duration of the dialog."
2014-02-24 17:58:35 -05:00
Chris Beck
874e9f0e74 fixup blindfold
fix a logic error -- actually if we are blindfolded, it doesn't matter if we are an observer, we shouldn't see any units. also this is more efficient.
2014-02-24 17:51:42 -05:00
ln-zookeeper
1c4481eae4 Fixed some pixels not being opaque as they should. 2014-02-24 11:17:00 +02:00
Chris Beck
2ed1338e59 concatenate messages to front rather than end of dbus messages
this is intended to make linux dbus notifications a bit more useful, as it appears on my machine that the current notifications only display the messages in the most distant past...
2014-02-24 01:47:30 -05:00
Chris Beck
2cfe43dd73 Merge pull request #111 from cbeck88/blindfold_ii
Blindfold ii
2014-02-23 22:32:49 -05:00
Chris Beck
1176119024 try to disable reachmap info in blindfold 2014-02-23 22:27:15 -05:00
Chris Beck
20440faa55 units now say that blind observers can't see them 2014-02-23 22:27:15 -05:00
Chris Beck
5e28b7c109 minimap does not draw units if blindfolded
display.show_everything() returns false if blindfolded
2014-02-23 22:27:14 -05:00
Chris Beck
491b1def74 implement blindfold by shroud 2014-02-23 22:27:14 -05:00
Sachith Hasaranga Seneviratne
ebd111ba45 Added changelog entries and updated about.cfg. Minor typo-fix in
changelog.

Signed-off-by: Sachith Hasaranga Seneviratne <sachith500@gmail.com>
2014-02-24 07:50:39 +05:30
Sachith Hasaranga Seneviratne
5a3969a475 Signed-off-by: Sachith Hasaranga Seneviratne <sachith500@gmail.com>
Added changelog entries and updated about.cfg
2014-02-24 07:38:16 +05:30
Alexander van Gessel
2a9b54e98a Merge branch 'master' of github.com:wesnoth/wesnoth-old 2014-02-24 02:55:52 +01:00
Alexander van Gessel
a6630a3a08 Revert "[wmlunits] Disable crashing chunk_start stuff someone added."
This reverts commit 8aa0febfde421f4f2a986679e0a9912d0d6277d0.
As spaces in filenames are now illegal, this is no longer a problem.
2014-02-24 02:45:42 +01:00
Chris Beck
ba45c6870d fix bug associated to idle sides
the is_local() function should return true if a side is idle. if not this causes multiple side init events when a side disconnects and is assigned idle, and thus makes the server unhappy.
2014-02-23 20:44:53 -05:00
Alexander van Gessel
bb5663f92e Merge branch 'master' of github.com:wesnoth/wesnoth-old 2014-02-24 02:24:46 +01:00
Alexander van Gessel
c9f8d15319 changelog entries 2014-02-24 02:23:23 +01:00
Alexander van Gessel
94f0bfa02c Also disallow CR, LF, HT, VT 2014-02-24 02:20:40 +01:00
Ignacio R. Morelle
e9c8f605dc Clear RELEASE_NOTES 2014-02-23 22:18:30 -03:00
Alexander van Gessel
e838206f65 Merge branch 'master' of github.com:wesnoth/wesnoth-old 2014-02-24 02:14:59 +01:00
Alexander van Gessel
4619063ac2 Warn about whitespace in illegal filename message 2014-02-24 02:13:42 +01:00
Alexander van Gessel
374b97db87 Disallow filenames with spaces on the add-on server 2014-02-24 02:13:16 +01:00
Alexander van Gessel
7855a9f0a9 Ignore filenames with spaces and complain about them
It was already impossible to directly include such files,
as the preprocessor interpreted such a directive as a macro with arguments.
2014-02-24 02:11:32 +01:00
Chris Beck
2cf867aa37 use blindfold struct in playmp controller to implement feature 2014-02-23 18:48:31 -05:00
Chris Beck
e8fcf0bae0 create blindfold struct 2014-02-23 18:48:12 -05:00
Chris Beck
e9841da6f5 create display::blindfold accessors 2014-02-23 18:48:09 -05:00
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