[Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/frisian-buildings into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/357056 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/frisian-buildings. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands
Review: Approve Looks good :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/357056 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/frisian-buildings. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands
Continuous integration builds have changed state: Travis build 4153. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/443117571. Appveyor build 3950. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_frisian_buildings-3950. -- https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/357056 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisian-buildings into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands
Benedikt Straub has proposed merging
lp:~widelands-dev/widelands/frisian-buildings into lp:widelands.
Commit message:
Improved graphics for the frisian sentinel
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1764606 in widelands: "Frisian building models are too dark"
https://bugs.launchpad.net/widelands/+bug/1764606
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/357056
Graphics-only change. The sentinel looks too similar to the outpost for my
liking, so I downgraded it a bit.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/frisian-buildings into lp:widelands.
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/idle_0.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/idle_0.png 2018-07-12 19:37:48 + and data/tribes/buildings/militarysites/frisians/sentinel/idle_0.png 2018-10-18 09:16:14 + differ
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/idle_0_pc.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/idle_0_pc.png 2018-07-12 19:37:48 + and data/tribes/buildings/militarysites/frisians/sentinel/idle_0_pc.png 2018-10-18 09:16:14 + differ
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/idle_1.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/idle_1.png 2018-07-12 19:37:48 + and data/tribes/buildings/militarysites/frisians/sentinel/idle_1.png 2018-10-18 09:16:14 + differ
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/idle_1_pc.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/idle_1_pc.png 2018-07-12 19:37:48 + and data/tribes/buildings/militarysites/frisians/sentinel/idle_1_pc.png 2018-10-18 09:16:14 + differ
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/idle_2.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/idle_2.png 2018-07-12 19:37:48 + and data/tribes/buildings/militarysites/frisians/sentinel/idle_2.png 2018-10-18 09:16:14 + differ
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/idle_2_pc.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/idle_2_pc.png 2018-07-12 19:37:48 + and data/tribes/buildings/militarysites/frisians/sentinel/idle_2_pc.png 2018-10-18 09:16:14 + differ
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/idle_3.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/idle_3.png 2018-07-12 19:37:48 + and data/tribes/buildings/militarysites/frisians/sentinel/idle_3.png 2018-10-18 09:16:14 + differ
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/idle_3_pc.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/idle_3_pc.png 2018-07-12 19:37:48 + and data/tribes/buildings/militarysites/frisians/sentinel/idle_3_pc.png 2018-10-18 09:16:14 + differ
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/init.lua'
--- data/tribes/buildings/militarysites/frisians/sentinel/init.lua 2018-07-12 19:37:48 +
+++ data/tribes/buildings/militarysites/frisians/sentinel/init.lua 2018-10-18 09:16:14 +
@@ -23,12 +23,12 @@
animations = {
idle = {
pictures = path.list_files (dirname .. "idle_?.png"),
- hotspot = {41, 53},
+ hotspot = {33, 53},
fps = 10,
},
unoccupied = {
pictures = path.list_files (dirname .. "unoccupied_?.png"),
- hotspot = {41, 53},
+ hotspot = {33, 53},
},
},
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/menu.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/menu.png 2018-07-15 11:28:49 + and data/tribes/buildings/militarysites/frisians/sentinel/menu.png 2018-10-18 09:16:14 + differ
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/unoccupied_0.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/unoccupied_0.png 2018-07-12 19:37:48 + and data/tribes/buildings/militarysites/frisians/sentinel/unoccupied_0.png 2018-10-18 09:16:14 + differ
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/unoccupied_0_pc.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/unoccupied_0_pc.png 2018-07-12 19:37:48 + and data/tribes/buildings/militarysites/frisians/sentinel/unoccupied_0_pc.png 2018-10-18 09:16:14 + differ
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/frisian-buildings into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/354156 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisian-buildings into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands
Another try. If this one isn´t good enough, then I´ll redesign the hq completely, similar to the photo. -- https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/354156 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisian-buildings into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands
That solves the problem, but it's less aesthetically pleasing. How about a small steeple growing out of the center of the roof? Or a design like this: https://ozoutback.com.au/the_Netherlands/cfryslan/slides/2005070105.jpg -- https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/354156 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisian-buildings into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands
Continuous integration builds have changed state: Travis build 3873. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/423431595. Appveyor build 3671. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_frisian_buildings-3671. -- https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/354156 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisian-buildings into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands
Putting it in front wouldn´t look good unless I redesigned the rest of the building as well. I shifted the steeple as far east as aesthetically possible, does this fix the issue? -- https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/354156 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisian-buildings into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands
Looking good :) Comparison screenshot: https://launchpadlibrarian.net/386353592/frisians_comparison.png The only thing that's a bit weird there is that the text for the woodcutter is on top of the steeple for the headquarters (I used https://code.launchpad.net/~widelands-dev/widelands/bug-1480927-building-texts/+merge/353728 as a code base for that; in trunk the text will disappear behind the steeple). I see no easy way around this problem - maybe try putting the steeple in front of the building to see how that looks? -- https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/354156 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisian-buildings into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands
Benedikt Straub has proposed merging lp:~widelands-dev/widelands/frisian-buildings into lp:widelands. Commit message: New graphics for the frisian tower, fortress, port, headquarters, and reindeer farm Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1764606 in widelands: "Frisian building models are too dark" https://bugs.launchpad.net/widelands/+bug/1764606 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/354156 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisian-buildings into lp:widelands. === modified file 'data/tribes/buildings/militarysites/frisians/fortress/idle_00.png' Binary files data/tribes/buildings/militarysites/frisians/fortress/idle_00.png 2018-07-18 19:41:40 + and data/tribes/buildings/militarysites/frisians/fortress/idle_00.png 2018-09-01 13:42:23 + differ === modified file 'data/tribes/buildings/militarysites/frisians/fortress/idle_00_pc.png' Binary files data/tribes/buildings/militarysites/frisians/fortress/idle_00_pc.png 2018-07-18 19:41:40 + and data/tribes/buildings/militarysites/frisians/fortress/idle_00_pc.png 2018-09-01 13:42:23 + differ === modified file 'data/tribes/buildings/militarysites/frisians/fortress/idle_01.png' Binary files data/tribes/buildings/militarysites/frisians/fortress/idle_01.png 2018-07-18 19:41:40 + and data/tribes/buildings/militarysites/frisians/fortress/idle_01.png 2018-09-01 13:42:23 + differ === modified file 'data/tribes/buildings/militarysites/frisians/fortress/idle_01_pc.png' Binary files data/tribes/buildings/militarysites/frisians/fortress/idle_01_pc.png 2018-07-18 19:41:40 + and data/tribes/buildings/militarysites/frisians/fortress/idle_01_pc.png 2018-09-01 13:42:23 + differ === modified file 'data/tribes/buildings/militarysites/frisians/fortress/idle_02.png' Binary files data/tribes/buildings/militarysites/frisians/fortress/idle_02.png 2018-07-18 19:41:40 + and data/tribes/buildings/militarysites/frisians/fortress/idle_02.png 2018-09-01 13:42:23 + differ === modified file 'data/tribes/buildings/militarysites/frisians/fortress/idle_02_pc.png' Binary files data/tribes/buildings/militarysites/frisians/fortress/idle_02_pc.png 2018-07-18 19:41:40 + and data/tribes/buildings/militarysites/frisians/fortress/idle_02_pc.png 2018-09-01 13:42:23 + differ === modified file 'data/tribes/buildings/militarysites/frisians/fortress/idle_03.png' Binary files data/tribes/buildings/militarysites/frisians/fortress/idle_03.png 2018-07-18 19:41:40 + and data/tribes/buildings/militarysites/frisians/fortress/idle_03.png 2018-09-01 13:42:23 + differ === modified file 'data/tribes/buildings/militarysites/frisians/fortress/idle_03_pc.png' Binary files data/tribes/buildings/militarysites/frisians/fortress/idle_03_pc.png 2018-07-18 19:41:40 + and data/tribes/buildings/militarysites/frisians/fortress/idle_03_pc.png 2018-09-01 13:42:23 + differ === modified file 'data/tribes/buildings/militarysites/frisians/fortress/idle_04.png' Binary files data/tribes/buildings/militarysites/frisians/fortress/idle_04.png 2018-07-18 19:41:40 + and data/tribes/buildings/militarysites/frisians/fortress/idle_04.png 2018-09-01 13:42:23 + differ === modified file 'data/tribes/buildings/militarysites/frisians/fortress/idle_04_pc.png' Binary files data/tribes/buildings/militarysites/frisians/fortress/idle_04_pc.png 2018-07-18 19:41:40 + and data/tribes/buildings/militarysites/frisians/fortress/idle_04_pc.png 2018-09-01 13:42:23 + differ === modified file 'data/tribes/buildings/militarysites/frisians/fortress/idle_05.png' Binary files data/tribes/buildings/militarysites/frisians/fortress/idle_05.png 2018-07-18 19:41:40 + and data/tribes/buildings/militarysites/frisians/fortress/idle_05.png 2018-09-01 13:42:23 + differ === modified file 'data/tribes/buildings/militarysites/frisians/fortress/idle_05_pc.png' Binary files data/tribes/buildings/militarysites/frisians/fortress/idle_05_pc.png 2018-07-18 19:41:40 + and data/tribes/buildings/militarysites/frisians/fortress/idle_05_pc.png 2018-09-01 13:42:23 + differ === modified file 'data/tribes/buildings/militarysites/frisians/fortress/idle_06.png' Binary files data/tribes/buildings/militarysites/frisians/fortress/idle_06.png 2018-07-18 19:41:40 + and data/tribes/buildings/militarysites/frisians/fortress/idle_06.png 2018-09-01 13:42:23 + differ === modified file 'data/tribes/buildings/militarysites/frisians/fortress/idle_06_pc.png' Binary files data/tribes/buildings/militarysites/frisians/fortress/idle_06_pc.png 2018-07-18 19:41:40 + and data/tribes/buildings/militarysites/frisians/fortress/idle_06_pc.png 2018-09-01 13:42:23 + differ === modified file 'data/tribes/buildings/militarysites/frisians/fortress/idle_07.png' Binary files data/tribes/buildings/militarysites/frisians/fortress/i
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands
OK, I´ll change the tower and port as soon as I have time for modelling again. That´s not until late in August though. In case I forget, please ping me if I haven´t proposed a branch by September. -- https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/349856 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/frisian-buildings. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/frisian-buildings into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/349856 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/frisian-buildings. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands
Continuous integration builds have changed state: Travis build 3709. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/406860500. Appveyor build 3508. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_frisian_buildings-3508. -- https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/349856 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/frisian-buildings. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands
Review: Approve You have done a beautiful job on those buildings! :) There are 2 buildings that I'd still like to see changed in a follow-up branch though: The Port and the Tower. Their tower heights work really well as works of art, but they are obscuring the fields behind them, so it becomes a UI issue. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/349856 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/frisian-buildings. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands
Continuous integration builds have changed state: Travis build 3687. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/405738537. Appveyor build 3486. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_frisian_buildings-3486. -- https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/349856 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/frisian-buildings. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands
Review: Approve review, compile, test Did a little testplay (and got confused by the Frisian economy once again). But the building are all fine with me. I will keep this open for other comments and tests for another week but the will trigger a merge. -- https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/349856 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/frisian-buildings. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands
Checked all of the buildings found no obvious problems, there actually some more variations, will try to do some testgame today then. -- https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/349856 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisian-buildings into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands
Check this out now and will check the imgaes for obvious things. Checked the lua changes, only hotspots, channges in animations. You even added different animations for gold an iron! Thanks for your work! -- https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/349856 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisian-buildings into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
