Commit graph

66063 commits

Author SHA1 Message Date
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 2483fc80e4,
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
Gregory A Lundberg
e0283a6add HttT S09 Victory before Moremirmu arrives
This can only happen when debugging or cheating, but handle it properly, anyway.
2016-09-13 16:34:53 -05:00
Gregory A Lundberg
6cef43770b HttT S08 Pan to duelist
Pan over so we can see him arrive.
2016-09-13 16:34:53 -05:00
Gregory A Lundberg
4e42034c77 HttT S08 Adjust closing-in area
Use a radius to make it more logical.
2016-09-13 16:34:53 -05:00
Gregory A Lundberg
e5bac96a60 HttT S05a Use best Advisor
Order the type list to prefer higher-level. Within level, prefer the order they were met, oldest first.

If there is no advisor (no recalls at all) recruit an Elvish Fighter for the part.
2016-09-13 16:34:53 -05:00
Gregory A Lundberg
002fd030bd HttT S04 Pan and animate Bugg
You know, I never noticed that Bugg changes until I read the code. Usually, the camera won't be on Bugg when he changes.

Pan to Bugg, wait a moment, and use the animations for kill and recruit so the player actually sees Bugg change.
2016-09-13 16:34:53 -05:00
Gregory A Lundberg
fa60cbe7f1 HttT S04 Use best of Landlubbers
Order the type list to prefer higher-level. Within level, prefer the order they were met, oldest first.
2016-09-13 16:34:53 -05:00
Gregory A Lundberg
051ce00bd8 HttT S04 Use best of Merfolk
Use a macro since this appears three times.

Order the type list to select the highest-level merfolk, and include all possible merfolk.
2016-09-13 16:34:53 -05:00
Gregory A Lundberg
1c9ef479dd HttT S02 Consistent team color for Sir Kaylan
Instead of just him, change his entire team to sport his colors.

This was too close to green for side 3, so changed them to purple.
2016-09-13 16:34:52 -05:00
Gregory A Lundberg
24ed9e55b3 HttT S02 Simyr steps forward 2016-09-13 16:34:52 -05:00
Gregory A Lundberg
cb074258e6 HttT S02 Haldiel rides in
He rides up from a village instead of simply appearing from thin air.
2016-09-13 16:34:52 -05:00
Celtic Minstrel
1af1932b37 Enable variable scrolling speed in GUI2 end credits 2016-09-13 17:19:11 -04:00
Ignacio R. Morelle
85d277dd45 Drop newly superfluous include 2016-09-13 18:04:52 -03:00
Celtic Minstrel
a3be5244ff Clear allow_plugin_skip earlier in titlescreen and MP lobby / create 2016-09-13 15:26:04 -04:00
Jyrki Vesterinen
e93ae16cfd location_palette_item: Fix signed to unsigned conversion compiler warning 2016-09-13 21:38:22 +03:00
Jyrki Vesterinen
5e930ea5fb Fix GUI2 multiplayer tests getting stuck 2016-09-13 21:22:23 +03:00
Celtic Minstrel
d0b8b471c5 Add campaignd target to XCode project
It builds and links, but won't work properly without an implementation
for async_send_file
2016-09-13 14:18:52 -04:00
Jyrki Vesterinen
c4992dcd38 viesti.txt 2016-09-13 21:18:50 +03:00
Celtic Minstrel
404c6ca754 Fix XCode wesnothd build 2016-09-13 13:14:11 -04:00
loonycyborg
fe07bf500e Replace custom scoped_resource with unique_ptr 2016-09-13 19:03:33 +03:00
loonycyborg
1c90221527 Merge branch 'master' into campaignd_asio 2016-09-13 16:37:36 +03:00
mattsc
862fd5f93b Update changelog and release notes 2016-09-12 07:48:31 -07:00
mattsc
cc986bbc50 AI: ensure multiple weapons are always checked for [disable] special
If the defender has multiple weapons at the range of the attacker
weapon, choose_defender_weapon calculates the combat outcome and
attacker_combatant_ is set. We still need to check the attack weapon
for the [disable] special in this case.
2016-09-12 07:48:31 -07:00
mattsc
3c98423547 AI: check whether attack is disabled for units with one attack
The added conditional only checks whether the [disable] tag is present.
If so, weapon 0 is not automatically assigned. It is then checked in
the following whether the tag is active.

This fixes bug 22179.
2016-09-12 07:48:31 -07:00
gfgtdf
860e6a13d5 Revert "Slightly more sensible scrollbar positioning on content resize"
this fixed keyboard (arrowdownkey) scrolling in the campaign list dialog
and maybe in other listboxes or treeviews too.

This reverts commit 1209a2fb5b.
2016-09-12 16:37:25 +02:00
gfgtdf
2ff3d2d3aa attempt to fix crash in editor starting positions tool. 2016-09-12 15:59:57 +02:00
gfgtdf
9cc80973f8 initialize the lua kernel earlier
This allows user defined [effect]s to be used in [unit]s in [side],
previously those units were created before custom effects were available,
2016-09-12 15:59:56 +02:00