Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1618557-keycode into lp:widelands
Review: Approve LGTM - just made a variable const. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1618557-keycode/+merge/311870 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1618557-keycode. ___ 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/ai_seafaring_split into lp:widelands
Looks like you just shifted some functions around, so this can go in. Travis error is due to something in trunk. Regarding the CMakeLists.txt, it goes like this: wl_library(ai_warfare # new library SRCS# list of .cc/.h files in this library defaultai_warfare.cc defaultai_warfare.h ) wl_library(ai SRCS ai_help_structs.cc ai_help_structs.h ai_hints.cc ai_hints.h computer_player.cc computer_player.h defaultai.cc defaultai.h DEPENDS # this library depends on... ai_warfare # new dependency base_exceptions base_i18n base_log base_macros base_time_string economy logic scripting_lua_table ) This will make sense if you can shift some functions out of defaultai.h -- https://code.launchpad.net/~widelands-dev/widelands/ai_seafaring_split/+merge/311544 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_seafaring_split. ___ 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/bug-1618557-keycode into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1618557-keycode
into lp:widelands.
Commit message:
Replaced get_key_state with SDL_GetModState() to fix keyboard mappings. PAtch
by Steven De Herdt.
Fixed reset zoom with Ctrl+0 in editor.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1618557 in widelands: "Swapped keyboard keys not always recognized"
https://bugs.launchpad.net/widelands/+bug/1618557
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1618557-keycode/+merge/311870
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1618557-keycode into lp:widelands.
=== modified file 'src/editor/editorinteractive.cc'
--- src/editor/editorinteractive.cc 2016-11-20 11:13:03 +
+++ src/editor/editorinteractive.cc 2016-11-26 07:35:41 +
@@ -108,7 +108,7 @@
toolsizemenu_.open_window = [this] { new EditorToolsizeMenu(*this, toolsizemenu_); };
add_toolbar_button(
- "wui/editor/editor_menu_player_menu", "players", _("Players"), _, true);
+ "wui/editor/editor_menu_player_menu", "players", _("Players"), _, true);
playermenu_.open_window = [this] {
select_tool(tools_->set_starting_pos, EditorTool::First);
new EditorPlayerMenu(*this, playermenu_);
@@ -257,7 +257,7 @@
void EditorInteractive::exit() {
if (need_save_) {
- if (get_key_state(SDL_SCANCODE_LCTRL) || get_key_state(SDL_SCANCODE_RCTRL)) {
+ if (SDL_GetModState() & KMOD_CTRL) {
end_modal(UI::Panel::Returncodes::kBack);
} else {
UI::WLMessageBox mmb(this, _("Unsaved Map"),
@@ -369,8 +369,10 @@
handled = true;
break;
case SDLK_0:
- set_sel_radius_and_update_menu(9);
- handled = true;
+ if (!(code.mod & KMOD_CTRL)) {
+set_sel_radius_and_update_menu(9);
+handled = true;
+ }
break;
case SDLK_LSHIFT:
=== modified file 'src/editor/ui_menus/categorized_item_selection_menu.h'
--- src/editor/ui_menus/categorized_item_selection_menu.h 2016-10-06 14:32:33 +
+++ src/editor/ui_menus/categorized_item_selection_menu.h 2016-11-26 07:35:41 +
@@ -148,7 +148,7 @@
// TODO(unknown): This code is erroneous. It checks the current key state. What it
// needs is the key state at the time the mouse was clicked. See the
// usage comment for get_key_state.
- const bool multiselect = get_key_state(SDL_SCANCODE_LCTRL) | get_key_state(SDL_SCANCODE_RCTRL);
+ const bool multiselect = SDL_GetModState() & KMOD_CTRL;
if (!t && (!multiselect || tool_->get_nr_enabled() == 1))
checkboxes_[n]->set_state(true);
else {
=== modified file 'src/editor/ui_menus/tool_place_bob_options_menu.cc'
--- src/editor/ui_menus/tool_place_bob_options_menu.cc 2016-10-16 09:31:42 +
+++ src/editor/ui_menus/tool_place_bob_options_menu.cc 2016-11-26 07:35:41 +
@@ -106,7 +106,7 @@
// TODO(unknown): This code is erroneous. It checks the current key state. What it
// TODO(unknown): needs is the key state at the time the mouse was clicked. See the
// TODO(unknown): usage comment for get_key_state.
- const bool multiselect = get_key_state(SDL_SCANCODE_LCTRL) | get_key_state(SDL_SCANCODE_RCTRL);
+ const bool multiselect = SDL_GetModState() & KMOD_CTRL;
if (!t && (!multiselect || pit_.get_nr_enabled() == 1)) {
checkboxes_[n]->set_state(true);
return;
=== modified file 'src/ui_basic/window.cc'
--- src/ui_basic/window.cc 2016-10-25 08:11:31 +
+++ src/ui_basic/window.cc 2016-11-26 07:35:41 +
@@ -367,9 +367,7 @@
// TODO(unknown): This code is erroneous. It checks the current key state. What it
// needs is the key state at the time the mouse was clicked. See the
// usage comment for get_key_state.
- if (((get_key_state(SDL_SCANCODE_LCTRL) | get_key_state(SDL_SCANCODE_RCTRL)) &&
- btn == SDL_BUTTON_LEFT) ||
- btn == SDL_BUTTON_MIDDLE)
+ if ((SDL_GetModState() & KMOD_CTRL && btn == SDL_BUTTON_LEFT) || btn == SDL_BUTTON_MIDDLE)
is_minimal() ? restore() : minimize();
else if (btn == SDL_BUTTON_LEFT) {
dragging_ = true;
=== modified file 'src/wui/actionconfirm.cc'
--- src/wui/actionconfirm.cc 2016-08-04 15:49:05 +
+++ src/wui/actionconfirm.cc 2016-11-26 07:35:41 +
@@ -187,8 +187,7 @@
if (todestroy && building && iaplayer().can_act(building->owner().player_number()) &&
(building->get_playercaps() & Widelands::Building::PCap_Bulldoze)) {
- game.send_player_bulldoze(
- *todestroy, get_key_state(SDL_SCANCODE_LCTRL) << get_key_state(SDL_SCANCODE_RCTRL));
+ game.send_player_bulldoze(*todestroy, SDL_GetModState() & KMOD_CTRL);
}
die();
=== modified file 'src/wui/buildingwindow.cc'
--- src/wui/buildingwindow.cc 2016-10-24 14:04:00 +
+++ src/wui/buildingwindow.cc 2016-11-26 07:35:41 +
@@ -317,7 +317,7 @@
===
*/
void BuildingWindow::act_bulldoze() {
- if (get_key_state(SDL_SCANCODE_LCTRL) || get_key_state(SDL_SCANCODE_RCTRL)) {
+ if (SDL_GetModState() & KMOD_CTRL) {
if
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/mac_os_x_build_fixes into lp:widelands
Continuous integration builds have changed state: Travis build 1651. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/178804449. Appveyor build 1491. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mac_os_x_build_fixes-1491. -- https://code.launchpad.net/~widelands-dev/widelands/mac_os_x_build_fixes/+merge/311802 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mac_os_x_build_fixes. ___ 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/mac_os_x_build_fixes into lp:widelands
Review: Approve compile, test OK, compiles for me, was able to start a network game. Do we need other people to compile this on non-oSX? -- https://code.launchpad.net/~widelands-dev/widelands/mac_os_x_build_fixes/+merge/311802 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mac_os_x_build_fixes. ___ 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/mac_os_x_build_fixes into lp:widelands
Mhh, as I use MacPorts ant not brrw, I cannot validate this in any way. I could however verify a binaray build this way and compre it to my MacPorts based build. SirVerII: This will this be the base for the new developer builds I assume? So I will compile it this weekend and do some soma sanity tests, after the merge I should cchek the developer binary, OK Ah and I will test this one: http://www.widelands.org/~sirver/wl/tmp/widelands_64bit_build-19.dmg -- https://code.launchpad.net/~widelands-dev/widelands/mac_os_x_build_fixes/+merge/311802 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/mac_os_x_build_fixes 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/animation_scaling into lp:widelands
It seems like this broke Travis. Gun, are you looking into this? -- https://code.launchpad.net/~widelands-dev/widelands/animation_scaling/+merge/310718 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/animation_scaling. ___ 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] [Build #11255845] amd64 build of widelands 1:18-ppa0-bzr8187-201611250946~ubuntu14.04.1 in ubuntu trusty RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr8187-201611250946~ubuntu14.04.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 14 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/11255845/+files/buildlog_ubuntu-trusty-amd64.widelands_1%3A18-ppa0-bzr8187-201611250946~ubuntu14.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lcy01-18 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:18-ppa0-bzr8187-201611250946~ubuntu14.04.1 in ubuntu trusty RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/11255845 You are receiving this email because you created this version of this package. ___ 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] [Build #11255846] i386 build of widelands 1:18-ppa0-bzr8187-201611250946~ubuntu14.04.1 in ubuntu trusty RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr8187-201611250946~ubuntu14.04.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 14 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/11255846/+files/buildlog_ubuntu-trusty-i386.widelands_1%3A18-ppa0-bzr8187-201611250946~ubuntu14.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lcy01-16 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- i386 build of widelands 1:18-ppa0-bzr8187-201611250946~ubuntu14.04.1 in ubuntu trusty RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/11255846 You are receiving this email because you created this version of this package. ___ 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/mac_os_x_build_fixes into lp:widelands
SirVer has proposed merging lp:~widelands-dev/widelands/mac_os_x_build_fixes into lp:widelands. Commit message: Modernize how Mac OS X releases are done. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/mac_os_x_build_fixes/+merge/311802 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/mac_os_x_build_fixes 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/bug-free-workers into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-free-workers into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-free-workers/+merge/311661 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-free-workers. ___ 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/bug-free-workers into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-free-workers/+merge/311661 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-free-workers. ___ 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
