Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_ship_tweaks into lp:widelands
Look for Player::m_building_stats for where the building info is stored. -- https://code.launchpad.net/~widelands-dev/widelands/ai_ship_tweaks/+merge/280192 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_ship_tweaks. ___ 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-536409 into lp:widelands
When merging trunk here I got: Warning: criss-cross merge encountered. See bzr help criss-cross. Text conflict in src/ui_basic/spinbox.cc 1 conflicts encountered. Is it safe to proceed? -- https://code.launchpad.net/~widelands-dev/widelands/bug-536409/+merge/280352 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/editor_new_map. ___ 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/table_image_overlap into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/table_image_overlap into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/table_image_overlap/+merge/280402 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/table_image_overlap. ___ 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/missing_worker_animations into lp:widelands
Kaputtnik, will you push it into trunk? I could do it, but there are some text conflicts in: Text conflict in tribes/workers/atlanteans/forester/init.lua Text conflict in tribes/workers/barbarians/ranger/init.lua Text conflict in tribes/workers/empire/fisher/init.lua Text conflict in tribes/workers/empire/forester/init.lua Text conflict in tribes/workers/empire/vinefarmer/init.lua -- https://code.launchpad.net/~widelands-dev/widelands/missing_worker_animations/+merge/281365 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/missing_worker_animations. ___ 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/clang_warnings into lp:widelands
Review: Approve I compiled and tested. Nothing suspicious there... -- https://code.launchpad.net/~widelands-dev/widelands/clang_warnings/+merge/281383 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/clang_warnings. ___ 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-536409 into lp:widelands
Yes, I branched this off another branch rather than off trunk, so this error message can happen. The prerequitise branch has been merged already, so it's safe. -- https://code.launchpad.net/~widelands-dev/widelands/bug-536409/+merge/280352 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/editor_new_map. ___ 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/missing_worker_animations into lp:widelands
I think i didn't have the rights to merge with trunk... I look into the conflicts. Thanks :-) -- https://code.launchpad.net/~widelands-dev/widelands/missing_worker_animations/+merge/281365 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/missing_worker_animations. ___ 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/string-fixes into lp:widelands
Only SirVer and I have the necessary privileges on Transifex to push translations. So, the new translation templates will have to wait until I get back home. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/279646 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1526903 into lp:widelands
TiborB has proposed merging lp:~widelands-dev/widelands/bug-1526903 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1526514 in widelands: "player 2 in "" section [player_2] not found"
https://bugs.launchpad.net/widelands/+bug/1526514
Bug #1526903 in widelands: "Editor crashes when changing tribe"
https://bugs.launchpad.net/widelands/+bug/1526903
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1526903/+merge/281410
This is very simple change - prohibiting save of allowed_building_types in
editor (=creating particular file). Should not cause problems, but must be
tested
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1526903 into lp:widelands.
=== modified file 'src/map_io/map_saver.cc'
--- src/map_io/map_saver.cc 2015-11-11 09:53:54 +
+++ src/map_io/map_saver.cc 2015-12-29 22:26:03 +
@@ -139,18 +139,22 @@
{MapAllowedWorkerTypesPacket p; p.write(m_fs, m_egbase, *m_mos);}
log("took %ums\n ", timer.ms_since_last_query());
- // allowed building types
- iterate_players_existing_const(plnum, nr_players, m_egbase, player) {
- for (DescriptionIndex i = 0; i < m_egbase.tribes().nrbuildings(); ++i) {
- if (!player->is_building_type_allowed(i)) {
-log("Writing Allowed Building Types Data ... ");
-MapAllowedBuildingTypesPacket p;
-p .write(m_fs, m_egbase, *m_mos);
-log("took %ums\n ", timer.ms_since_last_query());
-goto end_find_a_forbidden_building_type_loop;
+// allowed building types
+// Not saving this when in editor - it causes issues when changing tribe
+// after next load in editor
+ if (is_a(Game, &m_egbase)) {
+ iterate_players_existing_const(plnum, nr_players, m_egbase, player) {
+ for (DescriptionIndex i = 0; i < m_egbase.tribes().nrbuildings(); ++i) {
+if (!player->is_building_type_allowed(i)) {
+ log("Writing Allowed Building Types Data ... ");
+ MapAllowedBuildingTypesPacket p;
+ p .write(m_fs, m_egbase, *m_mos);
+ log("took %ums\n ", timer.ms_since_last_query());
+ goto end_find_a_forbidden_building_type_loop;
+}
}
- }
- } end_find_a_forbidden_building_type_loop:;
+ } end_find_a_forbidden_building_type_loop:;
+ }
// !! NOTE
// This packet must be before any building or road packet. So do not
___
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-1526903 into lp:widelands
The diff looks bit complex, but really only thing that was added is:
if (is_a(Game, &m_egbase)) { }
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1526903/+merge/281410
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1526903 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/missing_worker_animations into lp:widelands
I am not sure if you can merge into trunk, but I can do it... Just let me know (f.e. post a comment here) -- https://code.launchpad.net/~widelands-dev/widelands/missing_worker_animations/+merge/281365 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/missing_worker_animations. ___ 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-536409 into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-536409 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-536409/+merge/280352 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/editor_new_map. ___ 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
