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.
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 Dev
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 subscrib
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/worke
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.
_
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
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_animation
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
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 #1526
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-152
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_work
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:~
12 matches
Mail list logo
