65988 Commits

Author SHA1 Message Date
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
Gregory A Lundberg
7778e6f45c HttT Debug choose_level works 2016-09-13 16:34:55 -05:00
Gregory A Lundberg
533e872578 HttT S19a Fix bug: Not translatable
The (added earlier) message when a unit move close to the tree was not translatable and should be.
2016-09-13 16:34:55 -05:00
Gregory A Lundberg
d8dad92bd9 HttT S19b Use unit for Void Armor
Use the unit instead of narrator for the Void Armor messages. This allows gender-specific messages when worn.
2016-09-13 16:34:55 -05:00
Gregory A Lundberg
ecf4a1366a HttT S19a Fix bug: Paladin can use sword
An earlier change from blade to arcane for the Paladin's Holy Sword made the Flaming Sword ineffective and he was removed from the list of unit types allowed to take the sword.

This re-instates Paladin by changing the effect filter. I checked all CURRENT units and minimized the filter so the Flaming Sword only effects the swords and the sabre Li'Sar uses.
2016-09-13 16:34:55 -05:00
Gregory A Lundberg
9b80ea9689 HttT bigmap Fix bug: Wrong defaults
When the path was not known (due to change_level) the big map assumed the wrong defaults. Now, it follows the default route from [scenario] next_scenario=
2016-09-13 16:34:55 -05:00
Gregory A Lundberg
e9feb4c578 HttT S19c Hide sides
Don't give away the fact there are monsters and an ally lurking.
2016-09-13 16:34:55 -05:00
Gregory A Lundberg
f836609ba5 HttT S19c Less delay
5 seconds is too long. I'm always wondering what's up, forgetting about the upcoming drake. A shorter pause works just as well and has less chance of causing the player to wonder what's wrong.
2016-09-13 16:34:55 -05:00
Gregory A Lundberg
b452760fb5 HttT S19c Follow the leader
A specific merman lead us down the river. For consistency, use that same merman as the advisor, here.
2016-09-13 16:34:54 -05:00
Gregory A Lundberg
ef641d6ed3 HttT S19b Improve Void Armor
Made the question to pick it up specific to the unit.
2016-09-13 16:34:54 -05:00
Gregory A Lundberg
c8ca26c833 HttT S19a Improve Flaming Sword
It does not do anything for a Paladin, so removed him from the allowed users. Added a hint when a unit moves within two hex. Added a remark when finding it so it does not just ask what to do with it, and made that question less generic.
2016-09-13 16:34:54 -05:00
Gregory A Lundberg
ac3db7f036 HttT S17 No need to change objectives
It's jarring and most players will figure it out on their own. For those that look, have it silently change to remove the note about Delfador concentrating.
2016-09-13 16:34:54 -05:00
Gregory A Lundberg
d9bd9f9bb2 HttT S14 Hide side
Don't give away the fact there are monsters lurking.
2016-09-13 16:34:54 -05:00
Gregory A Lundberg
69c2bcd499 HttT S14 Consistent objectives
Added Gold report for consistency. Added a note that there is no turn limit (I always miss this fact).
2016-09-13 16:34:54 -05:00
Gregory A Lundberg
853144a39a HttT S13 Hide side
Don't give away the fact we have a hidden monster lurking someplace.
2016-09-13 16:34:54 -05:00
Gregory A Lundberg
92290d3bbc HttT S13 Use best whiner
When finding the Cuttle Fish, use the lowest-level unit to comment about it. Exclude Mages and Shaman (they are not surprised since they're well-versed in lore); include Kalenz and Konrad as possibilies. Since Konrad and Kalenz are included, the line will always be spoken.
2016-09-13 16:34:54 -05:00
Gregory A Lundberg
326e36e16b HttT S13 Increased comment chance
Instead of just Haldiel, add Simyr or any Paladin as the unit which says, "Back to the abyss, spawn of filth!"
2016-09-13 16:34:54 -05:00
Gregory A Lundberg
8ae8cb0384 HttT S13 Use best outlaw
Uncle Somf's nephew will be the highest-level outlaw we have from the Isle of the Damned. If we have Delurin, he will be the nephew.
2016-09-13 16:34:54 -05:00
Gregory A Lundberg
117259e35b HttT S11 Hide side
Don't give away a hint that we'll be popping up monsters in a few turns
2016-09-13 16:34:53 -05:00
Gregory A Lundberg
c952517875 HttT S11 Improved reinforcements
Use radius for warning zones. Allow water approach, so no warning is given to sea monsters unless they move onto the beach. Put units in place instead of smooshed to left edge of map. Adjust the warning comments. Actually swarm the attacker. Add a swarm if Li'sar is attacked. No comment unless Li'sar is killed by one of Konrad's forces.
2016-09-13 16:34:53 -05:00
Gregory A Lundberg
9c3301a78b HttT S10 Change objectives
Once the eggs have been taken, change objectives to remove them.
2016-09-13 16:34:53 -05:00