* josteph/forward-port-some-of-the-174:
don't call invalidate_layout() unless needed
Convert a bunch more C-style casts I missed in 0dc5656 to static_cast
fixup don't show travis notifications from forks (cherry picked from commit 55bc62f442)
don't show travis notifications from forks (cherry picked from commit d6ab780ce9)
fix out of bonunds check
Lua: Invalidate layout in set_dialog_value()
Fix includes
Implement iOS version detection
Game Load: Use child_or_empty().
Themes: Fix the observers icon being hidden under the minimap
Game Load: Restore the ability to select 1.12.6 savegames in the list
Fix CMake build on macOS
NR S8: compatibility commit to make the new companions from scratch if we don't have them stored
Partially revert "Additional village variations (#3342)"
DM: Add last breath dialog for Zorlan
DM: Generalize death message so it works when Delfador is young and old
gui2/unit_recall: Change Recall button back to its correct label
Updated changelog in Xcode
Add WML unit test for unupgradable (#3336)
gui2/unit_recall: Fix i18n issues
DM: add some TODOs
iOS: finger scrolling in controls.
iOS document directories. Might use these on other platforms as well.
.gitignore for CLion
German multiplayer translation: fixes
German translation: reword era descriptions
German translation: fix a string
Statistics Dialog: merge unit name and count labels
add / remove some comments
Tutorial Part2: Give the player a canche to undo his move
UtBS 5: changes to scenario locations (#3104)
Update changelog in macOS package
SotA: transform bats already after the 5th scenario
TRoW: revert workaround for #2912
Changelog entry for the #2912 work around
TRoW: Increase Rithrandil's workaround portrait height to 700
TRoW: IPF-downscale Rithrandil's portrait, as a workaround to #2912
Add missing deprecation messages for deprecated macros
Northern Rebirth S02_01: keep side 8 leader from wandering off too far
changelog: remove AToTB AI entry
wesnothd: prevent another instance of crash from owner not in player_connections
Increased in-game chat size. This makes it render more smoothly
Minor tweaks to classic theme (thanks enclave for doing this)
Update RELEASE_NOTES (cherry picked from commit e2a2a85f16)
Update changelog for custom AI for AToTB S2
TRoW: revert changes, to avoid a potential OOS
Re-apply patches to fix issues #2844 and #2846 in SotA
Clear RELEASE_NOTES
Repair 66ab35f in the upwards direction
Add changelog for 1.14.0
add placeholer links to appdata file
Hide Editor help section
UtBS: readd do_not_list
UtBS: wmlindent pass
Fix MP label for #2855
Fixup 601c67d970
UtBS: Re-added compatibility code to load old saves using the new elves
Swap count and name columns in statistics (fixes#2893)
Revert string changes in SotA for 1.14 RC 3 - gold
AI recruitment: use unit-specific recall cost
AI recruitment: fix units on recall list interfering with recruiting
Fixup f7ab008 before GCC complains about an unused parameter >_<
Help: disabled parsing error popup
LoW: Fix translation error in conjunct list (fixes#2833) (#2834)
Fix pofix
Changelog entry for recent SotA fixes
Pofix entry for fc6c3ac04b
Pofix entry for b86a2968fe
Pofix entry for ab9f29a7a4
Fix HP label in longer languages
Help: removed sort_sections key with invalid value
less redraw_everything calls when receiving [change_controller]
fix gui2 dialog disappearing after [change_controller]
Use a fallback for when the player name is not known in debug notifications
This allows the sorting logic top be shared between the sidebar and the
unit preview pane. It also means that we no longer need to create a lambda
to sort them.
I also refactored the generation of movement cost data in help. In
particular, we're no longer extracting the struct to named local variables.
(cherry-picked from commit d8e2498dde)
Technically, all this code should work on Vista, (including the recent switch to using
SHGetKnownFolderPath), but since we're also considering requiring Visual Studio 2017
for building, we need Windows 7.
(cherry-picked from commit 2a585118d8)
