Merge lp://staging/~rpadovani/falldown/achievements into lp://staging/falldown
Proposed by
Riccardo Padovani
| Status: | Merged |
|---|---|
| Merged at revision: | 121 |
| Proposed branch: | lp://staging/~rpadovani/falldown/achievements |
| Merge into: | lp://staging/falldown |
| Diff against target: |
1067 lines (+628/-42) (has conflicts) 20 files modified
app/components/Achievement.qml (+81/-0) app/components/Ball.qml (+1/-1) app/components/Floor.qml (+1/-1) app/components/Hole.qml (+5/-1) app/components/PowerUp.qml (+13/-1) app/components/Score.qml (+94/-0) app/components/Title.qml (+1/-1) app/components/TopMenu.qml (+1/-1) app/falldown.qrc (+17/-2) app/js/game.js (+21/-1) app/main.qml (+212/-6) app/scenes/AboutScene.qml (+1/-3) app/scenes/AchievementsScene.qml (+114/-0) app/scenes/EndScene.qml (+1/-3) app/scenes/GameScene.qml (+35/-1) app/scenes/MainScene.qml (+12/-12) app/scenes/SettingsScene.qml (+1/-3) app/themes/colors.js (+8/-0) falldown.pro (+5/-5) manifest.json.in (+4/-0) Text conflict in app/main.qml Text conflict in manifest.json.in |
| To merge this branch: | bzr merge lp://staging/~rpadovani/falldown/achievements |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Riccardo Padovani | Pending | ||
|
Review via email:
|
|||
Description of the change
First implementation of achievements
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
