Merged upstream/master

.travis.yml

@@ -11,7 +11,6 @@ compiler:
 env:
     - BUILD="-O0"
     - BUILD="-O2"
-    - BUILD="C++14 -O2"
     - BUILD="translations"
 
 matrix:
@@ -47,7 +46,7 @@ before_install:
     - if [ "$BUILD" == "C++14 -O2" ]; then export WML_TEST_TIME=15; fi
     - if [ "$BUILD" == "C++14 -O2" ]; then export CXXSTD="1y"; fi
 
-    - if [ "$BUILD" == "-O0" ]; then export EXTRA_FLAGS_RELEASE="-O0 -Wno-literal-suffix -Wno-deprecated-declarations"; fi
+    - if [ "$BUILD" == "-O0" ]; then export EXTRA_FLAGS_RELEASE="-O0 -Wno-deprecated-declarations"; fi
     - if [[ "$BUILD" == "-O0" ]] && [[ "$CXX" == "clang++" ]]; then export EXTRA_FLAGS_RELEASE="-O0 -Wno-literal-suffix -Wno-deprecated-declarations -Wno-deprecated-register"; fi
     - if [ "$BUILD" == "-O0" ]; then export PLAY_TEST=false; fi
     - if [ "$BUILD" == "-O0" ]; then export MP_TEST=false; fi

CMakeLists.txt

@@ -18,7 +18,7 @@ endif(COMMAND cmake_policy)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
 # use our own version of FindBoost.cmake and other Find* scripts
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 #
 # Options
@@ -706,7 +706,7 @@ install(FILES l10n-track DESTINATION ${DATADIR})
 #
 
 configure_file(
-	"${CMAKE_MODULE_PATH}/uninstall.cmake.in"
+	"${CMAKE_SOURCE_DIR}/cmake/uninstall.cmake.in"
 	"${CMAKE_CURRENT_BINARY_DIR}/uninstall.cmake"
 	IMMEDIATE @ONLY
 )

changelog

@@ -4,6 +4,10 @@ Version 1.13.4+dev:
  * Removed support for SDL 1.2. SDL 2 is now the only supported version.
  * Terrains:
    * Changed terrain code of Desert Mountains from Mdy to Mdd.
+ * User Interface:
+   * Various design improvements to GUI2 widgets
+   * New simpler GUI2 loading screen
+   * New colored cursor graphics
  * WML engine:
    * Fix some issues with [foreach]
    * Fix some issues with backstab-like weapon specials
@@ -16,13 +20,21 @@ Version 1.13.4+dev:
    * New ~SCALE_INTO_SHARP(w,h) IPF which preserves aspect ratio, using
      nearest neighbor scaling.
    * Support delayed_variable_substitution= in [on_undo], [on_redo]
+     Note that this means $unit.x and $unit.y may not reflect the unit's
+     true location, so using [unstore_unit] on $unit may have unexpected effects.
+     This applies to $second_unit too. The $x1, $y1, $x2, $y2 variables work fine
+     though, so in most cases they can be used instead. Anything else in $unit
+     or $second_unit is also fine.
    * formula= in SUF can now reference $other_unit via the formula variable "other"
    * formula= now supported in location, side, and weapon filters
    * Weapon filters now support number, parry, accuracy, and movement_used
    * New [has_attack] in standard unit filters; supercedes has_weapon= and
      uses full weapon filter.
    * lua_function=var.member now works in SUF; however, 'var' still needs to
      be a global variable.
+   * Added new keys name_generator, male_name_generator and female_name_generator
+     for the [race] tag to declare a context-free grammar to describe how names
+     are derived
    * AiWML:
      * Simplified aspect syntax which works for all aspects, present and future:
        * All aspects with simple values can be specified as key=value
@@ -120,6 +132,13 @@ Version 1.13.4+dev:
      of the time in the overall schedule (eg, 1 would be dawn in the default
      schedule). Optional second argument takes a time area ID, to set
      local instead of global time.
+   * New wesnoth.add_fog and wesnoth.remove_fog functions allow changing fog
+     on the map. The [lift_fog] and [clear_fog] tags now use this.
+   * New wesnoth.add_sound_source, wesnoth.remove_sound_source, and
+     wesnoth.get_sound_source functions to allow manipulation of sound
+     sources. The [sound_source] and [remove_sound_source] now use these.
+   * New wesnoth.log function for printing log messages. The [wml_message]
+     and [deprecated_message] tags now use this.
    * WML tables defined in Lua now accept string keys with array values
      (where "array" is a table whose keys are all integers). This joins
      the elements of the array with commas and produces a single string
