66008 Commits

Author SHA1 Message Date
Charles Dang
a477eb4014 Fixup 1a25d297b81d (unused variable)
This function can likely be removed now, but I don't want to do it just yet.
2016-09-16 23:34:43 +11:00
Wedge009
1a25d297b8 Don't duplicate recall count decrement when undoing a recall (bug #25060)
Looks like un_recall_unit_cost() is used to retrieve the unit cost of the recalled unit but it also decrements the recall count, duplicating the decrement in un_recall_unit().
2016-09-16 21:53:59 +10:00
loonycyborg
f821598ca3 Switch boost::shared_array to unique_ptr 2016-09-16 13:40:55 +03:00
loonycyborg
86dc5174a8 Fixed compile errors in exploder 2016-09-16 12:39:21 +03:00
loonycyborg
b0fa8110f0 Convert remaining boost::bind to std::bind in campaignd code 2016-09-16 11:33:24 +03:00
Charles Dang
7def4d57eb Removed some accidentally-committed debug code 2016-09-16 19:10:26 +11:00
Charles Dang
fff2e3f193 End Credits: fixed crash if exiting before scrolling starts
If you exit the dialog before the initial timer fires, you'll end up with a crash when it attempts
to execute. This solution seemed simpler than assigning a temp timer to the delay timer.
2016-09-16 19:05:41 +11:00
Charles Dang
7eb13d2186 End Credits: removed the use of swap 2016-09-16 18:58:58 +11:00
Charles Dang
183abfdabb Game Load: fixed layout with small number of saves 2016-09-16 17:42:43 +11:00
Charles Dang
002f9a83c6 Yet again an attempt to appease travis 2016-09-16 17:42:42 +11:00
Charles Dang
4cf5be674c Merge pull request #781 from wesnoth/dynamic_bitset
Change most vector<bool> to dynamic_bitset
2016-09-16 13:59:16 +11:00
gfgtdf
b9a97d893d Merge pull request #775 from GregoryLundberg/GL_terrain_mask_positions
Honor special locations in terrain mask
2016-09-16 02:04:02 +02:00
Gregory A Lundberg
8be428e946 Honor special locations in terrain mask
A [terrain_mask] is simply a map. It can be smaller than the map, and can be offset. As a map, it can give special locations which can be used to position units, and queried by WML. With this change the names are properly applied to the underlying map, offset relative to the [terrain_mask]. A name given in the [terrain_mask] replaces that name in the underlying map, regardless of the original location. A map file can define only one name per location. A name can have only one location; but a location can have any number of names. To define additional names for a location, stack [terrain_mask] maps giving each. Once placed on the map, a name cannot be removed.
2016-09-15 16:00:36 -05:00
Celtic Minstrel
fe08701b7c Change most vector<bool> to dynamic_bitset
A few cases were skipped, most of which involved 2D bitsets (eg shroud)
or uses that could not be easily translated (eg GUI1 multimenu).

In a few cases, code needed to be updated for the different API that the
dynamic_bitset provides, but in most cases, this change is entirely
transparent.

There are probably a few unnecessary dynamic_bitset.hpp includes.

One use of vector<bool> was replaced instead with std::bitset, since
the dynamic size was not required.
2016-09-15 15:06:28 -04:00
Jyrki Vesterinen
dc89612dc4 Fix wesnothd build for Windows 2016-09-15 20:53:26 +03:00
Jyrki Vesterinen
42c3435c0c Update Visual Studio project 2016-09-15 20:52:29 +03:00
ln-zookeeper
f88cf93353 Added a newline to space apart gold carryover and notes sections 2016-09-15 20:03:00 +03:00
Bär Halberkamp
7d5f35dd68 EI S1: Make Dacyn able to heal others when reappearing 2016-09-15 18:36:14 +02:00
Bär Halberkamp
f1d6a96c15 Tutorial: Fix a missing capital in S1 2016-09-15 18:34:11 +02:00
Bär Halberkamp
ce05a573cf Run wmlindent 2016-09-15 18:04:37 +02:00
Bär Halberkamp
b20cb7c413 wmlindent: Indent concatenated strings 2016-09-15 18:04:37 +02:00
Celtic Minstrel
a3609e428b TB: Minor formatting fixup 2016-09-15 11:19:40 -04:00
Bär Halberkamp
1acd76e9fe Run wmlindent on data/campaigns 2016-09-15 16:55:24 +02:00
Bär Halberkamp
6cc92e2624 EI: Make S1 slightly harder after Dacyn reappears 2016-09-15 15:40:37 +02:00
loonycyborg
c16adcd8c9 Merge branch 'campaignd_asio' 2016-09-15 16:34:09 +03:00
Charles Dang
61f1c83073 End Credits: few formatting changes 2016-09-16 00:01:13 +11:00
Charles Dang
e261418691 Revert "Another attempt to satisfy travis"
This reverts commit a4a1ae49f146edddc499551223abcb6bfb1810a2.
2016-09-15 23:47:32 +11:00
Charles Dang
a4a1ae49f1 Another attempt to satisfy travis 2016-09-15 23:11:10 +11:00
Lari Nieminen
d16ce1b300 Merge pull request #732 from GregoryLundberg/GL_HttT_S05b_randomize_temples
HttT S05b Randomize Temples
2016-09-15 12:43:59 +03:00
loonycyborg
7f204f026a Explicitly instantiate steady clock with std::chrono
autodetection seems to fail on travis
2016-09-15 12:34:27 +03:00
Gregory A Lundberg
5fcc2c232f HttT S05b Randomize temples
Formerly, to find Moremirmu, simply check (11,13) and, if not there, he is in (10,17). Oh HARD, there was a 1-in-2 chance of finding Xakae in (11,13), instead, and (9,15) was always empty. On NORMAL, Xakae is in (9,15).

