66204 Commits

Author SHA1 Message Date
Charles Dang
5fead23a32 Fixup tests 2016-09-21 02:49:00 +11:00
mattsc
aecf8ab7bc Demote AI error message to warning and soften text
Changing to warning was done previously for all other messages of this
type but forgotten for this one (commit 7185d6cc80). Also, there’s not
been any recorded bug caused by this in many years, so there is no need
to keep the second part of the text.
2016-09-20 07:51:37 -07:00
Charles Dang
828d82c1ad MP Staging: enable chatbox 2016-09-21 01:49:48 +11:00
Charles Dang
dc69c7f6c1 Pass the lobby_info reference around like a hot potato 2016-09-21 01:49:47 +11:00
Charles Dang
dcc34fc328 Refactored twesnothd_connection member out of lobby_info
It's only use was to pass refresh_lobby on process_gamelist_diff fail. It makes more sense to
delegate that to the caller - in this case, the lobby. This also means the chatbox widget owns
a twesnothd_connection pointer so the chatbox can be used in situations where no server connection
is present.
2016-09-21 01:49:46 +11:00
mattsc
c90294215a Update changelog and release notes with new tunnel functionality 2016-09-20 07:27:52 -07:00
mattsc
09248c7dea Merge pull request #790 from wesnoth/fix-tunnel-issues
Tunnels: fix issues with vision
2016-09-20 06:52:08 -07:00
Charles Dang
ad0a9768b9 MP Staging: wired in more functionality 2016-09-20 23:04:24 +11:00
Charles Dang
96a66dc37c Dropdown List: fixed grow factor for name column 2016-09-20 21:29:47 +11:00
Ignacio R. Morelle
f2efa155c9 gui2/tpreferences: Restore combobox adv. preferences option descriptions
These were lost with the original port and somehow they never got fixed
despite my repeated insistence.
2016-09-20 07:11:43 -03:00
Charles Dang
4ffd212c91 Faction Select: open to any previously selected leader 2016-09-20 19:35:36 +11:00
Charles Dang
b2e6bd5bdc Game Version: removed unnecessary loop 2016-09-20 19:06:39 +11:00
Charles Dang
61b5cde7a0 Game Stats: removed horizontal spacer line 2016-09-20 19:05:29 +11:00
mattsc
aae3b67132 Fix indenting 2016-09-19 18:49:25 -07:00
mattsc
f13123648e Tunnels: fix issues when exit hex is occupied by invisible unit
This can happen when enemy units are hidden under fog or have the hides
ability. Either way, enemy units always blocks the tunnel.

Invisible allied units may or may not block the tunnel, depending on
the setting of pass_allied_units in the [tunnel] tag. It is therefore
necessary to get and check the full teleport map during a unit’s move
through a teleport, but with see_all=true (while the path finding uses
see_all=false).

This commit fixes the behavior and reinstates the ‘failed teleport’
message.
2016-09-19 18:46:02 -07:00
Celtic Minstrel
f096a22e2e Merge pull request #793 from GregoryLundberg/GL_debug_kill
Fix bug: Debug|Kill [have_unit] error
2016-09-19 20:23:34 -04:00
Gregory A Lundberg
c66325856b Fix bug: Debug|Kill [have_unit] error
Set the killed units hit points to zero so [have_unit] does not find it.
2016-09-19 19:13:07 -05:00
Celtic Minstrel
6b9ed2e3d4 Update XCode project 2016-09-19 20:06:30 -04:00
Celtic Minstrel
83bd6cdfbf Merge pull request #792 from GregoryLundberg/GL_harm_unit
Fix bug: Lua harm_unit
2016-09-19 19:41:53 -04:00
Gregory A Lundberg
3809a69a42 Fix bug: Lua harm_unit
Missing local T.

cf https://forums.wesnoth.org/viewtopic.php?f=21&t=44567
2016-09-19 17:40:41 -05:00
Lari Nieminen
60a6519295 Merge pull request #783 from GregoryLundberg/GL_HttT_changelog
HttT Player changelog
2016-09-20 00:13:50 +03:00
Lari Nieminen
d0d4223661 Merge pull request #733 from GregoryLundberg/GL_HttT_S06_logical_thieves
HttT S06 Logical Thieves
2016-09-20 00:11:51 +03:00
Gregory A Lundberg
9b364d25d2 HttT S06 Logical Thieves
If you have already killed Agadla by turn 4, instead of offering a choice, the three who appear simply join your forces.

This means it is possible to never get the Thieves, and not be able to recruit them. But you'd have to win before turn 4; so it's not possible unless you're cheating.
2016-09-19 15:42:22 -05:00
Gregory A Lundberg
d6f7de91ac HttT S06 Thieves join if leader killed
It is possible to take Elesenfar without ever capturing a village. To allow for this, and ensure the player always gets the Theives, they appear when Agadla dies as well as upon capturing a village.
2016-09-19 15:30:11 -05:00
Gregory A Lundberg
11d9891319 HttT S06 Fix bug: Let the player know
However the conversation plays out, once you meet the Theives you can recruit them. So let the player know.
2016-09-19 15:30:11 -05:00
Gregory A Lundberg
0594ebd172 HttT S06 Use capture and radius
Instead of a moveto, use a capture event so the theives only appear when actually capturing a village on the island.

