Merge branch 'master' into 1.17_fauna_20220611

wesnoth · Jun 20, 2022 · c39d6ae · c39d6ae
2 parents 7229dbd + f00ee60
commit c39d6ae
Show file tree

Hide file tree

Showing 624 changed files with 102,970 additions and 89,870 deletions.
diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
@@ -217,6 +217,15 @@ jobs:
         with:
           submodules: "recursive"
 
+      - name: Cache object files
+        id: windows-cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            D:/a/wesnoth/vcpkg
+            D:/a/wesnoth/wesnoth/vcpkg_installed
+          key: win-cache-0001
+
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v1.0.2
 
@@ -225,7 +234,7 @@ jobs:
         run: |
           git clone https://github.com/microsoft/vcpkg.git D:/a/wesnoth/vcpkg
           cd D:/a/wesnoth/vcpkg
-          git checkout 01d6f6ff1e5332b926099f0c23bda996940ad4e8
+          git checkout b49b2bdf22559c89eddbf29a29621a1dc6929320
           D:/a/wesnoth/vcpkg/bootstrap-vcpkg.bat
 
       - name: Setup cmake
@@ -261,6 +270,15 @@ jobs:
         with:
           submodules: "recursive"
 
+      - name: Cache object files
+        id: windows-cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            D:/a/wesnoth/vcpkg
+            D:/a/wesnoth/wesnoth/vcpkg_installed
+          key: win-cache-0001
+
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v1.0.2
 
@@ -269,7 +287,7 @@ jobs:
         run: |
           git clone https://github.com/microsoft/vcpkg.git D:/a/wesnoth/vcpkg
           cd D:/a/wesnoth/vcpkg
-          git checkout 01d6f6ff1e5332b926099f0c23bda996940ad4e8
+          git checkout b49b2bdf22559c89eddbf29a29621a1dc6929320
           D:/a/wesnoth/vcpkg/bootstrap-vcpkg.bat
 
       - name: Setup cmake

diff --git a/.github/workflows/ci-scripts/macos.sh b/.github/workflows/ci-scripts/macos.sh
@@ -8,7 +8,7 @@ scons translations build=release --debug=time nls=true jobs=2 || exit 1
 
 cd ./projectfiles/Xcode
 
-xcodebuild CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -project "The Battle for Wesnoth.xcodeproj" -target "The Battle for Wesnoth" -configuration "$CFG"
+xcodebuild -project "The Battle for Wesnoth.xcodeproj" -target "The Battle for Wesnoth" -configuration "$CFG"
 EXIT_VAL=$?
 
 hdiutil create -volname "Wesnoth_${CFG}" -fs 'HFS+' -srcfolder "build/$CFG" -ov -format UDBZ "Wesnoth_${CFG}.dmg"

diff --git a/Doxyfile b/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "The Battle for Wesnoth"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.17.4+dev
+PROJECT_NUMBER         = 1.17.5+dev
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/changelog.md b/changelog.md
@@ -1,27 +1,41 @@
-## Version 1.17.4+dev
+## Version 1.17.5+dev
  ### Add-ons client
  ### Add-ons server
  ### Campaigns