Now, the odds of finding Moremirmu in a given temple are 1-in-3, as are the odds of finding Xakae unless playing on EASY where he is not present.
2016-09-15 04:26:15 -05:00
Lari Nieminen
c11498ab89 Merge pull request #730 from GregoryLundberg/GL_HttT_general_improvements
HttT General Improvements
2016-09-15 12:21:12 +03:00
Charles Dang
5004f9bfaa Attempt to appease travis 2016-09-15 18:11:14 +11:00
Charles Dang
c99998cb52 Minor cleanup 2016-09-15 17:46:46 +11:00
Charles Dang
04d012a692 Removed util::scoped_ptr, util::scoped_array and util::scoped_file code 2016-09-15 17:26:23 +11:00
Charles Dang
3eac7281d9 Convert uses of util::scoped_array and util::scoped_file to std::unique_ptrs 2016-09-15 17:26:22 +11:00
Charles Dang
e78777caa3 Replaced instances of util::scoped_ptr with std::unique_ptr 2016-09-15 16:27:58 +11:00
Charles Dang
1fb26d9e1c Convert remaining SDL1.2 defines to their SDL2 counterparts and dropped compat layer 2016-09-15 15:55:09 +11:00
Elvish_Hunter
59d815dcf1 wmllint: handle SPECIAL_NOTES_DEFENSE_CAP
Also silenced a wmllint warning that this commit throws on the Chocobone unit.
2016-09-14 21:35:41 +02:00
Elvish_Hunter
0efdd721e2 GUI.pyw: slightly modified layout of wmlxgettext tab 2016-09-14 21:31:08 +02:00
loonycyborg
b52571d8d9 Remove use of network::error missed due to conditional compilation 2016-09-14 19:31:04 +03:00
Charles Dang
476027f239 Completely refactored internal handling of credits and enabled new dialog
This removes the ugly string markup and makes the dialog parse the config directly.

This also temporarily disables the display of credits in the help browser.
2016-09-15 03:09:14 +11:00
Charles Dang
04a6384beb Use bullets for credits spacers instead of asterisks 2016-09-15 01:03:32 +11:00
Charles Dang
d6ece4ef5a End Credits: added explanatory label regarding speed controls 2016-09-14 23:53:37 +11:00
loonycyborg
015c1ee3be Added explicit include for std::chrono 2016-09-14 15:01:28 +03:00
loonycyborg
d81e426ac5 Update changelog 2016-09-14 14:21:42 +03:00
loonycyborg
b1d110b95e Remove old networking stack 2016-09-14 14:08:44 +03:00
loonycyborg
47a85151c6 Update cmake with asio campaignd port sources 2016-09-14 13:53:38 +03:00
Ignacio R. Morelle
3a925c85e3 scons: Fix compiler switch typo
Accidentally introduced in 2483fc80e4a57f7cdc0ff9fbeaed08d85699d0d6,
oops. Didn't become evident unless hitting other compiler errors,
though.
2016-09-13 19:42:08 -03:00
Celtic Minstrel
b44728c77e Fix crash when launching with --editor and no file 2016-09-13 18:39:47 -04:00