Yatzy

Merge lp:~seb128/yatzy/score-with-bonus into lp:yatzy

  1. score-with-bonus
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Merged
Merged at revision: 34
Proposed branch: lp:~seb128/yatzy/score-with-bonus
Merge into: lp:yatzy
Prerequisite: lp:~seb128/yatzy/new-column-layout
Diff against target: 11 lines (+1/-1)
1 file modified
main.qml (+1/-1)
To merge this branch: bzr merge lp:~seb128/yatzy/score-with-bonus
Reviewer Review Type Date Requested Status
Yatzy Development Team Pending
Review via email: mp+249972@code.launchpad.net

Commit message

count the bonus points in the score

Description of the change

count the bonus points in the score

note that the change is based on top of the new-layout-column changes to avoid merge conflicts

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
1=== modified file 'main.qml'
2--- main.qml 2015-02-17 10:20:38 +0000
3+++ main.qml 2015-02-17 10:20:38 +0000
4@@ -390,7 +390,7 @@
5 width: bonus_score_label.width
6 anchors.horizontalCenter: bonus_score_label.horizontalCenter
7 fontSize: "large"
8- text: ones_score_label.effective_score + twos_score_label.effective_score + threes_score_label.effective_score + fours_score_label.effective_score + fives_score_label.effective_score + sixes_score_label.effective_score + one_pair_score_label.effective_score + two_pair_score_label.effective_score + three_of_a_kind_score_label.effective_score + four_of_a_kind_score_label.effective_score + small_straight_score_label.effective_score + large_straight_score_label.effective_score + house_score_label.effective_score + yatzy_score_label.effective_score + chance_score_label.effective_score
9+ text: ones_score_label.effective_score + twos_score_label.effective_score + threes_score_label.effective_score + fours_score_label.effective_score + fives_score_label.effective_score + sixes_score_label.effective_score + one_pair_score_label.effective_score + two_pair_score_label.effective_score + three_of_a_kind_score_label.effective_score + four_of_a_kind_score_label.effective_score + small_straight_score_label.effective_score + large_straight_score_label.effective_score + house_score_label.effective_score + yatzy_score_label.effective_score + chance_score_label.effective_score + bonus_score_label.effective_score
10 }
11 }
12

Subscribers

People subscribed via source and target branches