-   * Eastern Invasion
-     * S1: Fixed campfire not having a sound (issue #5766)
-     * S07a:
-       * Better handling for side 2 (issue #4145)
-       * Fixed Grug upkeep, added dialogue about ogres joining (issue #4145)
-   * Northern Rebirth
-     * S1: Fixed Al'Tar confusing an orc for a slave (issue #6735)
  ### Editor
  ### Multiplayer
  ### Lua API
  ### Packaging
  ### Terrain
  ### Translations
-   * Updated translations: Czech, Finnish, French, Japanese, Polish
  ### Units
  ### User interface
  ### WML Engine
+ ### Miscellaneous and Bug Fixes
+
+## Version 1.17.5
+ ### Campaigns
+   * Eastern Invasion
+     * S1: Fixed campfire not having a sound (issue #5766)
+     * S07a:
+       * Better handling for side 2 (issue #4145)
+       * Fixed Grug upkeep, added dialogue about ogres joining (issue #4145)
+   * Northern Rebirth
+     * S1: Fixed Al'Tar confusing an orc for a slave (issue #6735)
+ ### Translations
+   * Updated translations: Arabic, Chinese (Traditional), Czech, Finnish, French, Japanese, Polish
+ ### User interface
+   * High-DPI font and image rendering is now enabled across the entire UI.
  ### Miscellaneous and Bug Fixes
    * wmllint automatically removes the obsolete lines `{SOUND:SLOW}` and `{SOUND:POISON}`
    * Fixed path finding visibility bug that sometimes caused OOS errors on maps with tunnels and at least three sides that do not share vision (PR #6744)
+   * Fixed transparency of submerged units when zoomed (issue #3746)
+   * Fixed mouse input mapping problems on MacOS (issue #6715)
+   * Removing the Protect Unit Micro AI no longer causes a Lua error
+   * Fixed chance of being unscathed in damage calculation for some fights in which both units can die (issue #6590)
+   * Fixed visibility bug in ai_helper.get_attackable_enemies() for some complex filters
+   * Fixed bug in Bottleneck Micro AI involving units without moves on terrain with multiple open passages (issue #6599)
+   * Fixed error in Castle Switch CA of the Experimental AI after a leader was killed (issue #6440)
 
 ## Version 1.17.4
  ### Campaigns

diff --git a/data/advanced_preferences.cfg b/data/advanced_preferences.cfg
@@ -160,5 +160,16 @@
     default=no
 [/advanced_preference]
 
+[advanced_preference]
+    field=font_scale
+    name= _ "Font size scale (experimental)"
+    description= _ "Scales all text up or down from the standard size for your resolution. Warning: Scaling text up may cause issues in the in-game sidebar."
+    type=int
+    default=100
+    min=80
+    max=150
+    step=5
+[/advanced_preference]
+
 #ifdef __UNUSED__
 #endif
diff --git a/data/ai/micro_ais/scenarios/animals.cfg b/data/ai/micro_ais/scenarios/animals.cfg
@@ -346,15 +346,13 @@
             message= _ "<span color='#A00000'>Important:</span> The animal Micro AIs in this scenario are written for a number of animal unit types that do not exist in Wesnoth mainline, such as sheep, sheep dogs, or deer. In this test scenario, these units have been replaced by mainline units."
         [/message]
 
-        # wmlindent: start ignoring
         [message]
             speaker=narrator
             image=wesnoth-icon.png
             message= _ "This is a fun little scenario with a bunch of different animal AIs, mostly for watching only. The animal AIs behave as follows:
 
 "+{ANIMAL_AI_DESCRIPTIONS1}
         [/message]
-        # wmlindent: stop ignoring
         [message]
             speaker=narrator
             image=wesnoth-icon.png
@@ -366,13 +364,11 @@
             caption= _ "Question for the Player"
             image=wesnoth-icon.png
             # wmllint: unbalanced-on
-            # wmlindent: start ignoring
             message= _ "It is possible to include a human-controlled Side 1, so that the action stops once every turn for looking around (or to mess with things in debug mode).
 
 Note that there is no end to this scenario. For demonstration purposes, any unit that is killed is replaced by another unit of the same type at the beginning of the next turn. In order to end the scenario, there's a right-click option - but that only works in human-controlled mode. In AI-only mode, you have to press 'Esc' or reload a previous savefile.
 
 Also note: The Animal AIs are coded as Micro AIs. A Micro AI can be added and adapted to the need of a scenario easily using only WML and the [micro_ai] tag. Check out the <span color='#00A000'>Micro AI wiki page</span> at https://wiki.wesnoth.org/Micro_AIs for more information."  # wmllint: no spellcheck
-            # wmlindent: stop ignoring
             # wmllint: unbalanced-off
             [option]
                 label= _ "<span font='16'>I'll just watch the animals.</span>"
@@ -426,13 +422,11 @@ Also note: The Animal AIs are coded as Micro AIs. A Micro AI can be added and ad
             type=Wolf
         [/filter_second]
 
-        # wmlindent: start ignoring
         [message]
             speaker=$second_unit.id
             message= _ "Yowl!
 Translation: Those boars are mean!  We better stay away from them and their young."
         [/message]
-        # wmlindent: stop ignoring
 
         [micro_ai]
             side=6

diff --git a/data/campaigns/Secrets_of_the_Ancients/gui/zombie_recruit_dialog.cfg b/data/campaigns/Secrets_of_the_Ancients/gui/zombie_recruit_dialog.cfg
@@ -78,7 +78,6 @@
                 border = "top,bottom"
                 border_size = 10
                 horizontal_alignment="left"
-                horizontal_grow=true
                 [image]
                     id = "large_unit_sprite"
                 [/image]
@@ -89,7 +88,6 @@
                 border = "bottom"
                 border_size = 5
                 horizontal_alignment="left"
-                horizontal_grow=true
                 [label]
                     use_markup = "true"
                     id = "large_unit_type"
@@ -154,7 +152,7 @@
             [column]
                 border = "bottom"
                 border_size = 12
-                horizontal_grow = true
+                horizontal_alignment = "left"
                 [label]
                     definition = "default_tiny"
                     use_markup = "true"
@@ -170,7 +168,7 @@
                 [label]
                     definition ="default_small"
                     use_markup = "true"
-                    label = "<b>" .. _ "Traits" .. "</b>"
+                    label = "<b>" + _ "Traits" + "</b>"
                 [/label]
             [/column]
         [/row]
@@ -204,7 +202,7 @@
                 [label]
                     definition = "default_small"
                     use_markup = "true"
-                    label = "<b>" .. _ "Attacks" .. "</b>"
+                    label = "<b>" + _ "Attacks" + "</b>"
                 [/label]
             [/column]
         [/row]
@@ -213,7 +211,6 @@
                 border = "bottom"
                 border_size = 2
                 horizontal_alignment = "left"
-                horizontal_grow = true
                 [label]
                     definition = "default_small"
                     use_markup = "true"
@@ -226,7 +223,6 @@
                 border = "bottom"
                 border_size = 2
                 horizontal_alignment = "left"
-                horizontal_grow = true
                 [label]
                     definition = "default_small"
                     use_markup = "true"

diff --git a/data/campaigns/World_Conquest/lua/game_mechanics/utils.lua b/data/campaigns/World_Conquest/lua/game_mechanics/utils.lua
@@ -28,7 +28,7 @@ end
 function wc2_utils.pick_random(str, generator)
 	local s2 = wml.variables[str]
 	if s2 ~= nil or generator then
-		local array = s2 and stringx.split(s2 or "") or {}
+		local array = s2 and stringx.split(s2) or {}
 		if #array == 0 and generator then
 			array = generator()
 		end

diff --git a/data/core/about_i18n.cfg b/data/core/about_i18n.cfg
@@ -35,6 +35,10 @@ sort=yes
     [entry]
         name = "Amnay Mokhtari"
     [/entry]
+    [entry]
+        name = "Mejri Ziad (hermestrismi)"
+        comment = "current maintainer"
+    [/entry]
 [/about]
 
 # no strings committed so far