upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-21 02:43:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,224 Commits 52 Branches 374 Tags
Commit Graph

72224 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charles Dang
848062fde6 Remove the CMake/Scons compile-time check for IEEE 754 compliance 
Now handled by a static assertion.

(cherry-picked from commit d9315199ee44dfa8a36e4e01a9332ef21505df3c)
 2018-10-07 03:21:31 +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 6eddc6f978b0c3196bdba67b811459eaabbcaac6)
 2018-10-07 03:21:31 +00:00
Charles Dang
5aa4bf24ee Added a static assertion for IEEE 754 floating point compliance 
(cherry-picked from commit 1bfa8e363cae458fb0fad80bd2adfbaf46e4cbe0)
 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 ae127ea73a27ac1df37b065169810833774452de)
 2018-10-07 03:21:30 +00:00
Charles Dang
e0045bf78f Unit Recall: select the first row after applying sorting 
Reported on the forums: https://forums.wesnoth.org/viewtopic.php?f=4&t=48219

(cherry-picked from commit 7f673dcd1f825c9ae8789b1b0e7458ea50e2e673)
 2018-10-07 03:21:30 +00:00
mattsc
b83d9fa189 Update changelog 
(cherry-picked from commit ee62a75be21545e260380d9d4596dbfb219ca119)
 2018-10-07 03:21:30 +00:00
mattsc
0c707294cb Experimental AI recruiting: use math.huge instead of 9e99 
(cherry-picked from commit a6c0012689b39d74e2d9578f17010a048ef7d296)
 2018-10-07 03:21:29 +00:00
mattsc
f1eacc51ad Experimental AI: clear recruit cache when no recruit action found 
(cherry-picked from commit f810504306f7b97bd5e532793b36591ada8ba671)
 2018-10-07 03:21:29 +00:00
mattsc
9b6f933ded Fix Experimental AI not working without enemy units 
An example are the first two turns of Dark Forecast.

(cherry-picked from commit a65605c54726a391cc05d1bb75761966a8088cac)
 2018-10-07 03:21:29 +00:00
ln-zookeeper
0203eecce9 UtBS: Re-numbered Nym's sword animation frames 
Also optimized them.

(cherry-picked from commit 43c5b6fbb25104437b25779d2f2d3ab9f185860a)
 2018-10-07 03:21:29 +00:00
Pentarctagon
954b31de86 Fixup: Vyncyn was already listed in the credits. 
(cherry-picked from commit d02e16d7120a3df26b87ec586bbb6bc5519dcf2a)
 2018-10-07 03:21:28 +00:00
gfgtdf
74a3fbd37f wb: fixup fix handling of extra_recruit and [filter_recall] 
this was probably lost during rebasing.

(cherry-picked from commit 0f2b4fae1def36036ce8df639a035876c4aa1332)
 2018-10-07 03:21:28 +00:00
Charles Dang
6eb3b7ee25 Removed useless Hide Help entry for debug terrain info 
(cherry-picked from commit 23732cf40fc333517feb7454516fed68b9fe3351)
 2018-10-07 03:21:28 +00:00
doofus-01
0e3514d4cd kaleh sword animation 
(cherry-picked from commit c585ac4462b32634c5b8ef88f643e930c60a7a5c)
 2018-10-07 03:21:28 +00:00
gfgtdf
90be81c7bc wb: fix handling of extra_recruit and [filter_recall] 
fixes #3100

(cherry-picked from commit 5785ef7925d13381593176c1bfc532403221e65a)
 2018-10-07 03:21:27 +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 e82d811ab09ba2b6933fa3d12c9872f56369db51)
 2018-10-07 03:21:27 +00:00
gfgtdf
e59a50b2f5 fix require_resource in [resource] 
previously 918cdfcb36/src/saved_game.cpp (L293) would fail for [resource] because cfg["addon_id"] was empty.

(cherry-picked from commit 7ef9f9a18fdb25b993e0a2b3f533b0f4d04dc53f)
 2018-10-07 03:21:27 +00:00
Celtic Minstrel
155e9f377a Fix preprocessor error with deprecated macros intended to be used as an attribute value 
(cherry-picked from commit c9d58328458fec55ce88e7843a770dc37a200651)
 2018-10-07 03:21:26 +00:00
