a956af Merge branch 'master' into shortplay

Merged and Committed by Jeremy Bullock 6 years ago
110 files changed. 5269 lines added. 5360 lines removed.
ci-scripts/osx/travis-install.sh
file modified
+9 -1
stuff/config/current.txt
file modified
+10 -0
stuff/profiles/layouts/fxs/STD_iwa_LinearGradientFx.xml
file added
+14
stuff/profiles/layouts/fxs/STD_linearGradientFx.xml
file modified
+1 -1
stuff/profiles/layouts/fxs/fxs.lst
file modified
+1 -1
stuff/profiles/layouts/rooms/Default/menubar_template.xml
file modified
+2 -0
stuff/profiles/layouts/shortcuts/defopentoonz.ini
file modified
+1 -0
stuff/profiles/layouts/shortcuts/otadobe.ini
file modified
+1 -0
stuff/profiles/layouts/shortcuts/otharmony.ini
file modified
+1 -0
stuff/profiles/layouts/shortcuts/otretas.ini
file modified
+1 -0
toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp
file modified
+60 -13
toonz/sources/image/ffmpeg/tiio_gif.cpp
file modified
+5 -3
toonz/sources/image/ffmpeg/tiio_gif.h
file modified
+1 -0
toonz/sources/image/ffmpeg/tiio_mp4.cpp
file modified
+4 -2
toonz/sources/image/ffmpeg/tiio_mp4.h
file modified
+1 -0
toonz/sources/image/ffmpeg/tiio_webm.cpp
file modified
+4 -2
toonz/sources/image/ffmpeg/tiio_webm.h
file modified
+1 -0
toonz/sources/include/tools/rasterselection.h
file modified
+2 -0
toonz/sources/include/tools/strokeselection.h
file modified
+2 -0
toonz/sources/include/toonz/columnfan.h
file modified
+3 -0
toonz/sources/include/toonz/preferences.h
file modified
+288 -534
toonz/sources/include/toonz/preferencesitemids.h
file added
+194
toonz/sources/include/toonzqt/flipconsole.h
file modified
+50 -42
toonz/sources/include/toonzqt/gutil.h
file modified
+2 -0
toonz/sources/include/tparamuiconcept.h
file modified
+4 -2
toonz/sources/sound/mp3/tsio_mp3.cpp
file modified
+1 -1
toonz/sources/stdfx/CMakeLists.txt
file modified
+2 -0
toonz/sources/stdfx/iwa_lineargradientfx.cpp
file added
+178
toonz/sources/stdfx/iwa_lineargradientfx.h
file added
+32
toonz/sources/stdfx/stdfx.cpp
file modified
+5 -0
toonz/sources/tnztools/edittoolgadgets.cpp
file modified
+194 -0
toonz/sources/tnztools/imagegrouping.cpp
file modified
+28 -0
toonz/sources/tnztools/rasterselection.cpp
file modified
+55 -0
toonz/sources/tnztools/rasterselectiontool.cpp
file modified
+40 -0
toonz/sources/tnztools/rasterselectiontool.h
file modified
+2 -0
toonz/sources/tnztools/selectiontool.cpp
file modified
+4 -0
toonz/sources/tnztools/selectiontool.h
file modified
+2 -0
toonz/sources/tnztools/strokeselection.cpp
file modified
+64 -2
toonz/sources/tnztools/tool.cpp
file modified
+20 -6
toonz/sources/tnztools/tooloptionscontrols.cpp
file modified
+11 -7
toonz/sources/tnztools/typetool.cpp
file modified
+15 -21
toonz/sources/tnztools/vectorselectiontool.cpp
file modified
+13 -1
toonz/sources/tnztools/vectorselectiontool.h
file modified
+2 -0
toonz/sources/toonz/Resources/fliphoriz_off.svg
file added
+65
toonz/sources/toonz/Resources/fliphoriz_on.svg
file added
+72
toonz/sources/toonz/Resources/fliphoriz_over.svg
file added
+65
toonz/sources/toonz/Resources/flipvert_off.svg
file added
+68
toonz/sources/toonz/Resources/flipvert_on.svg
file added
+75
toonz/sources/toonz/Resources/flipvert_over.svg
file added
+68
toonz/sources/toonz/Resources/reset.svg
file added
+69
toonz/sources/toonz/Resources/reset_over.svg
file added
+66
toonz/sources/toonz/Resources/zoomin.svg
file added
+67
toonz/sources/toonz/Resources/zoomin_over.svg
file added
+65
toonz/sources/toonz/Resources/zoomout.svg
file added
+65
toonz/sources/toonz/Resources/zoomout_over.svg
file added
+65
toonz/sources/toonz/cellselection.cpp
file modified
+173 -24
toonz/sources/toonz/cellselection.h
file modified
+2 -0
toonz/sources/toonz/cellselectioncommand.cpp
file modified
+13 -7
toonz/sources/toonz/colormodelviewer.cpp
file modified
+21 -10
toonz/sources/toonz/columnselection.cpp
file modified
+4 -1
toonz/sources/toonz/comboviewerpane.cpp
file modified
+21 -12
toonz/sources/toonz/comboviewerpane.h
file modified
+2 -0
toonz/sources/toonz/convertpopup.cpp
file modified
+6 -1
toonz/sources/toonz/dvdirtreeview.cpp
file modified
+4 -0
toonz/sources/toonz/dvitemview.cpp
file modified
+19 -4
toonz/sources/toonz/exportlevelpopup.cpp
file modified
+3 -0
toonz/sources/toonz/filebrowser.cpp
file modified
+1 -0
toonz/sources/toonz/filebrowserpopup.cpp
file modified
+1 -0
toonz/sources/toonz/filmstrip.cpp
file modified
+4 -1
toonz/sources/toonz/filmstripselection.cpp
file modified
+3 -1
toonz/sources/toonz/flipbook.cpp
file modified
+21 -5
toonz/sources/toonz/flipbook.h
file modified
+5 -4
toonz/sources/toonz/iocommand.cpp
file modified
+13 -9
toonz/sources/toonz/iocommand.h
file modified
+0 -3
toonz/sources/toonz/levelcreatepopup.cpp
file modified
+3 -0
toonz/sources/toonz/magpiefileimportpopup.cpp
file modified
+38 -14
toonz/sources/toonz/mainwindow.cpp
file modified
+21 -20
toonz/sources/toonz/matchlinecommand.cpp
file modified
+4 -1
toonz/sources/toonz/menubar.cpp
file modified
+2 -0
toonz/sources/toonz/menubarcommandids.h
file modified
+1 -0
toonz/sources/toonz/outputsettingspopup.cpp
file modified
+10 -0
toonz/sources/toonz/preferencespopup.cpp
file modified
+1393 -2667
toonz/sources/toonz/preferencespopup.h
file modified
+105 -172
toonz/sources/toonz/projectpopup.cpp
file modified
+4 -0
toonz/sources/toonz/sceneviewer.cpp
file modified
+59 -24
toonz/sources/toonz/sceneviewer.h
file modified
+4 -0
toonz/sources/toonz/sceneviewercontextmenu.cpp
file modified
+28 -38
toonz/sources/toonz/sceneviewerevents.cpp
file modified
+24 -0
toonz/sources/toonz/shortcutpopup.cpp
file modified
+1 -1
toonz/sources/toonz/startuppopup.cpp
file modified
+15 -9
toonz/sources/toonz/toonz.qrc
file modified
+12 -0
toonz/sources/toonz/viewerpane.cpp
file modified
+22 -13
toonz/sources/toonz/viewerpane.h
file modified
+2 -0
toonz/sources/toonz/xshcellviewer.cpp
file modified
+202 -146
toonz/sources/toonz/xsheetcmd.cpp
file modified
+27 -28
toonz/sources/toonz/xsheetdragtool.cpp
file modified
+29 -17
toonz/sources/toonz/xsheetviewer.cpp
file modified
+7 -8
toonz/sources/toonz/xshtoolbar.cpp
file modified
+2 -2
toonz/sources/toonzlib/CMakeLists.txt
file modified
+1 -0
toonz/sources/toonzlib/columnfan.cpp
file modified
+53 -0
toonz/sources/toonzlib/levelupdater.cpp
file modified
+6 -1
toonz/sources/toonzlib/namebuilder.cpp
file modified
+10 -0
toonz/sources/toonzlib/preferences.cpp
file modified
+500 -1367
toonz/sources/toonzlib/sceneresources.cpp
file modified
+19 -3
toonz/sources/toonzlib/txsheet.cpp
file modified
+14 -0
toonz/sources/toonzlib/txshsimplelevel.cpp
file modified
+33 -24
toonz/sources/toonzqt/flipconsole.cpp
file modified
+120 -79
toonz/sources/toonzqt/gutil.cpp
file modified
+27 -0
toonz/sources/toonzqt/paletteviewer.cpp
file modified
+8 -2
toonz/sources/toonzqt/studiopaletteviewer.cpp
file modified
+7 -3
    Merge branch 'master' into shortplay
    
        
file modified
+10 -0
file modified
+12 -0