Merge lp:~widelands-dev/widelands/fri-portraits into lp:widelands

Proposed by Benedikt Straub
Status: Merged
Merged at revision: 8879
Proposed branch: lp:~widelands-dev/widelands/fri-portraits
Merge into: lp:widelands
Diff against target: 25 lines (+2/-1)
1 file modified
data/txts/developers.json (+2/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/fri-portraits
Reviewer Review Type Date Requested Status
hessenfarmer Approve
Klaus Halfmann Approve
Review via email: mp+356221@code.launchpad.net

Commit message

New portraits for the characters in the frisian campaign

Description of the change

I want to get rid of those placeholder images, so I shot some "photographs" in Blender similar to the ones for the widelands.org/wiki/Artwork page.
These should be fine for b20 imho, but we should definitely make completely new images when we have someone who can draw portraits.

To post a comment you must log in.
Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

Looks like my youtube video reminded you of something ;-)

Will check this now.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4099. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/437958798.
Appveyor build 3895. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fri_portraits-3895.

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

OK, the portraits work as designed.

But as we already have a real Islnad could we have some +/- real Perons portrait, too?

Like https://de.wikipedia.org/wiki/Aldgisl

Or from here: https://www.youtube.com/watch?v=cVZjSD6_WIQ

Or from some local Museum?

Fell free to merge, though. Can add better pictures later,

review: Approve
Revision history for this message
hessenfarmer (stephan-lutz) wrote :

I think the new pictures do not fit in the context of the other Scenarios where portraits are used. This will especially evident in the 2nd Frisian scenario so my personal taste would be to keep the false portraits as they are currently rather than having these screenshots.
If the new pictures shall be taken we should add the same kind of image for Murilius at least to have the same artwork over all Frisian scenarios

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

Furthermore they could be enriched with the playercolor in the scenario. (e.g. blue for Hauke and Rebaud)

Revision history for this message
Benedikt Straub (nordfriese) wrote :

I have given the portraits (including Murilius) some editing in GIMP now to give them a painting-like look and a playercolored frame. How about these?

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

the portraits are better now with the canvas texture they don't look that bad anymore.
Do you have the blender files for the romans as well to create a Screenshot also for Murilius?
That would give us some consistency over the Frisian campaign

Revision history for this message
Benedikt Straub (nordfriese) wrote :

Yes, the empire workers are also in the repo. It´ll still look somewhat different though due to different modelling style. I´ll make the image this evening :)

Revision history for this message
Benedikt Straub (nordfriese) wrote :

Portrait for Murilius is uploaded. He looks a bit different to the Frisian people though ;)

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

At least the style is consistent now. I think the difference to the frisians is good for the player to distinguish between them easily.
Thanks a lot

review: Approve
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4109. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/439709708.
Appveyor build 3904. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fri_portraits-3904.

Revision history for this message
Benedikt Straub (nordfriese) wrote :

@Klaus: I don´t think using real portraits would work. There are very few portraits of Frisians. Aldgisl is about as close as we can get, and he was a Western Frisian duke (so he´d fit to Reebaud, who seems more Western than Northern frisian anyway), but there are few others. In the middle ages, it was mainly rich kings, dukes and the like that had themselves painted. But Northern Frisian society knew no distinction between higher and lower classes – nearly everyone was a peasant, even the (Ratsherren) and (Deichgrafen). Also, as far as I know most frisians who were rich enough to have themselves painted lived on Strand and other places the sea since reclaimed, so those portraits were destroyed by the flood of 1634. That´s why only few older paintings of (northern) Frisians exist. And I don´t want to edit real photographs for Widelands; I tried that but couldn´t produce anything useful.

@GunChleoc: This branch doesn´t need to wait for b21, right? Since it´s a graphics-only change.

Revision history for this message
Benedikt Straub (nordfriese) wrote :