Charles Dang
4b93e0db42 THoT S2: fixed misspelled event name (fixes #3131) 
[ci skip]

(cherry-picked from commit 91150f25043386454d62f1956da0df134ab1ce86)
 2018-10-07 03:21:26 +00:00
gfgtdf
5224eefa77 fix require_scenario=yes not working with map_generation 
this fixes require_scenario=yes for scenarios that use map_generation or
scenario_generation, the problem was that create_engine does not call
saved_game::expand_scenario for random maps, (which is the function that
checks require_scenario=yes)

fixes #3105

(cherry-picked from commit a10287c5c2a49ff248f218c11f4061e472090089)
 2018-10-07 03:21:26 +00:00
Pentarctagon
96b323657f Add new units as discussed on the forums. 
See https://forums.wesnoth.org/viewtopic.php?f=32&t=47721&start=450#p625660

All images but the young roc/roc would remain under the GPL, since Kwandulin based them on images by Sleepwalker and I wasn't able to contact him about using the CC BY-SA for them.  The young roc base and attack sprites are under the CC BY-SA, and are by Vyncyn(forum username).

(cherry-picked from commit 16bfab0b0a9a0d95c3c66d2adb3ab6b535ec2799)
 2018-10-07 03:21:26 +00:00
Celtic Minstrel
c9c869b72b Documentation for the translation completeness command-line flags 
(cherry-picked from commit 691435ed4c5d2a7cb386971288a117e1e94ac569)
 2018-10-07 03:21:25 +00:00
Celtic Minstrel
b36ca170bd Update changelog 
(cherry-picked from commit 51f6f52709606082bb204915e28c3ef3b63da659)
 2018-10-07 03:21:25 +00:00
Celtic Minstrel
b3cf3cacbd Remove now-obsolete compile flag for disabling translation completion filtering 
(cherry-picked from commit b28c61c6dca0c4ed7b64bcfaec9896e37954169f)
 2018-10-07 03:21:25 +00:00
Celtic Minstrel
6177d4ae0a Add a command-line option to show incomplete translations in the language list 
(cherry-picked from commit fc74e782b7e5afc9a842f231655d48e42d63f4e6)
 2018-10-07 03:21:24 +00:00
Celtic Minstrel
ac3ab605aa Sort command-line options so the comment isn't lying 
(cherry-picked from commit 5e28c13b8710322117e53aea32888bff1d96bb4e)
 2018-10-07 03:21:24 +00:00
Martin Hrubý (hrubymar10)
24889d7da7 Xcode enable all warnings in DEBUG scheme 
(cherry-picked from commit d19a82801faf6d9bdc23adb167cbd13b8b468b70)
 2018-10-07 03:21:24 +00:00
Nils Kneuper
19a776adf7 updated Spanish translation 
(cherry-picked from commit 132f67395a62bdafe54ce28c52e4fb8a00f8d88f)
 2018-10-07 03:21:23 +00:00
Nils Kneuper
a6d7835228 updated Chinese (Simplified) translation 
(cherry-picked from commit 71a6488419f1e19226f49eaa83e64f7b880157da)
 2018-10-07 03:21:23 +00:00
Jyrki Vesterinen
f2c1744f3a Fix build with -Werror=unused-variable 
(cherry-picked from commit a388c2d891b77645f62999e550740ed772f7b24b)
 2018-10-07 03:21:23 +00:00
Jyrki Vesterinen
90c311b427 Changelog entry for commit 3deef64439e0ae8d762fb76bafd46bb3fea0cb16 
[ci skip]

(cherry-picked from commit c68a7ba5f61481240644ee39f0412f9ffcb354d2)
 2018-10-07 03:21:22 +00:00
Jyrki Vesterinen
d58ff8dd0d Listbox: don't try to keep the selected item visible (#3016) 
@Vultraz stated in Discord that list box should keep the scroll position
instead.

Resolves #3016.

(cherry-picked from commit 3deef64439e0ae8d762fb76bafd46bb3fea0cb16)
 2018-10-07 03:21:22 +00:00
Celtic Minstrel
ab36d7b600 Support [break], [continue], and [return] in [random_placement] 
(cherry-picked from commit 4a3508f13fea69b5cafdfa2d46a99caec201d6e5)
 2018-10-07 03:21:22 +00:00
Nils Kneuper
ab702fe19d updated Chinese (Simplified) translation 
(cherry-picked from commit 1b7d8b2f604a68df27d18d2f66255f74d4a12f02)
 2018-10-07 03:21:21 +00:00
Nils Kneuper
c4531723f0 updated Italian translation 
(cherry-picked from commit 63bac52b71ed04ffd124a940a680e82dad261b12)
 2018-10-07 03:21:21 +00:00
Nils Kneuper
0ece26f208 updated Italian translation 
(cherry-picked from commit 7877bc3ef4dd53164da4303fa1f47859c8a8bc93)
 2018-10-07 03:21:20 +00:00
Nils Kneuper
5e6d969bd4 updated Galician translation 
(cherry-picked from commit 83e1f6ad1cfbedaa93fd7e1341e79b9ba407d505)
 2018-10-07 03:21:20 +00:00
Nils Kneuper
4e18e2b1a1 updated French translation 
(cherry-picked from commit 20f92c383829ca2586c2d741afe7e492611968dd)
 2018-10-07 03:21:19 +00:00
Nils Kneuper
418bca0556 updated British English translation 
(cherry-picked from commit 2efd2c1d30a368e66b96a34aec8d1c5176b5de06)
 2018-10-07 03:21:19 +00:00
Nils Kneuper
a9449c1c87 updated Czech translation 
(cherry-picked from commit 20532e33820fe430a2b70bbc676c1175f2ba7a36)
 2018-10-07 03:21:18 +00:00
doofus-01
4934cd6526 Nym sword attack animation 
(cherry-picked from commit 29f97cd2fe901e98da10f5a3164157881df93fdd)
 2018-10-07 03:21:18 +00:00
Severin Glöckner
885baa1e68 NR S2: let Hammel not take part in combat 
All this trouble is about keeping him alive after all.
And fix a spelling mistake resuling in always false.

[ci skip]

(cherry-picked from commit 3730ff9738ee4eb2b9058c131490405957c62954)
 2018-10-07 03:21:17 +00:00
Wedge009
90f9fb9ea5 Revert "Revert "'moreso' isn't a word in any dialect of English."" 
This reverts commit 4d5a3de4e63ebaac4a853b0f724d1d342d451dd0.

Restoring correction at @Vultraz's request.

[ci skip]

(cherry-picked from commit e161d59536452ca78897d92cb2eaae2099228075)
 2018-10-07 03:21:17 +00:00
Jyrki Vesterinen
a907ed4638 Allow modifying dead units in more event handlers 
Namely attacker_hits, attacker_misses, defender_hits and defender_misses.

(cherry-picked from commit 9110e49760e40d9856b96f884f3c1636e034768c)
 2018-10-07 03:21:17 +00:00
Charles Dang
3b89e7f7e9 Rename gettext_boost.cpp to gettext.cpp 
Since there isn't another version anymore.

(cherry-picked from commit e0beff6615288a580553ee43ff3799a9794625b4)
 2018-10-07 03:21:16 +00:00
Aaron Winter
da76017d26 SotBE: Changed a few dates to fit the tweaked timeline from the forums 
Discussed in detail in https://forums.wesnoth.org/viewtopic.php?f=12&t=46460

(cherry-picked from commit 77fd148f063c06866e4c7bd56451afd35bf8d448)
 2018-10-07 03:21:16 +00:00
Pentarctagon
461ce4975d Don't require SDL2 or OGL for building the servers. 
Requiring SDL2 was masking needing to add -lpthread explicitly.

(cherry-picked from commit fd34fe849770de379096ac1ffe612fb22473a846)
 2018-10-07 03:21:16 +00:00
Charles Dang
86f6debd57 Convert a few remaining cases of boost::uint32_t to uint32_t 
(cherry-picked from commit ba6fa1e46bb33b69c76d223898e4d448df74087d)
 2018-10-07 03:21:15 +00:00
Charles Dang
e9990f7b6e Revert "Save custom options data in a more concise way" 
This reverts commit e3db7cc225618ab013ad25d94909ff50f04fb67b. Turns out the
id = value syntax did not work for options in an array since '.' is not a
valid config key name.

(cherry-picked from commit 1097bad28c79810a40a04c840a19184a68314a9b)
 2018-10-07 03:21:15 +00:00
Nils Kneuper
c249a78796 updated Spanish translation 
(cherry-picked from commit 2d9e02cffa1ae5146632c4ddbcc9e379648f6bb5)
 2018-10-07 03:21:15 +00:00