69938 Commits

Author SHA1 Message Date
mattsc
a673e64d44 FAI files: remove trailing whitespaces 2017-10-01 13:43:27 -07:00
mattsc
6751172282 Poisoner FAI: prevent passing empty list to min(), fixes #1999
The WFL min() function was changed from returning zero to returning an
error when an empty list is passed as argument (commits eccd3d8e and
fd9f1153).  This adapts the Poisoner FAI code to deal with that
correctly.
2017-10-01 13:41:35 -07:00
Jyrki Vesterinen
0c2d3a630e Fix a copy-paste mistake in commit 034fc08701eab09c4301d8948db88083260b7d80
[ci skip]
2017-10-01 15:20:05 +03:00
Jyrki Vesterinen
034fc08701 Fix crash on exit with SDL 2.0.6 2017-10-01 15:12:55 +03:00
doofus-01
a6774d9406 Troll (or rough stone?) encampment terrain variation (#2038)
* troll encampment, using same graphics rules as aquatic camp for now

* progress on troll castle

* completed image set for troll encampment
2017-09-30 17:00:21 -07:00
doofus-01
62d4368a19 [terrain_graphics] chasm transitions to lower layer (#2056)
* moving all chasm transitions to lower layer -290 from -90, not just those next to I* terrain

* adding a couple more stone_tile-chasm transition images
2017-09-30 16:39:47 -07:00
doofus-01
6bf3c4711d [terrain_graphics] Castle neighbor bleed-through (sand, snow) (#2039)
* some adjustments to keep the neighboring terrain transitions from bleeding into the castle terrains

* some fixes for castle base transitions

* comma
2017-09-30 16:03:36 -07:00
doofus-01
394e4bdc8a filling in some gaps with Ke* terrains with other keeps, so they behave like Ce* (#2057) 2017-09-30 16:02:14 -07:00
Severin Glöckner
7605943e80 DW: add hit sound to the king
(got lost when the old images were disabled)

[ci skip]
2017-09-30 16:52:56 +02:00
Arcanister
d92774ab74 Fix Jarek last breath message
There is a scenario, where you have Gerrick as leader, while Deoran is left behind. Perhaps dialogue could be made better, so Jarek tells something to Gerrick instead.
2017-09-29 13:59:28 +02:00
Alexander van Gessel
ca87ef4597 Fix crash for [/attack] without [attack]. Fixes #2052 2017-09-29 12:41:33 +02:00
gfgtdf
74e4ea04e7 don't generate names if [generator] has no [naming] tag
fixes #1986
2017-09-28 18:23:04 +02:00
Wedge009
3df86a0f6c Spelling corrections for 19b1f0a6 and 9b7db054.
I don't think these can be covered by utils/pofix.py, so correcting these directly.

[ci skip]
2017-09-26 16:39:32 +10:00
Nils Kneuper
5e15cdbbc6 updated British English translation 2017-09-25 21:25:22 +02:00
Alexander van Gessel
2c20bf7f51 Merge branch 'master' of github.com:wesnoth/wesnoth 2017-09-25 09:25:55 +02:00
Alexander van Gessel
7b7e8b1601 Use template argument instead of variable type 2017-09-25 09:25:22 +02:00
Jyrki Vesterinen
33fe982355 Disable dbd6695da9da224f4700ffa4994a712f35efa7b5 and bc911f8c466f61c6edeab1db52938e0bbc01d3dd with SDL < 2.0.6
Requested by @gfgtdf. There is some hope that this commit would fix
crash on exit that a couple of developers have reported.
2017-09-24 13:33:21 +03:00
doofus-01
563d080fec adding hide_help key to gates terrains (#2036)
This should address the multiple gate terrain listing in issue #1990 .  Whether gates are an embellishment (not worthy of a help entry) or not could be a different discussion.  The overlay issue mentioned in the same issue is probably also best addressed specifically, not tied to the gate-terrain-help question.
2017-09-23 19:37:45 -07:00
Jyrki Vesterinen
bc911f8c46 Fix another crash on startup with SDL 2.0.6
Caused by the same commit. SDL freed the old framebuffer even though we had
a reference to it, and when we passed it to SDL_FreeSurface(), it attempted
to free it again. It resulted in a crash depending on the C standard
library implementation and optimization level.
2017-09-23 17:45:50 +03:00
Jyrki Vesterinen
dbd6695da9 Fix crash on startup with SDL 2.0.6
Caused by 1db763c62f.
2017-09-23 17:45:50 +03:00
Jyrki Vesterinen
ab5019e313 Fix crash when the AI simulates battles with both swarm and slow
This happened if the AI simulated three fights for an unit that has swarm
and either unit was able to slow in the second fight.

Regression from commit edf750104348841badea50c7d85cd23584d8b1a6.

I didn't take into account that when swarm is used, the probability to stay
unscathed was supposed to be scaled by the probability of the whole combat
slice occurring in the first place. If either unit was able to slow,
complex_fight() calculated the unscaled probability instead, and when they
were added together, the combined probability went way above 100 %. That
triggered an assertion if the AI simulated one more fight for the affected
unit.
2017-09-23 10:45:45 +03:00
Charles Dang
bc86ce762d Pre-release version bump
[ci skip]

A serious issue was discovered in the 1.13.9 release, so we're releasing 1.13.10 now.
2017-09-22 14:22:20 -04:00
gfgtdf
9ba7bfae3a Update changelog 2017-09-22 20:18:32 +02:00
loonycyborg
414659200d scons: ensure that if /usr/include is added to CPPPATH it won't be used with -isystem option 2017-09-22 19:18:38 +03:00
gfgtdf
94e4ca1a38 don't throw network_error if we still have incoming data queued (#2032)
previously if the the server closed the connection it could happen that wesnothd_connection::receive_data threw an exception before the last package was processed which would break wesnothd redirection.
2017-09-22 16:18:52 +02:00
ln-zookeeper
3786827b4f EI S11: Corrected race=bat to race=bats, fixes #2031 2017-09-22 09:32:56 +03:00
Charles Dang
8870f7d277 Post-release version bump 2017-09-21 23:47:55 -04:00
Charles Dang
e47ea7fded Pre-release version bump
[ci skip]
1.13.9
2017-09-21 23:05:30 -04:00
Charles Dang
95afd707c3 Updated changelog
[ci skip]
2017-09-21 23:02:49 -04:00
loonycyborg
8293965999 pot-update and regenerate doc files 2017-09-21 23:55:53 +03:00
Charles Dang
ef0d4602e7 Preferences Dialog: fixed issue where certain prefs aren't saved
If a preference wasn't in the selected tab, it wouldn't be saved. This was a serious issue.
See d1bcb6fe720 for more details.
2017-09-21 15:18:50 -04:00
Charles Dang
d1bcb6fe72 GUI2/Stacked Widget: added ability for widgets to be found in all layers
This is controlled by a find_in_all_layers flag (false by default). The reason I added this was to
have a cleaner method for find_widget to locate widgets on layers other than the currently visible
one. Usually, they aren't found, which leads to a rather hacky workaround of showing all layers
(selecting layer -1) manually whenever this was needed. There are a few cases where this isn't doable,
though, such as in the Preferences dialog. Right now, if a setting isn't on the currently visible page
when you exit the dialog, your selections won't be saved. Since modal_dialog::finalize_fields is called
before post_show, I can't do the show-all-layers trick in post_show.

This will provide a cleaner method for dialogs to use the find-in-all-layers behavior, if desired, without
unexpectedly running into issues in the future if someone forgot to add the workaround code.

This also adds a const overload for get_layer_grid to facilitate the find() implementation. I also haven't
implemented a find_at overload since I don't think it's necessary yet. Probably should get to that at some
point, though.
2017-09-21 15:17:22 -04:00
Charles Dang
42f353dec3 Fix corner case where Terrain Layers dialog could assert (fixes #2026)
See comment for explanation.
2017-09-21 15:11:20 -04:00
Sofartin
a672f3c8a6 Fix for error: unused typedef in Xcode builds
This PR fixes this:
```
10:43:06 In file included from /Users/user/.jenkins/workspace/Wesnoth/src/color_range.cpp:24:
10:43:06 In file included from ../../src/map/map.hpp:22:
10:43:06 In file included from ../../src/terrain/translation.hpp:29:
10:43:06 In file included from Headers/boost/multi_array.hpp:21:
10:43:06 In file included from Headers/boost/multi_array/base.hpp:28:
10:43:06 Headers/boost/multi_array/concept_checks.hpp:42:43: error: unused typedef 'index_range' [-Werror,-Wunused-local-typedef]
10:43:06       typedef typename Array::index_range index_range;
10:43:06                                           ^
10:43:06 Headers/boost/multi_array/concept_checks.hpp:43:37: error: unused typedef 'index' [-Werror,-Wunused-local-typedef]
10:43:06       typedef typename Array::index index;
10:43:06                                     ^
10:43:06 Headers/boost/multi_array/concept_checks.hpp:53:43: error: unused typedef 'index_range' [-Werror,-Wunused-local-typedef]
10:43:06       typedef typename Array::index_range index_range;
10:43:06                                           ^
10:43:06 Headers/boost/multi_array/concept_checks.hpp:54:37: error: unused typedef 'index' [-Werror,-Wunused-local-typedef]
10:43:06       typedef typename Array::index index;
10:43:06                                     ^
10:43:06 4 errors generated.
```
2017-09-21 14:26:21 -04:00
Alexander van Gessel
ad35b7ffd3 Fix std::{min,max} calls on architectures where long != int64 2017-09-21 16:59:14 +02:00
Alexander van Gessel
2a742182d8 Merge branch 'master' of github.com:wesnoth/wesnoth 2017-09-21 15:42:05 +02:00
Alexander van Gessel
77ebb27222 Modify other scons files too 2017-09-21 15:41:57 +02:00
Alexander van Gessel
6cffb03012 Update po sconscript too 2017-09-21 15:38:38 +02:00
Alexander van Gessel
071b3635b7 Rename gettext scons module to avoid naming conflict 2017-09-21 15:33:48 +02:00
Alexander van Gessel
ffa5085940 Merge pull request #2020 from AI0867/RWops-write
Implement RWops write functionality
2017-09-21 12:42:28 +02:00
gfgtdf
c69d11d33a Revert "add lua function to complie unit/location filters"
This reverts commit d2dc7db0d847392693586f8eac31ee9f50ce1b7b.
That commit was accidently pushed to wesnoth master because i
pushed the wrong branch.
2017-09-21 12:03:33 +02:00
gfgtdf
e3178987bb don't wrap {KALENZ} in a [unit] in [side]
this fixes a bug where the mp nick would be used in sp mode in multiple
dialogs because the side had no name= attribute.
2017-09-21 11:59:23 +02:00
gfgtdf
d2dc7db0d8 add lua function to complie unit/location filters 2017-09-21 11:59:23 +02:00
Alexander van Gessel
8d516df25b Don't use comma-separated arguments to print function 2017-09-21 11:45:00 +02:00
Alexander van Gessel
30f0404108 Cleanup 2017-09-21 11:23:57 +02:00
Alexander van Gessel
a9c5924eb7 Rename RWops static constructors 2017-09-21 11:16:28 +02:00
doofus-01
1523b09e77 fixes to sone tiles Irs and addition of basic clean walls variation Xoc (#2014) 2017-09-20 19:24:47 -07:00
sigurdfdragon
9f5195f05e SoF S3: Add loyal icon for loyal unit no longer a hero 2017-09-20 17:40:49 -04:00
sigurdfdragon
0ab2b74a81 Changelog: Move new terrain to the terrain section 2017-09-20 17:39:25 -04:00
gfgtdf
6a059111aa prevent user actions while executing unsynced wml actions 2
This should fix #2021. The reason why we didn't just add one events::command_disabler in the code that starts the unsyned event hander (moving the events::command_disabler up in wml_menu_item::fire_event) is the we want commnds_disables to be for the (wml) code that handles the menu items so that it knows that it can use issue synced commands via [do_command]
2017-09-20 21:23:23 +02:00