Maurizio M. Gavioli
15e2ad8fe5
Merge pull request #23 from mgavioli/figured_bass_fix
...
Improve sync of Figured Bass style and text style
2012-07-23 15:18:06 -07:00
Werner Schweer
6c8c240b2f
Merge commit '48907ea3a1e8dda14e617b440d0c071325004f5d'
...
Conflicts:
libmscore/CMakeLists.txt
libmscore/accidental.h
libmscore/arpeggio.h
libmscore/articulation.cpp
libmscore/articulation.h
libmscore/barline.h
libmscore/beam.cpp
libmscore/beam.h
libmscore/bend.h
libmscore/box.cpp
libmscore/box.h
libmscore/bracket.h
libmscore/breath.h
libmscore/bsymbol.h
libmscore/chord.cpp
libmscore/chord.h
libmscore/chordline.h
libmscore/chordrest.cpp
libmscore/chordrest.h
libmscore/clef.h
libmscore/cmd.cpp
libmscore/dsp.cpp
libmscore/duration.h
libmscore/durationtype.cpp
libmscore/dynamic.cpp
libmscore/dynamic.h
libmscore/edit.cpp
libmscore/element.cpp
libmscore/element.h
libmscore/excerpt.cpp
libmscore/figuredbass.h
libmscore/fingering.h
libmscore/fraction.h
libmscore/fret.h
libmscore/glissando.h
libmscore/hairpin.h
libmscore/harmony.h
libmscore/hook.h
libmscore/icon.h
libmscore/image.cpp
libmscore/image.h
libmscore/instrchange.h
libmscore/keysig.h
libmscore/lasso.h
libmscore/layout.cpp
libmscore/layoutbreak.h
libmscore/line.cpp
libmscore/line.h
libmscore/lyrics.h
libmscore/measure.cpp
libmscore/measure.h
libmscore/measurebase.h
libmscore/mscore.cpp
libmscore/mscore.h
libmscore/note.cpp
libmscore/note.h
libmscore/notedot.h
libmscore/ossia.h
libmscore/ottava.h
libmscore/page.cpp
libmscore/page.h
libmscore/part.cpp
libmscore/part.h
libmscore/pedal.h
libmscore/range.cpp
libmscore/range.h
libmscore/rehearsalmark.h
libmscore/repeat.h
libmscore/repeatlist.cpp
libmscore/repeatlist.h
libmscore/rest.h
libmscore/score.cpp
libmscore/score.h
libmscore/scorefile.cpp
libmscore/segment.h
libmscore/segmentlist.cpp
libmscore/select.cpp
libmscore/sequencer.h
libmscore/shadownote.h
libmscore/simpletext.cpp
libmscore/simpletext.h
libmscore/slur.cpp
libmscore/slur.h
libmscore/spacer.h
libmscore/spanner.h
libmscore/staff.cpp
libmscore/staff.h
libmscore/stafftext.h
libmscore/stafftype.cpp
libmscore/stem.cpp
libmscore/stem.h
libmscore/style.cpp
libmscore/style.h
libmscore/style_p.h
libmscore/symbol.h
libmscore/system.h
libmscore/tempotext.h
libmscore/text.cpp
libmscore/text.h
libmscore/textframe.cpp
libmscore/textframe.h
libmscore/textline.cpp
libmscore/textline.h
libmscore/tiemap.h
libmscore/timesig.cpp
libmscore/timesig.h
libmscore/tremolo.h
libmscore/tremolobar.h
libmscore/trill.h
libmscore/tuplet.cpp
libmscore/tuplet.h
libmscore/undo.cpp
libmscore/undo.h
libmscore/utils.cpp
libmscore/volta.cpp
libmscore/volta.h
libmscore/xml.cpp
2012-07-22 18:05:44 +02:00
Werner Schweer
96c9f2f435
extend admin script
2012-07-22 17:57:55 +02:00
Werner Schweer
88e6e99aa9
allow unstyled dynamics
2012-07-22 17:11:36 +02:00
Maurizio Gavioli
4de3388cec
Improve synch of Figured Bass style and text style
2012-07-21 18:10:31 +02:00
lasconic
a8835bed62
fix #17339 : MacOSX, startup dialog should not appear if score double clicked in Finder
2012-07-21 16:27:31 +02:00
lasconic
13ded89ad1
fix #17444 : Repeat measure sign affects all staves
2012-07-21 12:53:18 +02:00
Werner Schweer
3432cdcc5f
allow for text frames without border
2012-07-20 22:14:00 +02:00
Werner Schweer
b8326e2fb2
Merge branch 'master' of github.com:musescore/MuseScore
2012-07-20 21:47:09 +02:00
Werner Schweer
f6947290d4
add alpha channel to color selector; add background color to textframe
2012-07-20 21:46:31 +02:00
lasconic
d6b74bf7a4
align Makefile.osx with linux one
2012-07-20 18:37:53 +02:00
lasconic
b0169f7638
align Makefile.mingw with linux one
2012-07-20 18:32:35 +02:00
Werner Schweer
65afd97a33
Merge branch 'master' of github.com:musescore/MuseScore
2012-07-20 18:08:17 +02:00
Werner Schweer
030c8683cf
dont crash on bad values to DurationType
2012-07-20 18:07:19 +02:00
Werner Schweer
271c363f69
remove fration.h from moc processing
2012-07-20 18:06:47 +02:00
Werner Schweer
962432aa4a
more robust behaviour when importing 1.2 files
2012-07-20 16:29:24 +02:00
Werner Schweer
01e36f1f95
extend debugger: show more text flags
2012-07-20 16:28:04 +02:00
lasconic
b5f083f755
more capitals
2012-07-20 16:27:35 +02:00
Werner Schweer
a73ccc3f8e
fix doxygen build; add doxygen configuration for library only
2012-07-20 14:05:00 +02:00
Guifré
e0a5e1df8b
Update mscore/timesigwizard.ui
2012-07-20 12:07:34 +03:00
Guifré
d11a5724a3
Modification of the time signature input in the startup wizard.
...
Now you can only input the expected denominators (1, 2, 4...).
Manually imputting others is impossible.
My programming knowledge is very limited, but I guess that could work... If not, sorry.
PS.1: It's the first time I modyfy something in GitHub.
PS.2: I don't know how to test the changes.
Following: http://musescore.org/en/node/7315
2012-07-20 11:57:07 +03:00
lasconic
ccb12bcf83
fix crash when entering rest at the end of the score
2012-07-20 10:04:51 +02:00
Nicolas Froment
8bb49e10ef
Merge pull request #21 from mgavioli/img_link_fix
...
One new member not initialized in Image copy contructor
2012-07-19 23:07:35 -07:00
Maurizio Gavioli
ff5f003e65
One new member not initialized in Image copy contructor
2012-07-20 01:25:12 +02:00
lasconic
8514c09f33
Merge remote-tracking branch 'upstream/master'
2012-07-19 23:11:55 +02:00
lasconic
ed9fec0f24
fix capitals
2012-07-19 23:11:10 +02:00
Werner Schweer
641d8f4259
remove light theme
2012-07-19 16:47:23 +02:00
Werner Schweer
6989349d7d
Merge branch 'master' of github.com:musescore/MuseScore
2012-07-19 16:31:03 +02:00
Werner Schweer
fdb400cfae
fix crash on importing corrupted 1.2 file
2012-07-19 16:30:31 +02:00
lasconic
849035a316
Merge remote-tracking branch 'upstream/master'
2012-07-19 16:29:33 +02:00
lasconic
a321f0a3de
change tempo... to tempo marking
2012-07-19 16:29:00 +02:00
Werner Schweer
0a60f63d5f
fix actions regression
2012-07-19 16:28:28 +02:00
Werner Schweer
ea22e180a5
Merge branch 'master' of github.com:musescore/MuseScore
2012-07-19 16:13:28 +02:00
Werner Schweer
add7f7f82b
cleanup actions
2012-07-19 16:13:07 +02:00
lasconic
587c8d1468
fix menu, shortcut description was used instead of text
2012-07-19 13:13:51 +02:00
Werner Schweer
ab6becec54
set default icon for Shortcut to 'invalid'
2012-07-19 12:32:12 +02:00
Werner Schweer
207b5a5990
Merge branch 'master' of github.com:musescore/MuseScore
2012-07-19 11:46:11 +02:00
Werner Schweer
d2acc82fc5
fix navigator & page settings
2012-07-19 11:45:43 +02:00
guifre2
d0207f4695
Changes according to issue: http://musescore.org/en/node/7315
...
This changes the setup wizard so that you now can't put a time signature denominator other that 1, 2, 4, 8, 16 or 32. Now it's impossible to type other values manually.
My programming knowledge is very limited, but I guess that could work... If not, sorry.
2012-07-19 12:37:31 +03:00
lasconic
389c7e3dd5
add more config.h
2012-07-19 11:09:46 +02:00
Werner Schweer
875804fae1
paint stems with RoundCap
2012-07-19 11:08:20 +02:00
Werner Schweer
b5ae730137
Merge pull request #14 from mgavioli/img_link
...
Image external path written in score file (possibly relative to score) on saving and given precedence over ImageStore data on loading.
2012-07-19 01:39:16 -07:00
Werner Schweer
ea88df2666
Merge pull request #16 from mgavioli/plugin_cursor
...
Plugin - Cursor: some fixes to rewind(), next(), nextMeasure() methods
2012-07-18 11:31:21 -07:00
Maurizio M. Gavioli
e19f1c2af0
Plugin - Cursor: some fixes to rewind(), next(), nextMeasure() methods
2012-07-18 17:34:34 +02:00
Werner Schweer
dc2f32796c
Merge pull request #15 from Jojo-Schmitz/master
...
some formatting cleanup
2012-07-18 07:13:54 -07:00
Joachim Schmitz
78f621f5ff
formatting changes
2012-07-18 16:09:31 +02:00
Werner Schweer
76e22b7ec7
polishing the plugin subsystem
2012-07-18 14:54:44 +02:00
Maurizio M. Gavioli
4dbe9be2f5
Merge branch 'master' of https://github.com/musescore/MuseScore
2012-07-18 11:44:12 +02:00
Maurizio M. Gavioli
ef316a7291
Fix scale controls of Inspector for Images (work in progress)
2012-07-18 11:35:56 +02:00
Werner Schweer
966e628307
add some metadata to plugins; extend plugin manager
2012-07-17 15:22:46 +02:00
