lp:~neon/kmines/master
- Get this branch:
- bzr branch lp:~neon/kmines/master
Branch merges
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at git://anongit.kde.org/kmines.
Last successful import was .
Recent revisions
- 1154. By Yichao Yu <email address hidden>
-
Fix accidental revealing of items when the game is restarted after lost from a middle click.
Summary:
When a flag is misplaced, a middle click could cause the game to lost.
Currently, if the user choose to restart the game in this case, there is a high chance
that a few pieces around the one middle clicked are revealed right after the game restarted.The reason is that when the user restart the game in such case,
it happens within `checkLost`/`onItemReveale d` which means that the
game might not be the same one anymore after `onItemRevealed` returns
and the loop handling all neighboring pieces are now operating on the now restarted game.The fix is to make sure the loop stops when the game is finished. Checking `m_gameOver` is
unreliable and won't work in this case since the restart of the game would have reset it.
Instead, the finished status is returned from all functions that trigger such a condition
and the information is propagated back to the caller to terminate the loop appropriately.
This also improved another unreliable use of `m_gameOver` that is currently harmless.Debugging was possible thanks to `rr`.
Reviewers: mlaurent, yurchor, #kde_games, aacid
Reviewed By: yurchor, aacid
Subscribers: aacid, kde-games-devel
Differential Revision: https:/
/phabricator. kde.org/ D27716 - 1147. By l10n daemon script <email address hidden>
-
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop" - 1145. By l10n daemon script <email address hidden>
-
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)