Commit graph

1407 commits

Author SHA1 Message Date
Iris Morelle
e68bdd1b5f Fix Lua errors when failing to set a music track on an empty playlist
Closes #3194.

(cherry-picked from commit 5871557dbf)
2018-10-07 03:22:28 +00:00
Charles Dang
965b5e1648 Unit Attack: fixed issues arising from displayed items potentially not equally available items
Since there were weapons included that weren't shown, it was possible for the best
weapon selection to be a hidden one (in which case, the initial selection would be
wrong, and it was possible for the returned index to point to a hidden, disabled
weapon.

This resolves both issues by excluding these disabled attacks from the weapon choices
list altogether. They aren't considered when calculating the best attack either.

mouse_handler::fill_weapon_choices is also used in mouse_handler::attack_enemy_, but
I don't foresee this change should cause any issues there, since you aren't supposed
to be able to actually attack with disabled weapons anyway.

(cherry-picked from commit 00e58f12f9)
2018-10-07 03:22:24 +00:00
mattsc
a5e447a438 Update changelog with Lua AI efficiency improvements
(cherry-picked from commit 7afe6adbee)
2018-10-07 03:22:21 +00:00
mattsc
fa6da90138 Changelog: collect AI entries in 'AI' section
(cherry-picked from commit 7ed5b210b5)
2018-10-07 03:22:21 +00:00
Iris Morelle
325864d7f1 Changelog entry for the fix for issue #3206
[ci skip]

(cherry-picked from commit 94a85e0185)
2018-10-07 03:22:19 +00:00
Iris Morelle
3505af2f09 gui2/unit_create: Do not exclude do_not_list units
This is a debug mode-only dialog. If I want to spawn a unit, the game
had better allow me to spawn any unit I want. do_not_list was created
for use by wmlunits anyway.

(cherry-picked from commit 085236f556)
2018-10-07 03:22:18 +00:00
Iris Morelle
7b604c2a89 Fall back to the unit type name for [message] captions for nameless units
Fixes #3211.

(cherry-picked from commit 051182fa1c)
2018-10-07 03:22:17 +00:00
Jyrki Vesterinen
d5f66e229f Changelog entry for commit 94b69e0281
(cherry-picked from commit b7c1007f34)
2018-10-07 03:22:17 +00:00
sigurdfdragon
ae67350fd9 Update changelogs
(cherry-picked from commit c9c689da66)
2018-10-07 03:22:16 +00:00
Iris Morelle
5c04fe72d5 Don't allow [kill] animate=yes to scroll to units through fog and shroud
Restores 1.12's behaviour.

(cherry-picked from commit 4e37cdc713)
2018-10-07 03:22:15 +00:00
Charles Dang
cc3e79c0a5 Tutorial S2: made enemy starting gold equal to that of the player
[ci skip]

(cherry-picked from commit c7a06939ab)
2018-10-07 03:22:13 +00:00
Nils Kneuper
320b2f321f updated Chinese (Traditional) translation
(cherry-picked from commit 3a8343b4dd)
2018-10-07 03:22:11 +00:00
Charles Dang
d665a8810d NR S11 - 13: reduced enemy starting gold and income (resolves #3198)
[ci skip]

Also similarly reduced one of your ally's starting gold in S13.

(cherry-picked from commit 5adb931b2a)
2018-10-07 03:22:08 +00:00
sigurdfdragon
a94a62c621 Update changelogs
(cherry-picked from commit 03d0e5deee)
2018-10-07 03:22:07 +00:00
Charles Dang
fbdc6814e0 Updated changelog
[ci skip]

(cherry-picked from commit 61694688a8)
2018-10-07 03:21:56 +00:00
Jyrki Vesterinen
6b5ce73605 Changelog entries
(cherry-picked from commit ae8baa6356)
2018-10-07 03:21:56 +00:00
Charles Dang
eebcdce40a Updated changelog
[ci skip]

(cherry-picked from commit ff2c729991)
2018-10-07 03:21:50 +00:00
Jyrki Vesterinen
b4e417d0dc Changelog entry for pull request #3169
(cherry-picked from commit cf2b1ed873)
2018-10-07 03:21:49 +00:00
Charles Dang
886156b0fe Campaign Difficulty: rearranged entry layout
(cherry-picked from commit 67530c4375)
2018-10-07 03:21:45 +00:00
Charles Dang
57177c699d Updated changelog
[ci skip]

(cherry-picked from commit 4300cb8263)
2018-10-07 03:21:45 +00:00
Jyrki Vesterinen
70c9829b14 Changelog entry for commit f861883683
(cherry-picked from commit f5609d6911)
2018-10-07 03:21:42 +00:00
Charles Dang
94d28391a6 Fixed animation-wide text_color and blend_color keys being overwritten
Regression from a0199c73f9. This should fix
an issue where levein/levelout fading was sometimes black instead of white.

(cherry-picked from commit 27d0a6f6fe)
2018-10-07 03:21:41 +00:00
Iris Morelle
bcf56aac3a gui2/preferences: Add version info button
Also simplifies the layout of the bottom-most row of the dialog a bit.

(cherry-picked from commit e8c803d426)
2018-10-07 03:21:40 +00:00
Charles Dang
ef09c1d10a GUI2/Message: tweaked Magic Numbers to fix layout failure with large portraits
[ci skip]

Fixes #2912

(cherry-picked from commit 9bf7a4c8fb)
2018-10-07 03:21:39 +00:00
ln-zookeeper
dc16d909d3 Updated changelogs
(cherry-picked from commit 59b69288ba)
2018-10-07 03:21:38 +00:00
Charles Dang
f68aec177f [remove_sound_source] now accepts a comma-separated ID list
[ci skip]

Lack of this pointed out by @shikadiqueen.
This change will also throw an error if id= is missing. Not sure if it did so before.

(cherry-picked from commit 8d3f54ce7c)
2018-10-07 03:21:36 +00:00
Iris Morelle
56cba5aacf Do not allow [message] to scroll to units through fog/shroud
This was a regression from 1.12.

(cherry-picked from commit 8ae38ac19f)
2018-10-07 03:21:36 +00:00
Iris Morelle
8f0cb83d8c Fix broken TC in a north-facing standing animation frame for the Revenant
[ci skip]

(cherry-picked from commit df782f5401)
2018-10-07 03:21:36 +00:00
Charles Dang
a842f67796 Updated changelog
[ci skip]

(cherry-picked from commit 998cf67e1a)
2018-10-07 03:21:34 +00:00
Iris Morelle
8c369ed799 Remove door terrains that were supposed to be removed by 1.14
If someone was using these despite being hidden and everything they were
really asking to get shot in the foot at some point.

(cherry-picked from commit 6eddc6f978)
2018-10-07 03:21:31 +00:00
Iris Morelle
3848fe30a9 Clamp tod_color values in the [-510, 510] range instead of [-255, 255]
[color_adjust] needs to be able to use absolute values as large as
2*255 in certain edge cases to set the screen a single solid colour when
interacting with time of day colour shifts.

Fixes #3144.

(cherry-picked from commit ae127ea73a)
2018-10-07 03:21:30 +00:00
mattsc
b83d9fa189 Update changelog
(cherry-picked from commit ee62a75be2)
2018-10-07 03:21:30 +00:00
Iris Morelle
c1319349b3 Fix [change_theme] crashing when theme= isn't specified
Leaving theme= unspecified ought to have the same effect as providing it
and setting it to an empty string. Without the check for a nil value,
however, it would result in a crash like this:

  20180519 22:31:54 error scripting/lua: lua/wml-tags.lua:922: bad argument #3 to '__newindex' (string expected, got nil)
  stack traceback:
          [C]: in metamethod '__newindex'
          lua/wml-tags.lua:922: in local 'cmd'
          lua/wml-utils.lua:145: in field 'handle_event_commands'
          lua/wml-flow.lua:6: in function <lua/wml-flow.lua:5>

(cherry-picked from commit e82d811ab0)
2018-10-07 03:21:27 +00:00
Celtic Minstrel
b36ca170bd Update changelog
(cherry-picked from commit 51f6f52709)
2018-10-07 03:21:25 +00:00
Jyrki Vesterinen
90c311b427 Changelog entry for commit 3deef64439
[ci skip]

(cherry-picked from commit c68a7ba5f6)
2018-10-07 03:21:22 +00:00
Jyrki Vesterinen
7a80026941 Changelog entry for commit a3658473c9
(cherry-picked from commit ab0d3747aa)
2018-10-07 03:20:52 +00:00
Charles Dang
ee2b9d242e Bump min required Windows version to 7
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)
2018-10-07 03:20:45 +00:00
Jyrki Vesterinen
7cefbac1eb Changelog entry for commit 8fa3f6a6d4
(cherry-picked from commit 9db47334a9)
2018-10-07 03:20:45 +00:00
Charles Dang
c033bffb33 Changelog: fixed inaccuracy
[ci skip]

(cherry-picked from commit 05774a3df5)
2018-10-07 03:20:43 +00:00
Charles Dang
3b5a9d2994 Fixed a crash when using certain invalid color= values
The specific case that brought this to our attention was color=100. In case such values
are used, the color reverts back to the default color for that side, as before.

The new codepath (team::get_side_color_id_from_config) is essentially the same as the old
one but more robust (range checking, for example, the lack of which was causing the crash
before).

(cherry-picked from commit 4c937c10c7)
2018-10-07 03:20:43 +00:00
Iris Morelle
23167a3634 Add changelog entries for the workaround for issue #3050
[ci skip]

(cherry-picked from commit 92812588b3)
2018-10-07 03:20:42 +00:00
Iris Morelle
a4f7f5c37c wam: Allow using embedded data URIs as add-on icons
[ci skip]

(cherry-picked from commit 4335bedeff)
2018-10-07 03:20:41 +00:00
ln-zookeeper
a4cc22f58a Updated changelog
(cherry-picked from commit f8a02e5e6d)
2018-10-07 03:20:40 +00:00
Iris Morelle
c92dd096c5 Update changelog for #3019
[ci skip]

(cherry-picked from commit 9850d3fa9c)
2018-10-07 03:20:30 +00:00
Iris Morelle
87c19293b7 Update changelog for MP server stuff from me and loonycyborg
[ci skip]

(cherry-picked from commit 622b1936bc)
2018-10-07 03:20:30 +00:00
Iris Morelle
e2acbffdea gui2/unit_attack: Only display active specials on the weapons list
This fixes issues reported on the forums where the weapons list now
includes weapon specials even when they aren't active, a regression from
1.12.x.

Closes #3033.

(cherry-picked from commit d727cf2c99)
2018-10-07 03:20:28 +00:00
mattsc
385f86bdbd changelog entry for custom AI for AToTB S2
(cherry-picked from commit a82971e48d)
2018-10-07 03:20:27 +00:00
Charles Dang
9e2918d68e MP Lobby: base resolution selection on window width not height
[ci skip]

Height isn't the problem. The default lobby can display fine even at 600 px h. Width is
the problem the default layout faces at low resolutions, and it was quite odd to have a
really wide window use the low resolution layout, despite there obviously being enough
horizontal space to fit the sidebar.

(cherry-picked from commit 2f565b8e90)
2018-10-07 03:20:21 +00:00
Charles Dang
e9bc7c9586 MP Lobby: restored Era info to main game display
Includes some slight spacing tweaks.

(cherry-picked from commit b17e9fa9b1)
2018-10-07 03:20:20 +00:00
Charles Dang
5129b2c42a Added some changelog entries for UtBS
[ci skip]

(cherry-picked from commit b947e7f63d)
2018-10-07 03:20:20 +00:00