The proposal to merge lp:~widelands-dev/widelands/texture_atlas into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/texture_atlas/+merge/243119
--
Your team Widelands Developers is subscribed to branch
Review: Approve
LGTM
--
https://code.launchpad.net/~widelands-dev/widelands/texture_atlas/+merge/243119
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/texture_atlas.
___
Mailing list: https://launchpad.net/~wideland
Review: Resubmit
Addressed all comments and merged trunk.
Diff comments:
> === modified file 'src/editor/editorinteractive.cc'
> --- src/editor/editorinteractive.cc 2014-11-23 14:34:38 +
> +++ src/editor/editorinteractive.cc 2014-11-28 07:21:07 +
> @@ -243,8 +243,6 @@
> frameti
I added diff comments on lines 1244 and 1467 for things to double-check.
Diff comments:
> === modified file 'src/editor/editorinteractive.cc'
> --- src/editor/editorinteractive.cc 2014-11-23 14:34:38 +
> +++ src/editor/editorinteractive.cc 2014-11-28 07:21:07 +
> @@ -243,8 +243,6 @@
>
I'd rather have a code review than having this in quickly. So take your time :).
--
https://code.launchpad.net/~widelands-dev/widelands/texture_atlas/+merge/243119
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/texture_atlas.
__
I haven't had time to look over all of the code yet, but I've tested it and it
seems to work fine. If you think that's sufficient, go ahead and merge.
Otherwise, I'll try to have a look tomorrow. Brain's not working today.
--
https://code.launchpad.net/~widelands-dev/widelands/texture_atlas/+mer
I just noticed that the compiler warnings come up on trunk as well, so they're
not caused by this particular branch.
--
https://code.launchpad.net/~widelands-dev/widelands/texture_atlas/+merge/243119
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/texture_atlas
Bugs for Tino's issues have been filed:
https://bugs.launchpad.net/widelands/+bug/1397301
https://bugs.launchpad.net/widelands/+bug/1397302
I am getting compiler warnings:
src/graphic/image_cache.cc:40:13: warning: declaration of ‘texture’ shadows a
member of 'this' [-Wshadow]
Texture* tex
Review: Resubmit
I added the algorithm include. It is needed for std::sort according to the
documentation and was missing in other files too.
The other points you mention are unlikely to be caused by this change, so I'd
rather not block on it. Could you verify that they are in trunk already an
Switching to fullscreen is now blazing fast, nice!
800x600 window -> 1920x1200
But:
- F11 does only produce black pngs, both in window and fullscreen mode
- The Debug overlay "Position" moves correctly to the down right edge in
fullscreen
- The gamspeed overlay and the chat don't move
--
https:/
Review: Needs Fixing
It does only compile with an additional include, see diff comment.
(Just trying to diff comment the first time ;) )
Diff comments:
> === modified file 'src/editor/editorinteractive.cc'
> --- src/editor/editorinteractive.cc 2014-11-23 14:34:38 +
> +++ src/editor/editori
SirVer has proposed merging lp:~widelands-dev/widelands/texture_atlas into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/texture_atlas/+merge/243119
Suggested commit message:
- Adds a TextureAt
12 matches
Mail list logo
