widelands

Merge lp://staging/~widelands-dev/widelands/fh1-maps-multiplayer into lp://staging/widelands

  1. fh1-maps-multiplayer
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 8607
Proposed branch: lp://staging/~widelands-dev/widelands/fh1-maps-multiplayer
Merge into: lp://staging/widelands
Diff against target: 248 lines (+53/-63)
6 files modified
data/maps/MP_Scenarios/Island_Hopping.wmf/scripting/first_island.lua (+4/-4)
data/maps/MP_Scenarios/Island_Hopping.wmf/scripting/multiplayer_init.lua (+3/-14)
data/maps/MP_Scenarios/Island_Hopping.wmf/scripting/texts.lua (+11/-14)
data/maps/MP_Scenarios/Smugglers.wmf/scripting/multiplayer_init.lua (+2/-15)
data/maps/MP_Scenarios/Smugglers.wmf/scripting/texts.lua (+11/-16)
data/scripting/messages.lua (+22/-0)
To merge this branch: bzr merge lp://staging/~widelands-dev/widelands/fh1-maps-multiplayer
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+337506@code.staging.launchpad.net

Commit message

Converted MP scenarios to new font renderer.

This concludes the conversion to the new font renderer.

Thanks to Charly Ghislain (cghislai) who worked on the original branch (lp:~widelands-dev/widelands/fh1), which has now become unmergeable.

Description of the change

I have playtested Smugglers until the first smuggling report, but have done no testing on Island Hopping yet apart from loading the scenario.

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3160. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/339824814.
Appveyor build 2967. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fh1_maps_multiplayer-2967.

Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

Uhmm, to test hese we must do a realo multiplayer game, no bots.
As my son has a Visitor I am not user I have time for some real testing.

Code LGTM.

Revision history for this message
GunChleoc (gunchleoc) wrote :

I have tested Island Hopping now. Smugglers still needs a full test.

Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

Gun: how did you test this on your own?
I assume you need a real multiplayer setup to see all the messages?

Revision history for this message
GunChleoc (gunchleoc) wrote :

I can 4 copies of Widelands on the same machine. If you start it with

   ./widelands &

you don't even need separate terminals.

Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

So you know the magic of cloning yourself as well ;-)
So you must play ound robn and check all the possible outcomes?

Will try this later. Now started with bug1749586

Revision history for this message
GunChleoc (gunchleoc) wrote :

Yes, pretty much.

for Island Hopping, I just payed with 1 player with some soldier training until I reached the last island. Then I played the other 2 players round robin until they reached the last island too, and then I did a bit of fighting over the hill to make sure to trigger all messages.

Still need to do the same with Smugglers, but playing 2 allies and leaving the other 2 players idle should do.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Smugglers is impossible to test now because of https://bugs.launchpad.net/widelands/+bug/1751440

I'll try to get that fixed.

Revision history for this message
GunChleoc (gunchleoc) wrote :

I have managed to test Smugglers to the end now by temporarily merging lp:~widelands-dev/widelands/bug-1751440-smugglers-desync

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: