54798 Commits

Author SHA1 Message Date
Ignacio R. Morelle
4c39592471 Theme WML cleanup inspired by a wmlindent pass
Mostly comments and indentation only. Also removed a big mid-line
whitespace chunk.
2013-12-21 23:05:29 -03:00
Boldizsár Lipka
88dda7bedd Khalifate era description by happygrue. 2013-12-22 03:45:12 +01:00
Alexander van Gessel
d6cd5f2649 Update changelogs 2013-12-22 02:13:55 +01:00
Alexander van Gessel
0a4c353f5b Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-12-22 02:05:05 +01:00
Alexander van Gessel
725f9e398e wmlindent run 2013-12-22 02:04:58 +01:00
Alexander van Gessel
7f61f8b081 Remove unneeded ellipses 2013-12-22 02:03:25 +01:00
Alexander van Gessel
55bd5e1729 Remove explicit nozoc ellipse 2013-12-22 02:01:47 +01:00
Alexander van Gessel
32fabf5489 Refactor lightfly movetype a bit 2013-12-22 02:00:18 +01:00
Alexander van Gessel
7eea4c5fb9 Import khalifate from wesnoth-umc-dev r19414 2013-12-22 01:55:00 +01:00
David Mikos
74de4fd1ff Make some middle click scrolling variables const 2013-12-22 10:53:40 +10:30
David Mikos
fd5fa97818 Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-12-22 10:32:47 +10:30
David Mikos
4aff27342d Better handle middle click scrolling event orders of down and initial click 2013-12-22 10:32:16 +10:30
Ignacio R. Morelle
c24165a3e8 Change the editor-tool-soundsource action label to not include a compound word 2013-12-21 20:57:26 -03:00
Ignacio R. Morelle
5029dedd06 Convert editor-selection-generate/randomize action labels to Title Case 2013-12-21 20:52:57 -03:00
David Mikos
9780a8a53f Fix missing background dragonguard image in mp map Aethermaw 2013-12-22 10:20:45 +10:30
Ignacio R. Morelle
e44605e1be Replace editor-toggle-canrecruit label to be normal English
"canrecruit" is a WML technicism.
2013-12-21 20:46:46 -03:00
Ignacio R. Morelle
232eb14e4f Convert editor-toggle-renameable action label to use Title Case 2013-12-21 20:45:44 -03:00
Ignacio R. Morelle
a371eee3ea gui2/tmp_depcheck_select_new: Convert title label to Title Case 2013-12-21 20:42:13 -03:00
Ignacio R. Morelle
1c4129a210 gui2/tmp_depcheck_confirm_change: Replace title label with a generic one
The generic label should be already translated (it's used in C++), and
also respects the Title Case rule on grounds of it not having a word
count greater than 1.
2013-12-21 20:41:12 -03:00
Bär Halberkamp
85c84b0124 Improved maps for EI scenario 1-3 2013-12-22 00:39:35 +01:00
Boldizsár Lipka
871aadca1a Remove an unused dialog. 2013-12-22 01:38:22 +01:00
gfgtdf
113ab5599b commented out an unused variable
i didn't remove it, because the variable is used later in the outcommented code in line 962.
2013-12-22 00:04:22 +01:00
Ignacio R. Morelle
0ab3c93c51 help: Revision of the prose revision of the Add-ons section
8680 requested some prepositions to be changed.
2013-12-21 20:03:31 -03:00
gfgtdf
e274833ffa Update players_changelog 2013-12-21 23:23:27 +01:00
gfgtdf
316710e55a Update changelog 2013-12-21 23:19:12 +01:00
gfgtdf
65fded5de3 disable undoing unit creation.
Undoing unit recruits currently ends in oos in most cases, because the random generator is called during unit creation for creating random names.
This is not impossible to fix, ofc we could just enable it for nameless units, but i'm not 100% sure wether units with no names call the random generator for random names or not. Also names normaly don't have any influence on the game (same for genders maybe?), so there is no reason not to be able to undo it from a players point of view. We also cannot just store the random state in undo_stack->add_recruit, because the unit creation happens before that
2013-12-21 21:53:03 +01:00
ln-zookeeper
8a55cc355f Removed obsolete TRoW bigmap images. 2013-12-21 22:01:29 +02:00
Ignacio R. Morelle
25266cd2f6 Fix NULL pointer dereference when scroll-wheeling in the editor
From cd8c83532b0d33a3a2e24d9af04dac0455a84625:

  gui::slider* s = gui().find_slider("map-zoom-slider");
  if (point_in_rect(event.x, event.y, s->location())) {
      scrollx = 0; scrolly = 0;
  }

s is not guaranteed to not be NULL. display::find_slider() WILL return
NULL if it can't find the requested widget. As it turns out, the editor
currently lacks a slider called "map-zoom-slider".
2013-12-21 14:34:13 -03:00
Ignacio R. Morelle
e6c2e9ad18 Fix NULL pointer dereference when middle-click-scrolling in the editor
From commits 36b6b60beb507a1277de59691da051d4a2f75171 and
d04f6af930b18a740c7fccd0ee91d0e635f288e5 (paraphrasing):

  map_location original_loc = resources::controller->get_mouse_handler_base().get_scroll_start();
  .
  .
  .
  if (point_in_rect(mousex, mousey,rect) && resources::controller->get_mouse_handler_base().scroll_started()) {
  .
  .
  .

When in the game map editor, resources::controller is set to NULL since
it is only intended to refer to a play_controller object. But there's no
need to look specifically for a play_controller in this code or get the
current pointer to a controller_base subclass since the pointer we need
is actually none other than 'this', which is always non-NULL.

(get_mouse_handler_base() is a method of the same class the faulty
handle_scroll() method is, controller_base. There are no derived classes
of it other than play_controller and editor_controller, and there is
only supposed to be one such instantiated at a time, so the fix is
trivial.)
2013-12-21 14:13:09 -03:00
Ignacio R. Morelle
717e11c269 help: Prose revision of the Add-ons section
Done with additional proofreading support from Turuk and vultraz.
2013-12-21 13:13:56 -03:00
JaMiT
00784d7de5 Move iterator.hpp to the utils subdirectory. 2013-12-21 09:40:18 -06:00
JaMiT
df6aedc695 More precise hotkey updates for WML menu items.
This fully separates hotkeys from whether or not there is a
[command] child of the menu item definition/update.
2013-12-21 09:25:12 -06:00
David Mikos
d04f6af930 add check to see that middle click scrolling variables are fully intialized 2013-12-22 01:53:44 +10:30
David Mikos
120f2011f3 Add snap horizontal/vertical to middle click scrolling and tweak speed. 2013-12-22 01:43:34 +10:30
Ignacio R. Morelle
41b666fbfe gui1: Escape filenames in the file_menu menu that may contain WML formatting
This prepends font::NULL_MARKUP to file_menu menu entries so that any
WML formatting characters at the start of filenames such as "#foo.map"
('#' -> red font format specifier) are ignored.
2013-12-21 11:51:50 -03:00
David Mikos
cd8c83532b Make it so that sliders can be mouse wheel scrolled. 2013-12-22 00:16:27 +10:30
David Mikos
36b6b60beb Make middle click scrolling based on movement distance not screen centre. 2013-12-21 22:28:59 +10:30
Boldizsár Lipka
a1e6eb821a Fix custom options layout.
Pass the correct arguments to options_manager::layout_children.
2013-12-21 13:10:02 +01:00
Boldizsár Lipka
63a7446925 Hide custom option widgets in configure::hide_children. 2013-12-21 13:10:02 +01:00
ln-zookeeper
994960c6aa Flipped Haldric's ship horizontally. 2013-12-21 13:06:52 +02:00
ln-zookeeper
df175d747f Merge branch 'master' of https://github.com/wesnoth/wesnoth-old 2013-12-21 13:02:52 +02:00
ln-zookeeper
c4dca8e309 Typo fixes in drake race description. 2013-12-21 13:01:20 +02:00
Andrius Silinskas
09c73abdff Updated changelogs. 2013-12-21 10:43:28 +00:00
fendrin
9a44642689 Save villages and items. 2013-12-21 06:39:48 +01:00
David Mikos
13f8f2d86a changelog entry for Involution/iceiceice's new mp_settings LUA read-only table. 2013-12-21 15:52:18 +10:30
Coffee--
31e9c4ec0e Merge pull request #87 from cbeck88/new_lua_hooks
New lua proxy table "wesnoth.game_config.mp_settings".
2013-12-20 20:59:07 -08:00
Ignacio R. Morelle
23bdf9e1d6 CodeBlocks project update 2013-12-21 01:32:29 -03:00
Ignacio R. Morelle
673b3b08e0 Revert "remove unused util.*pp from wesnothd cb project"
This reverts commit c51ce084fe708c93a30742eb386cc001cc3d3d2f.
2013-12-21 01:21:52 -03:00
Ignacio R. Morelle
0ca924d734 Add missing serialization/compression.hpp from 553c56b2bd971535117530af6b3cc3644abf53c7 2013-12-20 23:51:38 -03:00
Ignacio R. Morelle
553c56b2bd preferences: Merge compress_saves and bzip2_savegame_compression options
Now that we have combo box options in Preferences -> Advanced, we can
finally present the saved game compression options in a user-friendly
fashion instead of having two separate options with an unclear
relationship.

However, in order to achieve this I had to move far more code than I am
normally comfortable with:

 * Moved the config_writer::compressor enum type to a separate header
   file, serialization/compression.hpp, in order to make it available to
   more units without pulling a bunch of heavy crap (such as the boost
   iostreams headers) that's normally unneeded. The new type is
   compression::format.

 * Added a compression::format_extension() function to determine a file
   extension string according to a compression type. This is needed more
   often than one would think, see below.

 * Changed all savegame-related classes to use the compression::format
   type instead of a single boolean flag and bzip2_savegame_compression
   queries. This is a code-heavy task by design.

 * Changed all code scattered around deciding whether to use ".gz" or
   ".bz2" for a save extension to use compression::format_extension()
   instead. This affects both saved game implementation and interface
   code for some reason (read: poor design).

 * Removed the bzip2_savegame_compression preferences option, reusing
   the previous compress_saves option for this feature, turning it from
   a boolean option to a string option ("none", "gzip", "bzip2",
   defaults to "gzip" per advanced_preferences.cfg).

 * preferences::compress_saves() became
   preferences::save_compression_format().

 * Without bzip2_savegame_compression, people who previously enabled
   bzip2 compression will revert to gzip compression. This seems to be a
   rare enough case to me to bother with providing backwards
   compatibility with a feature that only existed for [1.11.0, 1.11.8).

 * For preferences files from previous versions where compress_saves was
   set to either "yes" or "no", there will be a conspicuous value in the
   second column of the advanced preferences list, especially if they
   are using a translation; it'll be either "yes" or "no" as an
   untranslatable string. A value of "yes" is equivalent to "gzip", and
   a value of "no" is equivalent to "none". Any other unrecognized value
   is equivalent to "gzip". As soon as the user chooses a compression
   format again, one of the three supported values ("none", "gzip", or
   "bzip2") will be written to the compressed_saves attribute in the
   preferences file.

All in all, a ridiculously messy commit that's not particularly feasible
to break down into separate pieces because all of the involved code is
very closely related to the overarching feature that's being
implemented in it.

Note that the save_index currently only uses gzip regardless of whether
bzip2 is the current compression format choice. This was the case even
before this commit, and I'm not sure it's worth it to change it given
the potential CPU usage and the fact that save_index tends to be broken
most of the time anyway.
2013-12-20 23:36:46 -03:00