ws
83ead22c35
cleaner implem. for reading ties
2014-06-24 14:45:50 +02:00
ws
789e1418e9
update merge
2014-06-24 13:48:29 +02:00
ws
2225011fc5
Merge branch 'master' of github.com:musescore/MuseScore
2014-06-24 13:45:08 +02:00
Werner Schweer
c46d24ede5
Merge pull request #912 from vgstef/ContinuousPanel
...
Add continuous panel feature for continous view mode
2014-06-24 13:44:57 +02:00
ws
87ad7b4f25
SpannerMap key fix
2014-06-24 13:38:05 +02:00
ws
247a055c91
fix #26741
2014-06-24 13:18:37 +02:00
ws
1f9d7ebf0c
change text layout, use boundingRect() instead of tightBoundingRect()
2014-06-24 12:49:03 +02:00
Werner Schweer
78c113c295
Merge pull request #1004 from mgavioli/Header_footer_vert_pos
...
Fix regression on header/footer vertical position.
2014-06-24 12:37:40 +02:00
Maurizio M. Gavioli
d5b96dda59
Fix regression on header/footer vertical position.
...
The Y offset parameter in header/footer textual styles no longer has any effect. As a consequence, header is always positioned at page top margin and footer at page bottom margin.
Fixed in Page::drawHeaderFooter() function.
2014-06-24 12:15:28 +02:00
ws
ab1ecd740c
fix #25923
2014-06-24 09:29:30 +02:00
lasconic
a818188986
fix #26591 : Wrong clef / staff lines on MusicXML import
2014-06-23 23:14:19 +02:00
lasconic
729d822179
fix: drum note entry using shortcut doesn't honor voice setting from drumset
2014-06-23 22:49:45 +02:00
lasconic
2920b2bf97
fix crash when loading 1.3 files with unknown style tags
2014-06-23 22:26:13 +02:00
Nicolas Froment
685583ac3a
Merge pull request #990 from Jojo-Schmitz/check-for-merge-conflicts
...
check for merge conflicts
2014-06-23 19:41:49 +02:00
Nicolas Froment
5f68171112
Merge pull request #992 from MarcSabatella/26516-repitch
...
fix #26516 : crash on repitch
2014-06-23 19:41:08 +02:00
Joachim Schmitz
bb41ea00ad
check for merge conflicts
...
coloring doesn't seem to work on Travis (it doesn't harm either), but
should on a plain Linux or Mac shell prompt
2014-06-23 19:18:18 +02:00
Nicolas Froment
c0de4b3465
Merge pull request #1002 from lasconic/testonmac
...
Ability to compile and run tests on Mac OSX
2014-06-23 16:38:47 +02:00
lasconic
ed26bdca3e
Ability to compile and run tests on Mac OSX
2014-06-23 16:07:33 +02:00
Marc Sabatella
be38679c7b
add comments
2014-06-23 07:55:24 -06:00
Nicolas Froment
aadd86ef5f
Merge pull request #998 from MarcSabatella/26521-tuplet-cursor
...
fix #26521 tuplet cursor
2014-06-23 15:03:24 +02:00
Marc Sabatella
c6cf052a79
fix #26521 : move cursor after tuplet creation
...
move cursor after tuplet dialog too
2014-06-23 06:59:26 -06:00
Nicolas Froment
cd9dfe02be
Merge pull request #994 from mgavioli/Remove_merge_conflict_leftover_from_clef_cpp
...
Remove merge conflict left-over from clef.cpp
2014-06-23 10:37:44 +02:00
Nicolas Froment
da3412314c
Merge pull request #995 from mgavioli/Incomplete_relayout_on_staff_group_change
...
Incomplete re-layout when the group of a staff is changed.
2014-06-23 10:36:58 +02:00
Nicolas Froment
0acc08d3cb
Merge pull request #999 from MarkRS-UK/#25598TextSpacingIncorrectOnLoad
...
Fix #25598 - Text spacing incorrect on load
2014-06-23 10:27:24 +02:00
Nicolas Froment
cb22c68ae6
Merge pull request #1000 from Jojo-Schmitz/warnings
...
fix compiler warnings reg. unused parameters
2014-06-23 10:11:59 +02:00
Joachim Schmitz
eaf73abf29
fix compiler warnings reg. unused parameters
2014-06-23 09:36:31 +02:00
ws
7fb713bbf4
fix #26691
2014-06-23 08:46:53 +02:00
Mark Stanton
5a3a0dd7eb
Fix for issue #25598 - Text spacing incorrect on load
2014-06-22 21:56:15 +01:00
Marc Sabatella
738afd110b
fix ties & rests on MIDI input
2014-06-21 20:00:03 -06:00
Marc Sabatella
68e15a580f
break ties into selected note
2014-06-21 19:59:00 -06:00
Nicolas Froment
58d9186295
Merge pull request #991 from lasconic/fix-25670
...
fix #25670 : Stem direction on beamed notes not imported correctly in 1.3...
2014-06-21 15:21:37 +02:00
lasconic
d9f6bcf41f
allow all fermatas to be added to rests
2014-06-21 08:08:39 +02:00
Maurizio M. Gavioli
912bca31c3
Incomplete re-layout when the group of a staff is changed.
...
If a staff type ids changed from one group to another (like standard <=> TAB), lines or frtes and strings for notes are not recalculated.
Fixed by adding a call to `Score::cmdUpdateNotes()` to `ChangeStaffType::redo()` and `::undo()` when the group of the staff type changes.
2014-06-21 00:29:18 +02:00
Maurizio M. Gavioli
1794d8a894
Remove merge conflict left-over from clef.cpp:
...
it turned out if was simply a matter of removing the code 'commented out' with `#if 0` -- `#else`.
2014-06-20 23:48:33 +02:00
ws
b4066a7976
stronger typing for key
2014-06-20 17:07:22 +02:00
ws
deca042a7a
fix #26551
2014-06-20 10:18:27 +02:00
Marc Sabatella
e7146ba2e6
fix ties with linked staves/parts
2014-06-19 14:07:25 -06:00
Marc Sabatella
0af9e9cfa3
break ties into multi-note chords
2014-06-19 13:14:46 -06:00
Marc Sabatella
2b803a7cf8
fix #24482 : ties broken on repitch
2014-06-19 12:45:43 -06:00
Marc Sabatella
6c003995d4
fix #26516 : crash on repitch
2014-06-19 09:27:38 -06:00
ws
7e4c70a50a
fix #19332
2014-06-19 15:27:44 +02:00
ws
2c43586a66
fix #23496
2014-06-19 14:13:05 +02:00
ws
ca737076a1
fix #22471
2014-06-19 12:54:13 +02:00
ws
a9e44cb747
fix #23953
2014-06-19 12:06:00 +02:00
ws
8aede97585
fix #24414
2014-06-19 11:34:28 +02:00
ws
5fc08d094b
update Volta
2014-06-19 11:34:28 +02:00
lasconic
9fd56d7e56
MusicXML import: no arpeggio on rests
2014-06-19 09:30:47 +02:00
lasconic
77010d4bdb
fix #25670 : Stem direction on beamed notes not imported correctly in 1.3 score. Also, changing stem direction of first note of beam while entering is not ignored when entering more notes in the beam
2014-06-19 08:54:55 +02:00
Nicolas Froment
24a6b12f10
Merge pull request #987 from lasconic/fix-range-select
...
fix selection range when on staff > 1, when reverse selection
2014-06-18 16:59:24 +02:00
ws
efa3d7557e
fix #25580
2014-06-18 12:25:56 +02:00