If I may be so bold – I have added the missing dev-credit entry for myself here,
and as there are two approves:

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/campaigns/fri01.wmf/pics/hauke.png'
0Binary files data/campaigns/fri01.wmf/pics/hauke.png 2018-02-10 13:02:13 +0000 and data/campaigns/fri01.wmf/pics/hauke.png 2018-10-12 17:16:22 +0000 differ0Binary files data/campaigns/fri01.wmf/pics/hauke.png 2018-02-10 13:02:13 +0000 and data/campaigns/fri01.wmf/pics/hauke.png 2018-10-12 17:16:22 +0000 differ
=== modified file 'data/campaigns/fri01.wmf/pics/maukor.png'
1Binary files data/campaigns/fri01.wmf/pics/maukor.png 2018-02-10 13:02:13 +0000 and data/campaigns/fri01.wmf/pics/maukor.png 2018-10-12 17:16:22 +0000 differ1Binary files data/campaigns/fri01.wmf/pics/maukor.png 2018-02-10 13:02:13 +0000 and data/campaigns/fri01.wmf/pics/maukor.png 2018-10-12 17:16:22 +0000 differ
=== modified file 'data/campaigns/fri01.wmf/pics/reebaud.png'
2Binary files data/campaigns/fri01.wmf/pics/reebaud.png 2018-02-10 13:02:13 +0000 and data/campaigns/fri01.wmf/pics/reebaud.png 2018-10-12 17:16:22 +0000 differ2Binary files data/campaigns/fri01.wmf/pics/reebaud.png 2018-02-10 13:02:13 +0000 and data/campaigns/fri01.wmf/pics/reebaud.png 2018-10-12 17:16:22 +0000 differ
=== modified file 'data/campaigns/fri02.wmf/pics/hauke.png'
3Binary files data/campaigns/fri02.wmf/pics/hauke.png 2018-02-10 13:02:13 +0000 and data/campaigns/fri02.wmf/pics/hauke.png 2018-10-12 17:16:22 +0000 differ3Binary files data/campaigns/fri02.wmf/pics/hauke.png 2018-02-10 13:02:13 +0000 and data/campaigns/fri02.wmf/pics/hauke.png 2018-10-12 17:16:22 +0000 differ
=== modified file 'data/campaigns/fri02.wmf/pics/murilius.png'
4Binary files data/campaigns/fri02.wmf/pics/murilius.png 2018-02-10 13:02:13 +0000 and data/campaigns/fri02.wmf/pics/murilius.png 2018-10-12 17:16:22 +0000 differ4Binary files data/campaigns/fri02.wmf/pics/murilius.png 2018-02-10 13:02:13 +0000 and data/campaigns/fri02.wmf/pics/murilius.png 2018-10-12 17:16:22 +0000 differ
=== modified file 'data/campaigns/fri02.wmf/pics/reebaud.png'
5Binary files data/campaigns/fri02.wmf/pics/reebaud.png 2018-02-10 13:02:13 +0000 and data/campaigns/fri02.wmf/pics/reebaud.png 2018-10-12 17:16:22 +0000 differ5Binary files data/campaigns/fri02.wmf/pics/reebaud.png 2018-02-10 13:02:13 +0000 and data/campaigns/fri02.wmf/pics/reebaud.png 2018-10-12 17:16:22 +0000 differ
=== modified file 'data/txts/developers.json'
--- data/txts/developers.json 2018-10-01 10:41:32 +0000
+++ data/txts/developers.json 2018-10-12 17:16:22 +0000
@@ -114,7 +114,8 @@
114 "Evgeny Kapun",114 "Evgeny Kapun",
115 "ypopezios",115 "ypopezios",
116 "Toni Förster (stonerl)",116 "Toni Förster (stonerl)",
117 "Arty"117 "Arty",
118 "Benedikt Straub (Nordfriese)"
118 ]119 ]
119 }120 }
120 ]121 ]

Subscribers

People subscribed via source and target branches

to status/vote changes: