52da33 Merge branch 'master' of https://github.com/opentoonz/opentoonz

Merged and Committed by Gabriel Gazzán 9 years ago
146 files changed. 1831 lines added. 709 lines removed.
CONTRIBUTING.md
file modified
+7 -7
ci-scripts/osx/travis-build.sh
file modified
+4 -0
ci-scripts/osx/travis-install.sh
file modified
+2 -0
doc/how_to_build_linux.md
file modified
+1 -1
doc/how_to_build_win.md
file modified
+0 -7
doc/how_to_build_win_ja.md
file modified
+0 -7
stuff/config/qss/gray_048/gray_048.less
file modified
+15 -0
stuff/config/qss/gray_048/gray_048.qss
file modified
+13 -0
stuff/config/qss/gray_048/gray_048_mac.qss
file modified
+13 -0
stuff/config/qss/gray_072/gray_072.less
file modified
+15 -0
stuff/config/qss/gray_072/gray_072.qss
file modified
+13 -0
stuff/config/qss/gray_072/gray_072_mac.qss
file modified
+13 -0
stuff/config/qss/gray_072/imgs/tpaneltitlebar_border.png
file added
+0
stuff/config/qss/gray_072/imgs/tpaneltitlebar_border_active.png
file added
+0
stuff/config/qss/gray_072/imgs/tpaneltitlebar_border_float.png
file added
+0
stuff/config/qss/gray_072/imgs/tpaneltitlebar_border_float_active.png
file added
+0
stuff/config/qss/gray_128/gray_128.less
file modified
+16 -0
stuff/config/qss/gray_128/gray_128.qss
file modified
+14 -0
stuff/config/qss/gray_128/gray_128_mac.qss
file modified
+14 -0
stuff/config/qss/gray_128/imgs/tpaneltitlebar_border.png
file added
+0
stuff/config/qss/gray_128/imgs/tpaneltitlebar_border_active.png
file added
+0
stuff/config/qss/gray_128/imgs/tpaneltitlebar_border_float.png
file added
+0
stuff/config/qss/gray_128/imgs/tpaneltitlebar_border_float_active.png
file added
+0
stuff/profiles/layouts/rooms/Default/menubar_template.xml
file modified
+12 -0
stuff/projects/cleanupreslist.txt
file modified
+10 -6
stuff/projects/reslist.txt
file modified
+8 -6
thirdparty/tiff-4.0.3/libtiff/tif_config.vc.h
file modified
+2 -0
toonz/sources/beautification.bat
file removed
-5
toonz/sources/beautification.sh
file modified
+3 -1
toonz/sources/common/tapptools/tcolorutils.cpp
file modified
+40 -39
toonz/sources/common/tgeometry/tcurveutil.cpp
file modified
+26 -24
toonz/sources/common/trop/tblur.cpp
file modified
+1 -1
toonz/sources/common/tsystem/tsystempd.cpp
file modified
+1 -1
toonz/sources/common/tunit/tunit.cpp
file modified
+3 -2
toonz/sources/common/tvectorimage/tstroke.cpp
file modified
+31 -31
toonz/sources/common/tvectorimage/tvectorimage.cpp
file modified
+22 -22
toonz/sources/common/tvrender/tstrokedeformations.cpp
file modified
+30 -30
toonz/sources/common/twain/twain.h
file modified
+9 -17
toonz/sources/image/CMakeLists.txt
file modified
+1 -1
toonz/sources/image/pli/pli_io.cpp
file modified
+19 -19
toonz/sources/image/svg/tiio_svg.cpp
file modified
+1 -1
toonz/sources/include/ext/ExtUtil.h
file modified
+2 -2
toonz/sources/include/ext/LinearPotential.h
file modified
+1 -1
toonz/sources/include/ext/NotSymmetricBezierPotential.htoonz/sources/include/ext/NotSimmetricBezierPotential.h
file renamed
+6 -6
toonz/sources/include/ext/NotSymmetricExpPotential.htoonz/sources/include/ext/NotSimmetricExpPotential.h
file renamed
+7 -7
toonz/sources/include/ext/SquarePotential.h
file modified
+1 -1
toonz/sources/include/ext/StrokeParametricDeformer.h
file modified
+4 -4
toonz/sources/include/ext/StrokeStatus.h
file modified
+1 -1
toonz/sources/include/tfx.h
file modified
+0 -1
toonz/sources/include/toonz/preferences.h
file modified
+11 -5
toonz/sources/include/toonz/stage.h
file modified
+1 -1
toonz/sources/include/toonz/tcamera.h
file modified
+3 -0
toonz/sources/include/toonz/tscenehandle.h
file modified
+3 -0
toonz/sources/include/toonz4.6/tnzmovie.h
file modified
+1 -1
toonz/sources/include/toonzqt/doublefield.h
file modified
+2 -2
toonz/sources/include/toonzqt/doublepairfield.h
file modified
+1 -1
toonz/sources/include/toonzqt/intpairfield.h
file modified
+1 -1
toonz/sources/include/toonzqt/lineedit.h
file modified
+1 -0
toonz/sources/include/tpersist.h
file modified
+1 -2
toonz/sources/include/trenderresourcemanager.h
file modified
+1 -2
toonz/sources/include/tsmartpointer.h
file modified
+1 -2
toonz/sources/sound/CMakeLists.txt
file modified
+3 -1
toonz/sources/sound/mp3/tsio_mp3.cpp
file added
+103
toonz/sources/sound/mp3/tsio_mp3.h
file added
+42
toonz/sources/sound/tsio.cpp
file modified
+5 -0
toonz/sources/sound/tsio.h
file modified
+1 -0
toonz/sources/sound/wav/tsio_wav.cpp
file modified
+6 -6
toonz/sources/stdfx/stdfx.h
file modified
+0 -1
toonz/sources/tcleanupper/tcleanupper.cpp
file modified
+10 -2
toonz/sources/tcomposer/tcomposer.cpp
file modified
+2 -2
toonz/sources/tconverter/tconverter.cpp
file modified
+1 -1
toonz/sources/tnzext/CMakeLists.txt
file modified
+4 -4
toonz/sources/tnzext/CornerDeformation.cpp
file modified
+1 -1
toonz/sources/tnzext/DraggerStatus.cpp
file modified
+3 -3
toonz/sources/tnzext/ExtUtil.cpp
file modified
+1 -1
toonz/sources/tnzext/LinearPotential.cpp
file modified
+9 -9
toonz/sources/tnzext/NotSymmetricBezierPotential.cpptoonz/sources/tnzext/NotSimmetricBezierPotential.cpp
file renamed
+23 -23
toonz/sources/tnzext/NotSymmetricExpPotential.cpptoonz/sources/tnzext/NotSimmetricExpPotential.cpp
file renamed
+24 -24
toonz/sources/tnzext/SmoothDeformation.cpp
file modified
+2 -2
toonz/sources/tnzext/SquarePotential.cpp
file modified
+10 -10
toonz/sources/tnzext/StraightCornerDeformation.cpp
file modified
+1 -1
toonz/sources/tnzext/StrokeDeformation.cpp
file modified
+1 -1
toonz/sources/tnzext/StrokeDeformationImpl.cpp
file modified
+1 -1
toonz/sources/tnzext/StrokeParametricDeformer.cpp
file modified
+15 -15
toonz/sources/tnztools/bendertool.cpp
file modified
+1 -1
toonz/sources/tnztools/selectiontool.cpp
file modified
+19 -19
toonz/sources/tnztools/selectiontool.h
file modified
+2 -2
toonz/sources/tnztools/vectorselectiontool.cpp
file modified
+1 -1
toonz/sources/toonz/Resources/geometric.svg
file modified
+88 -63
toonz/sources/toonz/Resources/geometric_old.svg
file added
+63
toonz/sources/toonz/Resources/geometric_rollover.svg
file modified
+88 -63
toonz/sources/toonz/Resources/geometric_rollover_old.svg
file added
+63
toonz/sources/toonz/camerasettingspopup.cpp
file modified
+2 -1
toonz/sources/toonz/cellselection.cpp
file modified
+112 -2
toonz/sources/toonz/cellselection.h
file modified
+3 -0
toonz/sources/toonz/comboviewerpane.cpp
file modified
+24 -0
toonz/sources/toonz/comboviewerpane.h
file modified
+2 -1
toonz/sources/toonz/dvitemview.cpp
file modified
+8 -8
toonz/sources/toonz/dvitemview.h
file modified
+4 -4
toonz/sources/toonz/filebrowserpopup.cpp
file modified
+12 -1
toonz/sources/toonz/iocommand.cpp
file modified
+33 -4
toonz/sources/toonz/levelsettingspopup.cpp
file modified
+3 -1
toonz/sources/toonz/mainwindow.cpp
file modified
+1 -1
toonz/sources/toonz/menubar.cpp
file modified
+14 -2
toonz/sources/toonz/menubarpopup.cpp
file modified
+1 -0
toonz/sources/toonz/meshifypopup.cpp
file modified
+1 -1
toonz/sources/toonz/metnum.cpp
file modified
+3 -3
toonz/sources/toonz/pane.cpp
file modified
+14 -23
toonz/sources/toonz/pane.h
file modified
+31 -0
toonz/sources/toonz/penciltestpopup.cpp
file modified
+141 -38
toonz/sources/toonz/penciltestpopup.h
file modified
+23 -1
toonz/sources/toonz/preferencespopup.cpp
file modified
+116 -10
toonz/sources/toonz/preferencespopup.h
file modified
+10 -2
toonz/sources/toonz/projectpopup.cpp
file modified
+2 -1
toonz/sources/toonz/sceneviewer.cpp
file modified
+5 -1
toonz/sources/toonz/viewerpane.cpp
file modified
+26 -1
toonz/sources/toonz/viewerpane.h
file modified
+2 -1
toonz/sources/toonz/xshcellviewer.cpp
file modified
+79 -38
toonz/sources/toonz/xshcolumnviewer.cpp
file modified
+6 -2
toonz/sources/toonz/xsheetviewer.cpp
file modified
+3 -3
toonz/sources/toonz/xsheetviewer.h
file modified
+14 -0
toonz/sources/toonz/xshrowviewer.cpp
file modified
+2 -0
toonz/sources/toonzfarm/tfarm/tlog.cpp
file modified
+1 -1
toonz/sources/toonzlib/avicodecrestrictions.cpp
file modified
+3 -3
toonz/sources/toonzlib/imagepainter.cpp
file modified
+1 -1
toonz/sources/toonzlib/imagestyles.cpp
file modified
+2 -2
toonz/sources/toonzlib/preferences.cpp
file modified
+30 -0
toonz/sources/toonzlib/rasterbrush.cpp
file modified
+1 -1
toonz/sources/toonzlib/stage.cpp
file modified
+2 -2
toonz/sources/toonzlib/tbinarizer.cpp
file modified
+1 -1
toonz/sources/toonzlib/tcamera.cpp
file modified
+2 -1
toonz/sources/toonzlib/tlog.cpp
file modified
+1 -1
toonz/sources/toonzlib/toonzfolders.cpp
file modified
+58 -3
toonz/sources/toonzlib/txsheet.cpp
file modified
+11 -0
toonz/sources/toonzlib/txshsimplelevel.cpp
file modified
+3 -2
toonz/sources/toonzqt/camerasettingswidget.cpp
file modified
+6 -6
toonz/sources/toonzqt/cleanupcamerasettingswidget.cpp
file modified
+1 -1
toonz/sources/toonzqt/dvdialog.cpp
file modified
+1 -1
toonz/sources/toonzqt/lineedit.cpp
file modified
+1 -0
toonz/sources/toonzqt/paletteviewergui.cpp
file modified
+2 -2
toonz/sources/translations/chinese/toonzlib.ts
file modified
+1 -1
toonz/sources/translations/french/toonzlib.ts
file modified
+1 -1
toonz/sources/translations/german/toonzlib.ts
file modified
+1 -1
toonz/sources/translations/italian/toonzlib.ts
file modified
+1 -1
toonz/sources/translations/japanese/toonzlib.ts
file modified
+1 -1
toonz/sources/translations/spanish/toonzlib.ts
file modified
+1 -1
    Merge branch 'master' of https://github.com/opentoonz/opentoonz
    
        
file modified
+7 -7
file modified
+1 -1
file modified
+0 -7
file modified
+0 -7
file modified
+8 -6
toonz/sources/include/ext/NotSymmetricBezierPotential.h toonz/sources/include/ext/NotSimmetricBezierPotential.h
file renamed
+6 -6
toonz/sources/include/ext/NotSymmetricExpPotential.h toonz/sources/include/ext/NotSimmetricExpPotential.h
file renamed
+7 -7
file modified
+0 -1
file modified
+5 -0
file modified
+1 -0
file modified
+0 -1
toonz/sources/tnzext/NotSymmetricBezierPotential.cpp toonz/sources/tnzext/NotSimmetricBezierPotential.cpp
file renamed
+23 -23
toonz/sources/tnzext/NotSymmetricExpPotential.cpp toonz/sources/tnzext/NotSimmetricExpPotential.cpp
file renamed
+24 -24
file modified
+14 -23
file modified
+31 -0