67534 Commits

Author SHA1 Message Date
Charles Dang
cf412fc168 FLG Manager: sort faction choices alphabetically (FR #21458) 2016-12-12 10:21:31 +11:00
Celtic Minstrel
5fdb73b92f Fix an error in [for] if step not specified 2016-12-11 18:06:51 -05:00
gfgtdf
3cc386d0cd TRoW: simplify wml by using [remove_object] 2016-12-11 21:56:35 +01:00
Celtic Minstrel
41884fca58 Add optional default value argument to config::str() 2016-12-11 15:29:30 -05:00
Charles Dang
47f2df878e Fixup e11c9eccb308 2016-12-12 07:10:46 +11:00
Charles Dang
e11c9eccb3 Faction Select: attempt to make [multiplayer_side] flag_rgb= work again 2016-12-12 07:07:46 +11:00
ln-zookeeper
37d88d08af EI: Added custom music to scenarios still using DEFAULT_MUSIC_PLAYLIST 2016-12-11 21:39:25 +02:00
gfgtdf
5a13937054 hide wesnoth.fire_wml_menu_item for normal scenarios
as noted in the comment of that function, its only meant to be used in tests.
2016-12-11 19:02:41 +01:00
Charles Dang
d5f172b942 Title Screen: fixed crash if game_config::game_title or game_title_background was empty (bug #22028)
The problem was that if either string was empty, their respective canvas variables would not be set and
result in a type_error being thrown.

With this change, the canvas variable is always set, even if it's just an empty string.
2016-12-12 03:11:15 +11:00
ln-zookeeper
f16550f538 DM: Fixed very unlikely case of possible breakage
It was in theory possible to spot the first village from the map edge, in which case Rorthin might not appear if his target location was randomized to be a border hex, so instead we just always move him to the hex north of Delfador.
2016-12-11 16:39:18 +02:00
gfgtdf
0383e713ec fix lua side:matches always iterating over all units on the map. 2016-12-11 14:00:58 +01:00
ln-zookeeper
61ede9abc8 DM: Fixed and improved the code of S09
There were a lot of problems with the code, some actual bugs and some just bad form, so I rewrote and restructured most of it. The only major change is the removal of the unpredictable Skeleton spawn landmine when Delfador steps on the enemy castle (was MEMOIRS_SURPRISE_3).
2016-12-11 13:21:37 +02:00
Wedge009
f535b6a9f7 Minor updates to VC project.
[ci skip]
2016-12-11 20:25:04 +11:00
Celtic Minstrel
2bbe419a44 Fix segfault in typed_formula<color_t>::execute
The list had already been destroyed by the time it was indexed.
2016-12-11 02:55:43 -05:00
Celtic Minstrel
b5d25135fc Remove constexpr, because it needs to be everywhere or nowhere 2016-12-11 00:38:00 -05:00
Celtic Minstrel
aa6ee42db5 Remove adjust_surface_alpha_formula
This was only used in one place and made the sdl/utils.cpp file
depend on the WFL (formula) engine, which is undesirable.

Since it was only used in one place, the implementation was
moved to that one place instead.
2016-12-11 00:18:55 -05:00
Celtic Minstrel
9f102269bc Move inverse function into color_t 2016-12-11 00:10:35 -05:00
Celtic Minstrel
3f0485aaa4 Store link colour as color_t
Currently, formulas treat a colour as an array of components.
This could be improved.
2016-12-11 00:01:25 -05:00
Celtic Minstrel
76f725415d Update MSVC project 2016-12-10 20:55:39 -05:00
Celtic Minstrel
87d92119f3 Fix problem with viewing unit descriptions for hidden units
This applies when a specific unit of that type is available, for example
in the recall dialog.
2016-12-10 20:50:01 -05:00
mattsc
057749bd76 Update Xcode project 2016-12-10 12:00:56 -08:00
ln-zookeeper
2cf66ff442 DW: Clarified the Death Knight's gold chest; fixes bug #25363 2016-12-10 19:16:42 +02:00
Charles Dang
85537afa48 Attempt to fix macOS build 2016-12-11 01:46:50 +11:00
Charles Dang
f90e466360 Split util.hpp into utils/math.hpp and utils/general.hpp 2016-12-11 01:42:40 +11:00
Charles Dang
fb9831cfe5 Removed sdl_keysym_from_name (unused) 2016-12-11 00:09:26 +11:00
Charles Dang
1b8c04fbba Moved an erroneous sdl/utils.hpp include out of text header
This belonged in the implementation. Meant I had to include util.hpp in a few more places, though.
2016-12-11 00:09:25 +11:00
Charles Dang
7d83d0616a Removed CVideo::modeChanged() (unused) 2016-12-11 00:09:24 +11:00
gfgtdf
a53090d648 wml cleanups, add terrain= attribute to [random_placement] loc
replacing some [while] with [repeat] or [random_placement]

Adding  terrain= attribute to the variable generated by [random_placement] this mkaes it easier to use [random_placement] as a replacement for [store_locations] + [while] since [store_locations] also generates the [terrain] attribute:
2016-12-10 14:07:13 +01:00
Charles Dang
3c498eb0e4 Update CB projectfile
[ci skip]
2016-12-10 22:41:17 +11:00
Charles Dang
b97a20b059 Split SDL_Surface wrapper class and related helper struts into their own file
This (should) allow sdl/utils.hpp to be modified without a huge rebuild, since a number
of widely used headers included that file simply for the surface class type.
2016-12-10 22:36:31 +11:00
Charles Dang
09e73dbc98 Moved inverse to standard_colors.cpp
This is the only place it's used, and it's no longer an SDL-related util now that we have color_t. It could
potentially become part of color_t, but I'd have to think about it.

This also removes the sdl/utils.hpp dependency.
2016-12-10 22:36:30 +11:00
Charles Dang
98cca22c65 Moved the SDL_Rect ostream operator to the appropriate file 2016-12-10 22:36:29 +11:00
Charles Dang
4dbd219292 GUI2/Label: quick fix for label links not being formatted correctly
In 8041a0964e7b the label format was changed to an RGB string, but still passed around verbatim.
This is a quick fix that converts the color into a hex string. The color should probably be stored
as color_t internally, but I'm not sure what to do with the areas that involve formulas operating
on the string.
2016-12-10 21:21:18 +11:00
Charles Dang
7b34afdbe3 color_t: fix from_rgb_string 2016-12-10 21:20:34 +11:00
Charles Dang
8da0284a3a Tooltips: improve placement to avoid source widget overlap
Still need some tweaks for the secondary placement methods.
2016-12-10 19:36:53 +11:00
Charles Dang
9d51c40c5c Removed dummy_video
Doesn't seem to be used by anything.
2016-12-10 17:09:22 +11:00
mattsc
0f2b2f5271 Update Xcode project 2016-12-09 19:59:22 -08:00
mattsc
30a47da048 Update changelog 2016-12-09 19:38:15 -08:00
Charles Dang
71bb216352 Use font::unicode_bullet instead of manually writing • 2016-12-10 14:14:51 +11:00
mattsc
3236a4b085 Micro AIs: fix some MAIs not working under shroud
This is done by ignoring shroud for path finding (while still taking
hidden units into account correctly), consistent with default Wesnoth
AI behavior.
2016-12-09 18:59:52 -08:00
mattsc
36b2b4e9a7 AI helper functions: consistently ignore shroud when path finding
This is the default Wesnoth AI behavior. It is done in a way that still
ignores hidden units.
2016-12-09 18:57:18 -08:00
mattsc
8d76ad32b0 ai_helper: new function find_path_with_shroud() 2016-12-09 18:53:40 -08:00
Charles Dang
77777666de Catch exception when reading map label colors to enable loading old saves again
Prior to the color_t conversion, labels were written to savefiles with an alpha key, despite alpha not
being accepted in color=. Because of this, this enables the loading of older saves without an exception
throwing.
2016-12-10 12:20:34 +11:00
Charles Dang
5b3e3a7b21 Unit Preview Pane: code and tooltip formatting 2016-12-10 12:05:19 +11:00
Celtic Minstrel
97b675ea47 Fix animations trying to blend with a nonexistent colour 2016-12-09 20:03:05 -05:00
Celtic Minstrel
ef1d052136 Add Lua API for fetching net income and related values 2016-12-09 20:03:03 -05:00
Celtic Minstrel
c71b9306ed Remove redundant argument from display_context::calculate_team_data() 2016-12-09 20:03:02 -05:00
gfgtdf
d98525d951 replace true/false with yes/no in mainline 2016-12-09 02:55:59 +01:00
gfgtdf
c8236777ab remove [portait] tags
these had no effect since the corresponding c++ code was never
implemented.
2016-12-09 02:55:53 +01:00
Celtic Minstrel
5f8e6f9a7b Appveyor: Omit commit URL from announcement since builds are scheduled 2016-12-08 20:52:49 -05:00