[Widelands-dev] [Merge] lp:~widelands-dev/widelands/toolbar-dropdown-menus into lp:widelands
Continuous integration builds have changed state: Travis build 5288. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/564618531. Appveyor build 5063. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_toolbar_dropdown_menus-5063. -- https://code.launchpad.net/~widelands-dev/widelands/toolbar-dropdown-menus/+merge/368230 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/toolbar-dropdown-scripting-review-only. ___ 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/toolbar-dropdown-menus into lp:widelands
Hmm, PAUSE as Menu daas not work for me (single Player Network game) -- https://code.launchpad.net/~widelands-dev/widelands/toolbar-dropdown-menus/+merge/368230 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/toolbar-dropdown-scripting-review-only. ___ 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/gcc9 into lp:widelands
Continuous integration builds have changed state: Travis build 5286. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/564607195. Appveyor build 5061. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_gcc9-5061. -- https://code.launchpad.net/~widelands-dev/widelands/gcc9/+merge/370692 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gcc9 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-website/pybb_attachments into lp:widelands-website
Currently there is no restriction on file types. The problem is that a file may not contain what the extension says it should be. Everyone can rename 'image.js' into 'image.png'... A list of allowed extension do not suffer. I'll try to implement some checks for validating a files type and probably an 'allowed extension list'. What about restricting uploads to users who have written x posts prior? From my side this can be implemented. -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/+merge/370342 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/pybb_attachments into lp:widelands-website. ___ 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/refactor_gamehost into lp:widelands
Continuous integration builds have changed state: Travis build 5285. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/564564637. Appveyor build 5060. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_refactor_gamehost-5060. -- https://code.launchpad.net/~widelands-dev/widelands/refactor_gamehost/+merge/370320 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/refactor_gamehost 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/toolbar-dropdown-menus into lp:widelands
I always assumed all the windows in the editor are exclsuive. But we can open all of them a the same time. Well this works but just confused me. I assumed the different windows could affect each other in a bad way, bt was not able to produce any of this. I woill check out again and give int another try. -- https://code.launchpad.net/~widelands-dev/widelands/toolbar-dropdown-menus/+merge/368230 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/toolbar-dropdown-scripting-review-only. ___ 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-website/sitemap_https into lp:widelands-website
This is online now: https://www.widelands.org/sitemap.xml/ -- https://code.launchpad.net/~widelands-dev/widelands-website/sitemap_https/+merge/370398 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ 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-website/sitemap_https into lp:widelands-website
The proposal to merge lp:~widelands-dev/widelands-website/sitemap_https into lp:widelands-website has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/sitemap_https/+merge/370398 -- Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ 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/gcc9 into lp:widelands
I've pushed the appveyor changes to a github branch: https://github.com/widelands/widelands/commit/1af305097f174a9a38e2710f3f96ed26d4f39e55 Sorry, I am not able to use bzr/launchpad on my new laptop anymore. -- https://code.launchpad.net/~widelands-dev/widelands/gcc9/+merge/370692 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gcc9 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/gcc9 into lp:widelands
Probably - I haven't looked into that yet. -- https://code.launchpad.net/~widelands-dev/widelands/gcc9/+merge/370692 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gcc9 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/toolbar-dropdown-menus into lp:widelands
I have fixed the map keyboard navigation by no longer opening the dropdowns' lists with the Up/Down keys. I don't think this is being used anyway. I have played tutorial 2 on this branch and then loaded all the automatically generated saves without any problems. Issues to still look into: - Opening the ship statistics -> heap-use-after-free > Not nice, you open the tool popup toheeter with the tool-size window. I still don't understand this comment -- https://code.launchpad.net/~widelands-dev/widelands/toolbar-dropdown-menus/+merge/368230 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/toolbar-dropdown-scripting-review-only. ___ 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/gcc9 into lp:widelands
Didn't we need to adapt the travis/appveyor configuration? I am unfamiliar with those configuration, so i didn't proposed the merge... -- https://code.launchpad.net/~widelands-dev/widelands/gcc9/+merge/370692 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gcc9 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/gcc9 into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/gcc9 into
lp:widelands.
Commit message:
Patch for GCC9.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1831359 in widelands: "Implement support for GCC 9"
https://bugs.launchpad.net/widelands/+bug/1831359
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/gcc9/+merge/370692
Tested by kaputtnik
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/gcc9 into lp:widelands.
=== modified file 'src/graphic/gl/fields_to_draw.h'
--- src/graphic/gl/fields_to_draw.h 2019-05-29 15:43:40 +
+++ src/graphic/gl/fields_to_draw.h 2019-07-28 11:07:18 +
@@ -100,15 +100,10 @@
// coordinates in the map. Returns INVALID_INDEX if this field is not in the
// fields_to_draw.
inline int calculate_index(int fx, int fy) const {
- uint16_t xidx = fx - min_fx_;
- if (xidx >= w_) {
- return kInvalidIndex;
- }
- uint16_t yidx = fy - min_fy_;
- if (yidx >= h_) {
- return kInvalidIndex;
- }
- return yidx * w_ + xidx;
+ if (fx < min_fx_ || fx > max_fx_ || fy < min_fy_ || fy > max_fy_) {
+ return kInvalidIndex;
+ }
+ return (fy - min_fy_) * w_ + (fx - min_fx_);
}
private:
___
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