Instead of listing the position of each village, use a radius so we can move them around, or add or remove a village more easily.
2016-09-19 15:13:52 -05:00
Jyrki Vesterinen
b3528593b7 Mention Boost.Thread in INSTALL
Wesnoth requires it, and none of the other Boost modules mentioned in
INSTALL depend on it.
2016-09-19 22:27:04 +03:00
Charles Dang
9721910d98 Initial implementation of GUI2 MP Staging dialog (Connect + Wait) 2016-09-20 05:34:31 +11:00
Charles Dang
8609955b74 Refactored square/minimal button definition code
* Reduced used of macro arguments slightly
* Made overlay images centered instead of stretched to size
2016-09-20 03:42:07 +11:00
Charles Dang
dba4bd78b3 Added short slider definition 2016-09-20 03:42:06 +11:00
Gregory A Lundberg
ccce958692 HttT Player changelog 2016-09-19 11:27:38 -05:00
Lari Nieminen
2970360d49 Merge pull request #734 from GregoryLundberg/GL_HttT_S07_ambushers_reduced
HttT S07 Ambushers Reduced
2016-09-19 19:24:19 +03:00
Charles Dang
2dd8cfdbdc GUI2: added flag to enable markup from WML 2016-09-20 02:06:16 +11:00
Gregory A Lundberg
0493c1eba4 HttT S07 Ambushers reduced
There was an old designer's note that killing the leaders in S01 ('The Elves Besieged') should reduce the number of ambushers hiding in S07 ('Crossroads').
2016-09-19 09:57:25 -05:00
Charles Dang
3e90310038 Fixed warning about no return 2016-09-19 23:51:50 +11:00
gfgtdf
8508b42bed use boost locale for strftime
fixes http://gna.org/bugs/?24927
2016-09-19 13:49:48 +02:00
Wedge009
21f01b0e5c Stop Esperanto date formatting crashing in Windows.
There's no such date format as %J. Also, 12-hour format was still using 24-hour.
2016-09-19 18:52:21 +10:00
mattsc
f601650070 [tunnel] tag: add new optional parameter allow_vision=yes/no
This can be used to choose whether vision is enabled through tunnels.
Defaults to ‘yes’.
2016-09-18 18:27:10 -07:00
mattsc
ae19588a37 Tunnels: fix vision not being propagated through tunnels 2016-09-18 18:27:10 -07:00
Celtic Minstrel
46634a9f31 Partial revert of 1816e1147f553c075b73c668117fb9833c5987c6
It seems plausible that this removed code somehow caused the test failures
on Travis. Though it would be better to work out exactly WHY that is,
restoring the code does serve as a quick-fix to get Travis working again.
2016-09-18 20:17:58 -04:00
Celtic Minstrel
457bec3ff8 MSVC: Exclude lua.cpp (the standalone interpreter) 2016-09-18 20:17:26 -04:00
Celtic Minstrel
7b40d87f28 Don't save removed [ai]version= key in save files 2016-09-18 20:07:49 -04:00
Celtic Minstrel
0e637361b1 Match code to comment
The comment stated that the keys 1 through 9 show how far a unit can
move in that many turns. However, the code did not support 8 or 9, for
no apparent reason.
2016-09-18 18:14:36 -04:00
Celtic Minstrel
713711a2cc Fixup botched conflict resolution 2016-09-18 17:04:53 -04:00
Celtic Minstrel
a63903cca0 Use FAIL() instead of VALIDATE(false) 2016-09-18 15:58:03 -04:00
Celtic Minstrel
1816e1147f Remove asserts.hpp
This file seemed to be some sort of reimplementation of <cassert> except
with some "feature" of trying to force the debugger to hit a breakpoint.
However, any decent debugger already hits a breakpoint with a standard
assert(), and this file really only served to make it harder to see the
actual error when using a Windows console.

Some instances of these macros were replaced with assert(), others with
VALIDATE() which instead throws an exception (and possibly puts up a
dialog, if the exception is caught before main()).

A few other related changes that got mixed in:
- Several error conditions now have a better error message (or indeed
  any error message at all)
- Removed an unnecessary use of std::distance on a Boost iterator range.
- Removed a large chunk of code which did nothing but construct a widget
  builder and then crash; the code was unreachable since an earlier loop
  did the same thing (without crashing), and the comment seems to suggest
  that it was a (seemingly no longer necessary) workaround for some buggy
  compilers / linkers.
- noreturn added to the list of compatibilty C++11 features in global.hpp
  (Of supported compilers, only VC12 lacks the new [[attribute]] syntax.)
- Fix detection of GCC in global.hpp

# Conflicts:
#	src/gui/widgets/settings.cpp
2016-09-18 15:57:47 -04:00
doofus-01
376d45a292 new terrain: Merfolk or aquatic camp (#773)
* adding aquatic encampment terrain

* Update changelog

* remove hardwired terrain codes and image-path from aquatic.cfg

* removed wood.png images

* touch-up to stone-posts in Kme-Cme transition
2016-09-18 13:23:38 +03:00
Lari Nieminen
8397201f60 Merge pull request #789 from GregoryLundberg/GL_HttT_S23_objectives
HttT S23 Fix bug: Unclear objective
2016-09-18 12:31:34 +03:00
gfgtdf
f2635e5ad6 Update changelog 2016-09-18 11:29:11 +02:00
Gregory A Lundberg
fc4c75e56d HttT S23 Fix bug: Unclear objective
The bonus is (1) recruit Knights and (2) the defeated leaders join you for the Battle for Wesnoth. You do not need to defeat all four for this.
2016-09-18 02:54:11 -05:00