@@ -263,6 +282,8 @@ Version 1.13.4+dev:
  * Miscellaneous and bug fixes:
    * Resolve translated logo images not being used (bug #24357)
    * Ported the "hexometer" tool from Bash to Python 3
+   * Recognize hotkey release events
+   * Allow changing keybindings for scrolling the map.
 
 Version 1.13.4:
  * Language and i18n:

data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg

@@ -233,7 +233,7 @@
 
         # This is where the lich starts, so he will pick up this
         # object immediately:
-        {FLAMING_SWORD 37 3 flaming-sword1}
+        {FLAMING_SWORD 37 3 flaming_sword1}
 
         [recall]
             id=Caladon
@@ -667,7 +667,7 @@
             # (because he will be near the top of the screen).
         [/delay]
 
-        {FLAMING_SWORD $x1 $y1 flaming-sword2}
+        {FLAMING_SWORD $x1 $y1 flaming_sword2}
         [object]
             id=drop_staff
             silent=yes
@@ -978,7 +978,7 @@
                 equals=yes
             [/variable]
             [then]
-                {FLAMING_SWORD $sword_x $sword_y flaming-sword3}
+                {FLAMING_SWORD $sword_x $sword_y flaming_sword3}
                 {CLEAR_VARIABLE get_sword}
                 {CLEAR_VARIABLE sword_x}
                 {CLEAR_VARIABLE sword_y}
@@ -1021,7 +1021,7 @@
                             equals=yes
                         [/variable]
                         [then]
-                            {FLAMING_SWORD $sword_x $sword_y flaming-sword3}
+                            {FLAMING_SWORD $sword_x $sword_y flaming_sword3}
                             {CLEAR_VARIABLE get_sword}
                             {CLEAR_VARIABLE sword_x}
                             {CLEAR_VARIABLE sword_y}

data/core/about.cfg

@@ -1058,6 +1058,9 @@
         name = "Doug Rosvick (dlr365)"
         wikiuser = "dlr365"
     [/entry]
+    [entry]
+        name= "Dugi"
+    [/entry]
     [entry]
         name = "Duthlet"
     [/entry]
@@ -1357,6 +1360,10 @@
     [entry]
         name = "Ryan Henszey"
     [/entry]
+    [entry]
+        name = "Ryan Roden-Corrent (rcorre)"
+        comment = "Hotkey release and scroll key rebinding"
+    [/entry]
     [entry]
         name = "Sachith Seneviratne (sachith500)"
         email = "sachith500@gmail.com"
@@ -1862,14 +1869,16 @@
     [/entry]
     [entry]
         name = "Steven Panek (Espreon)"
-        comment = "Current maintainer"
         email = "Majora700_AT_gmail_DOT_com"
         wikiuser = "Espreon"
     [/entry]
     [entry]
         name = "Thomas Hockings (Deusite)"
         wikiuser = "Deusite"
     [/entry]
+    [entry]
+        name = "Wedge009"
+    [/entry]
 [/about]
 
 [about]

data/core/hotkeys.cfg

@@ -13,6 +13,23 @@
 #endif
 #enddef
 
+[hotkey]
+    command=scroll-up
+    key=UP
+[/hotkey]
+[hotkey]
+    command=scroll-down
+    key=DOWN
+[/hotkey]
+[hotkey]
+    command=scroll-left
+    key=LEFT
+[/hotkey]
+[hotkey]
+    command=scroll-right
+    key=RIGHT
+[/hotkey]
+
 [hotkey]
     button=1
     command="selectmoveaction"

data/gui/macros/_initial.cfg

@@ -29,7 +29,7 @@
 # If the text is too high it returns the top side.
 # Rounding happens to the bottom side.
 #define GUI__TEXT_VERTICALLY_CENTRED
-	"(if(text_height < height, (height - text_height - 2) / 2, 0))"
+	"(if(text_height < height, (height - text_height) / 2, 0))"
 #enddef
 
 #define GUI__CENTERED_TEXT FONT_SIZE FONT_STYLE FONT_COLOR
@@ -279,6 +279,37 @@
 	[/row]
 #enddef
 
+#define GUI_VERTICAL_SPACER_LINE
+	[column]
+		border = "all"
+		border_size = 10
+		vertical_grow = true
+
+		[drawing]
+			definition = "default"
+
+			width = 1
+			height = (height)
+
+			[draw]
+
+				[line]
+					x1 = 0
+					y1 = 1
+					x2 = 0
+					y2 = (height - 1)
+
+					color = {GUI__FONT_COLOR_DISABLED__DEFAULT}
+					thickness = 1
+				[/line]
+
+			[/draw]
+
+		[/drawing]
+
+	[/column]
+#enddef
+
 ###############################################################################
 ###                                                                         ###
 ### Macros for the normal gui.                                              ###
@@ -307,5 +338,5 @@
 #enddef
 
 #define GUI_NORMAL__FONT_SIZE__TITLE
-	24
+	22
 #enddef

data/gui/macros/horizontal_scrollbar.cfg

@@ -13,7 +13,7 @@ horizontal_grow = "true"
 			# note we want a special button definition for this later.
 			[repeating_button]
 				id = "_half_page_up"
-				definition = "left_arrow"
+				definition = "scrollbar_left_arrow"
 			[/repeating_button]
 
 		[/column]
@@ -34,7 +34,7 @@ horizontal_grow = "true"
 			# note we want a special button definition for this later.
 			[repeating_button]
 				id = "_half_page_down"
-				definition = "right_arrow"
+				definition = "scrollbar_right_arrow"
 			[/repeating_button]
 
 		[/column]

data/gui/widget/button_default.cfg

@@ -148,8 +148,9 @@
 			[draw]
 
 				{_GUI_STATE "background"
-					({_GUI_BORDER_COLOR_ALPHA      {ALPHA}})
-					({_GUI_BORDER_COLOR_DARK_ALPHA {ALPHA}}) ("1, 10, 16, 255") "~GS(){IPF}"}
+					("128, 128, 128, {ALPHA}") # Same as GUI__FONT_COLOR_DISABLED__DEFAULT, but with an alpha componant
+					("89,  89,  89,  {ALPHA}")
+					("1, 10, 16, 255") "~GS(){IPF}"}
 
 				{GUI__CENTERED_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_DISABLED__TITLE})}