eff652 Resolve OT master conflicts

Merged and Committed by manongjohn 4 years ago
742 files changed. 53212 lines added. 15699 lines removed.
.travis.yml
file modified
+1 -1
appveyor.yml
file modified
+16 -7
ci-scripts/osx/travis-build.sh
file modified
+4 -2
doc/how_to_build_linux.md
file modified
+4 -3
doc/how_to_build_macosx.md
file modified
+86 -42
stuff/config/current.txt
file modified
+18 -0
stuff/config/loc/Čeština/colorfx.qm
file added
+0
stuff/config/loc/Čeština/image.qm
file added
+0
stuff/config/loc/Čeština/tnzcore.qm
file added
+0
stuff/config/loc/Čeština/tnztools.qm
file added
+0
stuff/config/loc/Čeština/toonz.qm
file added
+0
stuff/config/loc/Čeština/toonzlib.qm
file added
+0
stuff/config/loc/Čeština/toonzqt.qm
file added
+0
stuff/config/loc/Русский/colorfx.qmstuff/config/loc/Russian (Русский)/colorfx.qm
file renamed
+0 -0
stuff/config/loc/Русский/image.qmstuff/config/loc/Russian (Русский)/image.qm
file renamed
+0 -0
stuff/config/loc/Русский/tnzcore.qmstuff/config/loc/Russian (Русский)/tnzcore.qm
file renamed
+0 -0
stuff/config/loc/Русский/tnztools.qmstuff/config/loc/Russian (Русский)/tnztools.qm
file renamed
+0 -0
stuff/config/loc/Русский/toonz.qmstuff/config/loc/Russian (Русский)/toonz.qm
file renamed
+0 -0
stuff/config/loc/Русский/toonzlib.qmstuff/config/loc/Russian (Русский)/toonzlib.qm
file renamed
+0 -0
stuff/config/loc/Русский/toonzqt.qmstuff/config/loc/Russian (Русский)/toonzqt.qm
file renamed
+0 -0
stuff/config/loc/日本語/tnztools.qm
file modified
+0 -0
stuff/config/loc/日本語/toonz.qm
file modified
+0 -0
stuff/config/loc/日本語/toonzqt.qm
file modified
+0 -0
stuff/config/loc/한국어/colorfx.qm
file added
+0
stuff/config/loc/한국어/image.qm
file added
+0
stuff/config/loc/한국어/tnzcore.qm
file added
+0
stuff/config/loc/한국어/tnztools.qm
file added
+0
stuff/config/loc/한국어/toonz.qm
file added
+0
stuff/config/loc/한국어/toonzlib.qm
file added
+0
stuff/config/loc/한국어/toonzqt.qm
file added
+0
stuff/config/qss/Blue/Blue.qss
file modified
+1 -1
stuff/config/qss/Dark/Dark.qss
file modified
+1 -1
stuff/config/qss/Default/Default.qss
file modified
+1 -1
stuff/config/qss/Default/imgs/black/subcamera.svg
file added
+133
stuff/config/qss/Default/imgs/white/subcamera.svg
file added
+133
stuff/config/qss/Default/less/Default.less
file modified
+6 -0
stuff/config/qss/Default/less/layouts/controls.less
file modified
+2 -1
stuff/config/qss/Default/less/layouts/misc.less
file modified
+1 -1
stuff/config/qss/Default/less/layouts/popups.less
file modified
+9 -1
stuff/config/qss/Default/less/layouts/xsheet.less
file modified
+6 -0
stuff/config/qss/Default/less/themes/Light.less
file modified
+6 -0
stuff/config/qss/Light/Light.qss
file modified
+1 -1
stuff/doc/AddIno.pdf
file modified
+0 -0
stuff/doc/BlurIno.pdf
file modified
+0 -0
stuff/doc/ChannelSelectorIno.pdf
file modified
+0 -0
stuff/doc/ColorBurnIno.pdf
file modified
+0 -0
stuff/doc/ColorDodgeIno.pdf
file modified
+0 -0
stuff/doc/CrossDissolveIno.pdf
file modified
+0 -0
stuff/doc/DarkenIno.pdf
file modified
+0 -0
stuff/doc/DarkerColorIno.pdf
file modified
+0 -0
stuff/doc/DensityIno.pdf
file modified
+0 -0
stuff/doc/DivideIno.pdf
file modified
+0 -0
stuff/doc/FogIno.pdf
file modified
+0 -0
stuff/doc/HLSAddIno.pdf
file modified
+0 -0
stuff/doc/HLSAdjustIno.pdf
file modified
+0 -0
stuff/doc/HLSNoiseIno.pdf
file modified
+0 -0
stuff/doc/HSVAddIno.pdf
file modified
+0 -0
stuff/doc/HSVAdjustIno.pdf
file modified
+0 -0
stuff/doc/HSVNoiseIno.pdf
file modified
+0 -0
stuff/doc/HardLightIno.pdf
file modified
+0 -0
stuff/doc/HardMixIno.pdf
file modified
+0 -0
stuff/doc/LevelAutoIno.pdf
file modified
+0 -0
stuff/doc/LevelMasterIno.pdf
file modified
+0 -0
stuff/doc/LevelRGBAIno.pdf
file modified
+0 -0
stuff/doc/LightenIno.pdf
file modified
+0 -0
stuff/doc/LighterColorIno.pdf
file modified
+0 -0
stuff/doc/LinearBurnIno.pdf
file modified
+0 -0
stuff/doc/LinearDodgeIno.pdf
file modified
+0 -0
stuff/doc/LinearLightIno.pdf
file modified
+0 -0
stuff/doc/MaxMinIno.pdf
file modified
+0 -0
stuff/doc/MedianIno.pdf
file modified
+0 -0
stuff/doc/MotionBlurIno.pdf
file modified
+0 -0
stuff/doc/MotionBlurIwa.html
file modified
+27 -27
stuff/doc/MotionWindIno.pdf
file modified
+0 -0
stuff/doc/MultiplyIno.pdf
file modified
+0 -0
stuff/doc/NegateIno.pdf
file modified
+0 -0
stuff/doc/OverIno.pdf
file modified
+0 -0
stuff/doc/OverlayIno.pdf
file modified
+0 -0
stuff/doc/PNCloudsIno.pdf
file modified
+0 -0
stuff/doc/PNPerspectiveIwa.html
file modified
+33 -25
stuff/doc/PerspectiveDistortIwa.html
file modified
+15 -15
stuff/doc/PinLightIno.pdf
file modified
+0 -0
stuff/doc/RadialBlurIno.pdf
file modified
+0 -0
stuff/doc/ScreenIno.pdf
file modified
+0 -0
stuff/doc/SoftLightIno.pdf
file modified
+0 -0
stuff/doc/SpectrumIwa.html
file modified
+28 -28
stuff/doc/SpinBlurIno.pdf
file modified
+0 -0
stuff/doc/SubtractIno.pdf
file modified
+0 -0
stuff/doc/TileIwa.html
file modified
+24 -24
stuff/doc/VividLightIno.pdf
file modified
+0 -0
stuff/doc/WarpHVIno.pdf
file modified
+0 -0
stuff/doc/img/fx_iwa_motionblur.png
file modified
+0 -0
stuff/doc/img/fx_iwa_perspective_distort.png
file modified
+0 -0
stuff/doc/img/fx_iwa_pn_perspective.png
file modified
+0 -0
stuff/doc/img/fx_iwa_spectrum.png
file modified
+0 -0
stuff/doc/img/fx_iwa_tile.png
file modified
+0 -0
stuff/doc/img/motionblur.png
file modified
+0 -0
stuff/doc/img/perspective_distort.png
file modified
+0 -0
stuff/doc/particlesFx.html
file modified
+78 -84
stuff/doc/日本語/AddIno.pdf
file added
+0
stuff/doc/日本語/BlurIno.pdf
file added
+0
stuff/doc/日本語/BokehIwa.htmlstuff/doc/BokehIwa.html
file renamed
+0 -0
stuff/doc/日本語/BokehRefIwa.htmlstuff/doc/BokehRefIwa.html
file renamed
+0 -0
stuff/doc/日本語/ChannelSelectorIno.pdf
file added
+0
stuff/doc/日本語/ColorBurnIno.pdf
file added
+0
stuff/doc/日本語/ColorDodgeIno.pdf
file added
+0
stuff/doc/日本語/CrossDissolveIno.pdf
file added
+0
stuff/doc/日本語/DarkenIno.pdf
file added
+0
stuff/doc/日本語/DarkerColorIno.pdf
file added
+0
stuff/doc/日本語/DensityIno.pdf
file added
+0
stuff/doc/日本語/DivideIno.pdf
file added
+0
stuff/doc/日本語/FogIno.pdf
file added
+0
stuff/doc/日本語/HLSAddIno.pdf
file added
+0
stuff/doc/日本語/HLSAdjustIno.pdf
file added
+0
stuff/doc/日本語/HLSNoiseIno.pdf
file added
+0
stuff/doc/日本語/HSVAddIno.pdf
file added
+0
stuff/doc/日本語/HSVAdjustIno.pdf
file added
+0
stuff/doc/日本語/HSVNoiseIno.pdf
file added
+0
stuff/doc/日本語/HardLightIno.pdf
file added
+0
stuff/doc/日本語/HardMixIno.pdf
file added
+0
stuff/doc/日本語/LevelAutoIno.pdf
file added
+0
stuff/doc/日本語/LevelMasterIno.pdf
file added
+0
stuff/doc/日本語/LevelRGBAIno.pdf
file added
+0
stuff/doc/日本語/LightenIno.pdf
file added
+0
stuff/doc/日本語/LighterColorIno.pdf
file added
+0
stuff/doc/日本語/LinearBurnIno.pdf
file added
+0
stuff/doc/日本語/LinearDodgeIno.pdf
file added
+0
stuff/doc/日本語/LinearLightIno.pdf
file added
+0
stuff/doc/日本語/MaxMinIno.pdf
file added
+0
stuff/doc/日本語/MedianIno.pdf
file added
+0
stuff/doc/日本語/MotionBlurIno.pdf
file added
+0
stuff/doc/日本語/MotionBlurIwa.html
file added
+43
stuff/doc/日本語/MotionWindIno.pdf
file added
+0
stuff/doc/日本語/MultiplyIno.pdf
file added
+0
stuff/doc/日本語/NegateIno.pdf
file added
+0
stuff/doc/日本語/OverIno.pdf
file added
+0
stuff/doc/日本語/OverlayIno.pdf
file added
+0
stuff/doc/日本語/PNCloudsIno.pdf
file added
+0
stuff/doc/日本語/PNPerspectiveIwa.html
file added
+41
stuff/doc/日本語/PerspectiveDistortIwa.html
file added
+32
stuff/doc/日本語/PinLightIno.pdf
file added
+0
stuff/doc/日本語/RadialBlurIno.pdf
file added
+0
stuff/doc/日本語/ScreenIno.pdf
file added
+0
stuff/doc/日本語/SoftLightIno.pdf
file added
+0
stuff/doc/日本語/SpectrumIwa.html
file added
+48
stuff/doc/日本語/SpinBlurIno.pdf
file added
+0
stuff/doc/日本語/SubtractIno.pdf
file added
+0
stuff/doc/日本語/TileIwa.html
file added
+45
stuff/doc/日本語/VividLightIno.pdf
file added
+0
stuff/doc/日本語/WarpHVIno.pdf
file added
+0
stuff/doc/日本語/img/fx_iwa_bokeh.pngstuff/doc/img/fx_iwa_bokeh.png
file renamed
+0 -0
stuff/doc/日本語/img/fx_iwa_bokeh_ref.pngstuff/doc/img/fx_iwa_bokeh_ref.png
file renamed
+0 -0
stuff/doc/日本語/img/fx_iwa_motionblur.png
file added
+0
stuff/doc/日本語/img/fx_iwa_perspective_distort.png
file added
+0
stuff/doc/日本語/img/fx_iwa_pn_perspective.png
file added
+0
stuff/doc/日本語/img/fx_iwa_spectrum.png
file added
+0
stuff/doc/日本語/img/fx_iwa_tile.png
file added
+0
stuff/doc/日本語/img/motionblur.png
file added
+0
stuff/doc/日本語/img/perspective_distort.png
file added
+0
stuff/doc/日本語/particlesFx.html
file added
+1031
stuff/profiles/layouts/fxs/STD_iwa_CorridorGradientFx.xml
file added
+18
stuff/profiles/layouts/fxs/STD_linearGradientFx.xml
file modified
+1 -0
stuff/profiles/layouts/fxs/STD_multiLinearGradientFx.xml
file modified
+1 -0
stuff/profiles/layouts/fxs/STD_multiRadialGradientFx.xml
file modified
+1 -0
stuff/profiles/layouts/fxs/STD_radialGradientFx.xml
file modified
+1 -0
stuff/profiles/layouts/fxs/STD_rgbmCutFx.xml
file modified
+1 -1
stuff/profiles/layouts/fxs/fxs.lst
file modified
+1 -0
stuff/profiles/layouts/rooms/Default/layouts.txt
file modified
+1 -1
stuff/profiles/layouts/rooms/Default/menubar_template.xml
file modified
+321 -253
stuff/profiles/layouts/rooms/Default/room1.ini
file modified
+14 -8
stuff/profiles/layouts/rooms/Default/room2.ini
file modified
+7 -5
stuff/profiles/layouts/rooms/Default/room3.ini
file modified
+9 -6
stuff/profiles/layouts/rooms/Default/room4.ini
file modified
+22 -17
stuff/profiles/layouts/rooms/Default/room5.ini
file modified
+17 -16
stuff/profiles/layouts/rooms/Default/room6.ini
file modified
+25 -8
stuff/profiles/layouts/rooms/Default/room7.ini
file modified
+11 -6
stuff/profiles/layouts/rooms/Default/room8.ini
file modified
+6 -6
stuff/profiles/layouts/rooms/Default/room9.ini
file modified
+6 -22
stuff/profiles/layouts/rooms/StudioGhibli/room6_menubar.xml
file modified
+2 -0
stuff/profiles/layouts/shortcuts/defopentoonz.ini
file modified
+19 -5
stuff/profiles/layouts/shortcuts/otadobe.ini
file modified
+133 -86
stuff/profiles/layouts/shortcuts/otharmony.ini
file modified
+133 -86
stuff/profiles/layouts/shortcuts/otretas.ini
file modified
+133 -86
thirdparty/libmypaint/README
file modified
+1 -1
thirdparty/libmypaint/dist/32/include/libmypaint/mypaint-brush-settings-gen.h
file modified
+22 -0
thirdparty/libmypaint/dist/32/include/libmypaint/mypaint-tiled-surface.h
file modified
+1 -16
thirdparty/libmypaint/dist/32/libiconv-2.dll
file modified
+2 -2
thirdparty/libmypaint/dist/32/libintl-8.dll
file modified
+2 -2
thirdparty/libmypaint/dist/32/libjson-c-2.dll
file modified
+2 -2
thirdparty/libmypaint/dist/32/libmypaint-1-4-0.dll
file modified
+2 -2
thirdparty/libmypaint/dist/32/libmypaint.lib
file modified
+1 -1
thirdparty/libmypaint/dist/64/include/libmypaint/mypaint-brush-settings-gen.h
file modified
+22 -0
thirdparty/libmypaint/dist/64/include/libmypaint/mypaint-tiled-surface.h
file modified
+1 -16
thirdparty/libmypaint/dist/64/libiconv-2.dll
file modified
+2 -2
thirdparty/libmypaint/dist/64/libintl-8.dll
file modified
+2 -2
thirdparty/libmypaint/dist/64/libjson-c-2.dll
file modified
+2 -2
thirdparty/libmypaint/dist/64/libmypaint-1-4-0.dll
file modified
+2 -2
thirdparty/libmypaint/dist/64/libmypaint.lib
file modified
+1 -1
thirdparty/libmypaint/download-all.sh
file modified
+2 -2
thirdparty/libmypaint/mingw-vars.sh
file modified
+2 -1
toonz/cmake/BundleInfo.plist.in
file modified
+6 -8
toonz/sources/CMakeLists.txt
file modified
+8 -7
toonz/sources/common/expressions/ttokenizer.cpp
file modified
+2 -3
toonz/sources/common/tapptools/tenv.cpp
file modified
+52 -10
toonz/sources/common/tfx/tfx.cpp
file modified
+25 -11
toonz/sources/common/tfx/tmacrofx.cpp
file modified
+30 -3
toonz/sources/common/tfx/tpassivecachemanager.cpp
file modified
+0 -15
toonz/sources/common/tiio/tiio_jpg_exif.cpp
file modified
+5 -5
toonz/sources/common/tmeshimage/tmeshimage.cpp
file modified
+5 -39
toonz/sources/common/tparam/tspectrumparam.cpp
file modified
+4 -4
toonz/sources/common/tsound/tsound_nt.cpp
file modified
+1 -1
toonz/sources/common/tstream/tstream.cpp
file modified
+30 -13
toonz/sources/common/tsystem/tfilepath.cpp
file modified
+6 -6
toonz/sources/common/tsystem/tsystem.cpp
file modified
+136 -20
toonz/sources/common/tvectorimage/tcomputeregions.cpp
file modified
+12 -9
toonz/sources/common/tvrender/tglregions.cpp
file modified
+11 -10
toonz/sources/common/tvrender/tpalette.cpp
file modified
+88 -18
toonz/sources/common/twain/ttwain_stateX.c
file modified
+2 -0
toonz/sources/image/avi/tiio_avi.cpp
file modified
+9 -6
toonz/sources/include/cellposition.h
file modified
+2 -2
toonz/sources/include/orientation.h
file modified
+30 -15
toonz/sources/include/tcg/boost/zipped_range.h
file removed
-45
toonz/sources/include/tcg/iterator_ops.h
file modified
+0 -153
toonz/sources/include/tcommon.h
file modified
+0 -2
toonz/sources/include/tenv.h
file modified
+6 -0
toonz/sources/include/tfx.h
file modified
+2 -2
toonz/sources/include/tfxattributes.h
file modified
+1 -0
toonz/sources/include/tmacrofx.h
file modified
+7 -0
toonz/sources/include/tools/cursors.h
file modified
+1 -0
toonz/sources/include/tools/strokeselection.h
file modified
+2 -0
toonz/sources/include/tools/stylepicker.h
file modified
+2 -1
toonz/sources/include/tools/tooloptions.h
file modified
+57 -0
toonz/sources/include/tools/toolutils.h
file modified
+1 -1
toonz/sources/include/toonz/columnfan.h
file modified
+5 -4
toonz/sources/include/toonz/doubleparamcmd.h
file modified
+3 -1
toonz/sources/include/toonz/fill.h
file modified
+3 -0
toonz/sources/include/toonz/preferences.h
file modified
+20 -5
toonz/sources/include/toonz/tapplication.h
file modified
+2 -1
toonz/sources/include/toonz/tcolumnhandle.h
file modified
+1 -0
toonz/sources/include/toonz/tframehandle.h
file modified
+10 -0
toonz/sources/include/toonz/tpalettehandle.h
file modified
+2 -2
toonz/sources/include/toonz/tstageobjecttree.h
file modified
+10 -8
toonz/sources/include/toonz/ttileset.h
file modified
+1 -0
toonz/sources/include/toonz/txsheet.h
file modified
+12 -3
toonz/sources/include/toonz/txsheethandle.h
file modified
+2 -0
toonz/sources/include/toonz/txshsimplelevel.h
file modified
+2 -0
toonz/sources/include/toonzqt/colorfield.h
file modified
+1 -0
toonz/sources/include/toonzqt/combohistogram.h
file modified
+1 -0
toonz/sources/include/toonzqt/doublefield.h
file modified
+9 -1
toonz/sources/include/toonzqt/doublepairfield.h
file modified
+3 -0
toonz/sources/include/toonzqt/dvdialog.h
file modified
+0 -2
toonz/sources/include/toonzqt/functionsegmentviewer.h
file modified
+4 -3
toonz/sources/include/toonzqt/functionselection.h
file modified
+22 -0
toonz/sources/include/toonzqt/functionsheet.h
file modified
+14 -0
toonz/sources/include/toonzqt/functiontoolbar.h
file modified
+3 -0
toonz/sources/include/toonzqt/functiontreeviewer.h
file modified
+25 -0
toonz/sources/include/toonzqt/functionviewer.h
file modified
+2 -0
toonz/sources/include/toonzqt/fxschematicnode.h
file modified
+14 -1
toonz/sources/include/toonzqt/fxsettings.h
file modified
+2 -0
toonz/sources/include/toonzqt/imageutils.h
file modified
+15 -5
toonz/sources/include/toonzqt/intfield.h
file modified
+8 -0
toonz/sources/include/toonzqt/intpairfield.h
file modified
+5 -2
toonz/sources/include/toonzqt/keyframenavigator.h
file modified
+5 -0
toonz/sources/include/toonzqt/lutcalibrator.h
file modified
+3 -1
toonz/sources/include/toonzqt/menubarcommand.h
file modified
+2 -1
toonz/sources/include/toonzqt/paletteviewer.h
file modified
+2 -0
toonz/sources/include/toonzqt/paletteviewergui.h
file modified
+1 -0
toonz/sources/include/toonzqt/paramfield.h
file modified
+8 -7
toonz/sources/include/toonzqt/planeviewer.h
file modified
+33 -2
toonz/sources/include/toonzqt/schematicnode.h
file modified
+6 -6
toonz/sources/include/toonzqt/schematicviewer.h
file modified
+56 -3
toonz/sources/include/toonzqt/studiopaletteviewer.h
file modified
+17 -0
toonz/sources/include/toonzqt/styleeditor.h
file modified
+2 -0
toonz/sources/include/toonzqt/swatchviewer.h
file modified
+32 -0
toonz/sources/include/toonzqt/viewcommandids.h
file modified
+13 -0
toonz/sources/include/tpalette.h
file modified
+19 -11
toonz/sources/include/tproperty.h
file modified
+18 -3
toonz/sources/include/tspectrumparam.h
file modified
+3 -3
toonz/sources/include/tstopwatch.h
file modified
+1 -1
toonz/sources/include/tstream.h
file modified
+4 -0
toonz/sources/include/tsystem.h
file modified
+4 -1
toonz/sources/include/tversion.h
file modified
+12 -0
toonz/sources/stdfx/CMakeLists.txt
file modified
+2 -0
toonz/sources/stdfx/cloudsfx.cpp
file modified
+10 -10
toonz/sources/stdfx/diamondgradientfx.cpp
file modified
+8 -7
toonz/sources/stdfx/freedistortfx.cpp
file modified
+11 -41
toonz/sources/stdfx/gradients.cpp
file modified
+58 -17
toonz/sources/stdfx/gradients.h
file modified
+6 -2
toonz/sources/stdfx/igs_line_blur.cpp
file modified
+36 -40
toonz/sources/stdfx/igs_line_blur.h
file modified
+4 -5
toonz/sources/stdfx/ino_line_blur.cpp
file modified
+116 -198
toonz/sources/stdfx/iwa_bokehreffx.cpp
file modified
+4 -2
toonz/sources/stdfx/iwa_corridorgradientfx.cpp
file added
+378
toonz/sources/stdfx/iwa_corridorgradientfx.h
file added
+31
toonz/sources/stdfx/iwa_particlesfx.cpp
file modified
+12 -9
toonz/sources/stdfx/linearwavefx.cpp
file modified
+5 -5
toonz/sources/stdfx/multitonefx.cpp
file modified
+5 -4
toonz/sources/stdfx/particlesfx.cpp
file modified
+12 -9
toonz/sources/stdfx/randomwavefx.cpp
file modified
+4 -4
toonz/sources/stdfx/ripplefx.cpp
file modified
+5 -5
toonz/sources/stdfx/squaregradientfx.cpp
file modified
+2 -2
toonz/sources/stdfx/stdfx.cpp
file modified
+82 -44
toonz/sources/stdfx/test_boxfx.cpp
file modified
+5 -4
toonz/sources/tcleanupper/tcleanupper.cpp
file modified
+8 -2
toonz/sources/tcomposer/tcomposer.cpp
file modified
+75 -23
toonz/sources/tconverter/tconverter.cpp
file modified
+8 -0
toonz/sources/tnzbase/CMakeLists.txt
file modified
+1 -1
toonz/sources/tnzcore/CMakeLists.txt
file modified
+7 -0
toonz/sources/tnzext/CMakeLists.txt
file modified
+2 -2
toonz/sources/tnzext/plasticskeleton.cpp
file modified
+5 -13
toonz/sources/tnztools/CMakeLists.txt
file modified
+2 -0
toonz/sources/tnztools/Resources/pointing_hand.png
file added
+0
toonz/sources/tnztools/controlpointeditortool.cpp
file modified
+2 -1
toonz/sources/tnztools/cursormanager.cpp
file modified
+6 -0
toonz/sources/tnztools/edittool.cpp
file modified
+7 -4
toonz/sources/tnztools/edittoolgadgets.cpp
file modified
+275 -50
toonz/sources/tnztools/edittoolgadgets.h
file modified
+10 -5
toonz/sources/tnztools/fingertool.cpp
file modified
+7 -6
toonz/sources/tnztools/fullcolorbrushtool.cpp
file modified
+72 -30
toonz/sources/tnztools/fullcolorbrushtool.h
file modified
+4 -0
toonz/sources/tnztools/fullcolorerasertool.cpp
file modified
+8 -2
toonz/sources/tnztools/fullcolorfilltool.cpp
file added
+223
toonz/sources/tnztools/fullcolorfilltool.h
file added
+45
toonz/sources/tnztools/geometrictool.cpp
file modified
+21 -21
toonz/sources/tnztools/magnettool.cpp
file modified
+29 -29
toonz/sources/tnztools/paintbrushtool.cpp
file modified
+7 -12
toonz/sources/tnztools/pinchtool.cpp
file modified
+5 -3
toonz/sources/tnztools/plastictool_build.cpp
file modified
+5 -12
toonz/sources/tnztools/plastictool_meshedit.cpp
file modified
+5 -11
toonz/sources/tnztools/rastererasertool.cpp
file modified
+39 -29
toonz/sources/tnztools/selectiontool.cpp
file modified
+47 -16
toonz/sources/tnztools/strokeselection.cpp
file modified
+39 -9
toonz/sources/tnztools/stylepicker.cpp
file modified
+69 -4
toonz/sources/tnztools/stylepickertool.cpp
file modified
+11 -4
toonz/sources/tnztools/stylepickertool.h
file modified
+1 -1
toonz/sources/tnztools/tnztools.qrc
file modified
+1 -0
toonz/sources/tnztools/tool.cpp
file modified
+41 -28
toonz/sources/tnztools/tooloptions.cpp
file modified
+139 -23
toonz/sources/tnztools/tooloptionscontrols.cpp
file modified
+31 -19
toonz/sources/tnztools/tooloptionscontrols.h
file modified
+4 -2
toonz/sources/tnztools/toolutils.cpp
file modified
+6 -6
toonz/sources/tnztools/toonzrasterbrushtool.cpp
file modified
+113 -50
toonz/sources/tnztools/toonzrasterbrushtool.h
file modified
+6 -0
toonz/sources/tnztools/toonzvectorbrushtool.cpp
file modified
+94 -49
toonz/sources/tnztools/toonzvectorbrushtool.h
file modified
+7 -0
toonz/sources/tnztools/typetool.cpp
file modified
+21 -3
toonz/sources/tnztools/vectorerasertool.cpp
file modified
+11 -9
toonz/sources/tnztools/vectorselectiontool.cpp
file modified
+39 -15
toonz/sources/toonz/CMakeLists.txt
file modified
+16 -16
toonz/sources/toonz/Resources/camera.svg
file added
+8
toonz/sources/toonz/Resources/camera_small.svg
file added
+55
toonz/sources/toonz/Resources/pane_cam_off.svg
file modified
+6 -23
toonz/sources/toonz/Resources/pane_cam_on.svg
file modified
+6 -29
toonz/sources/toonz/Resources/pane_cam_over.svg
file modified
+6 -29
toonz/sources/toonz/adjustthicknesspopup.cpp
file modified
+10 -15
toonz/sources/toonz/boardsettingspopup.h
file modified
+3 -1
toonz/sources/toonz/cellkeyframeselection.cpp
file modified
+4 -2
toonz/sources/toonz/cellselection.cpp
file modified
+11 -5
toonz/sources/toonz/cellselectioncommand.cpp
file modified
+12 -9
toonz/sources/toonz/cleanupsettingsmodel.cpp
file modified
+8 -8
toonz/sources/toonz/colormodelviewer.cpp
file modified
+13 -13
toonz/sources/toonz/columncommand.cpp
file modified
+19 -7
toonz/sources/toonz/columnselection.cpp
file modified
+14 -3
toonz/sources/toonz/comboviewerpane.cpp
file modified
+6 -3
toonz/sources/toonz/commandbarpopup.cpp
file modified
+1 -1
toonz/sources/toonz/curveio.cpp
file modified
+7 -6
toonz/sources/toonz/dvdirtreeview.cpp
file modified
+19 -17
toonz/sources/toonz/dvitemview.cpp
file modified
+8 -5
toonz/sources/toonz/filebrowser.cpp
file modified
+36 -0
toonz/sources/toonz/filebrowser.h
file modified
+2 -0
toonz/sources/toonz/filebrowsermodel.cpp
file modified
+18 -17
toonz/sources/toonz/filebrowserpopup.cpp
file modified
+1 -1
toonz/sources/toonz/filedata.cpp
file modified
+3 -2
toonz/sources/toonz/fileselection.cpp
file modified
+6 -6
toonz/sources/toonz/filmstrip.cpp
file modified
+18 -7
toonz/sources/toonz/filmstripcommand.cpp
file modified
+28 -29
toonz/sources/toonz/floatingpanelcommand.cpp
file modified
+1 -0
toonz/sources/toonz/frameheadgadget.h
file modified
+1 -0
toonz/sources/toonz/fxparameditorpopup.cpp
file modified
+2 -1
toonz/sources/toonz/imageviewer.cpp
file modified
+431 -103
toonz/sources/toonz/imageviewer.h
file modified
+26 -1
toonz/sources/toonz/iocommand.cpp
file modified
+118 -54
toonz/sources/toonz/iocommand.h
file modified
+7 -6
toonz/sources/toonz/keyframedata.cpp
file modified
+73 -5
toonz/sources/toonz/keyframemover.cpp
file modified
+24 -10
toonz/sources/toonz/keyframeselection.cpp
file modified
+14 -11
toonz/sources/toonz/layerheaderpanel.cpp
file modified
+4 -2
toonz/sources/toonz/levelcommand.cpp
file modified
+2 -2
toonz/sources/toonz/levelcreatepopup.cpp
file modified
+9 -5
toonz/sources/toonz/lipsyncpopup.cpp
file modified
+2 -2
toonz/sources/toonz/loadfoldercommand.cpp
file modified
+7 -5
toonz/sources/toonz/magpiefileimportpopup.cpp
file modified
+10 -8
toonz/sources/toonz/main.cpp
file modified
+18 -7
toonz/sources/toonz/mainwindow.cpp
file modified
+208 -23
toonz/sources/toonz/mainwindow.h
file modified
+9 -1
toonz/sources/toonz/matchlinecommand.cpp
file modified
+26 -28
toonz/sources/toonz/menubar.cpp
file modified
+192 -125
toonz/sources/toonz/menubarcommandids.h
file modified
+5 -0
toonz/sources/toonz/outputsettingspopup.cpp
file modified
+10 -7
toonz/sources/toonz/pane.cpp
file modified
+50 -6
toonz/sources/toonz/pane.h
file modified
+3 -1
toonz/sources/toonz/penciltestpopup.cpp
file modified
+662 -204
toonz/sources/toonz/penciltestpopup.h
file modified
+129 -22
toonz/sources/toonz/preferencespopup.cpp
file modified
+119 -36
toonz/sources/toonz/preferencespopup.h
file modified
+15 -10
toonz/sources/toonz/previewer.cpp
file modified
+40 -36
toonz/sources/toonz/projectpopup.cpp
file modified
+11 -10
toonz/sources/toonz/psdsettingspopup.cpp
file modified
+17 -15
toonz/sources/toonz/psdsettingspopup.h
file modified
+1 -1
toonz/sources/toonz/reframepopup.cpp
file modified
+7 -3
toonz/sources/toonz/reframepopup.h
file modified
+3 -0
toonz/sources/toonz/rendercommand.cpp
file modified
+53 -29
toonz/sources/toonz/ruler.cpp
file modified
+44 -35
toonz/sources/toonz/scenesettingspopup.cpp
file modified
+2 -0
toonz/sources/toonz/sceneviewer.cpp
file modified
+181 -29
toonz/sources/toonz/sceneviewer.h
file modified
+14 -6
toonz/sources/toonz/sceneviewercontextmenu.cpp
file modified
+37 -6
toonz/sources/toonz/sceneviewerevents.cpp
file modified
+102 -78
toonz/sources/toonz/startuppopup.cpp
file modified
+40 -9
toonz/sources/toonz/svncommitdialog.cpp
file modified
+14 -5
toonz/sources/toonz/svndeletedialog.cpp
file modified
+12 -1
toonz/sources/toonz/svnlockdialog.cpp
file modified
+15 -13
toonz/sources/toonz/svnlockframerangedialog.cpp
file modified
+20 -6
toonz/sources/toonz/svnrevertdialog.cpp
file modified
+6 -1
toonz/sources/toonz/svnupdateandlockdialog.cpp
file modified
+2 -0
toonz/sources/toonz/svnupdatedialog.cpp
file modified
+2 -0
toonz/sources/toonz/tapp.cpp
file modified
+8 -2
toonz/sources/toonz/tapp.h
file modified
+1 -1
toonz/sources/toonz/tasksviewer.cpp
file modified
+1 -1
toonz/sources/toonz/toonz.qrc
file modified
+2 -0
toonz/sources/toonz/tpanels.cpp
file modified
+71 -0
toonz/sources/toonz/tpanels.h
file modified
+18 -0
toonz/sources/toonz/vcrcommand.cpp
file modified
+64 -0
toonz/sources/toonz/vectorizerpopup.cpp
file modified
+18 -4
toonz/sources/toonz/vectorizerswatch.cpp
file modified
+34 -7
toonz/sources/toonz/vectorizerswatch.h
file modified
+7 -1
toonz/sources/toonz/versioncontrol.cpp
file modified
+30 -4
toonz/sources/toonz/versioncontroltimeline.cpp
file modified
+26 -25
toonz/sources/toonz/viewerpane.cpp
file modified
+5 -2
toonz/sources/toonz/xshcellmover.cpp
file modified
+3 -6
toonz/sources/toonz/xshcellviewer.cpp
file modified
+198 -166
toonz/sources/toonz/xshcolumnviewer.cpp
file modified
+291 -135
toonz/sources/toonz/xshcolumnviewer.h
file modified
+56 -0
toonz/sources/toonz/xsheetcmd.cpp
file modified
+172 -138
toonz/sources/toonz/xsheetdragtool.cpp
file modified
+92 -28
toonz/sources/toonz/xsheetdragtool.h
file modified
+1 -0
toonz/sources/toonz/xsheetviewer.cpp
file modified
+69 -29
toonz/sources/toonz/xsheetviewer.h
file modified
+38 -0
toonz/sources/toonz/xshrowviewer.cpp
file modified
+100 -40
toonz/sources/toonzfarm/tfarm/CMakeLists.txt
file modified
+3 -3
toonz/sources/toonzfarm/tfarm/tfarmtask.cpp
file modified
+5 -5
toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
file modified
+5 -5
toonz/sources/toonzlib/CMakeLists.txt
file modified
+3 -3
toonz/sources/toonzlib/Naa2TlvConverter.cpp
file modified
+3 -3
toonz/sources/toonzlib/avicodecrestrictions.cpp
file modified
+4 -1
toonz/sources/toonzlib/boardsettings.cpp
file modified
+1 -1
toonz/sources/toonzlib/cellpositionratio.cpp
file modified
+4 -2
toonz/sources/toonzlib/cleanuppalette.cpp
file modified
+2 -2
toonz/sources/toonzlib/columnfan.cpp
file modified
+42 -8
toonz/sources/toonzlib/doubleparamcmd.cpp
file modified
+27 -14
toonz/sources/toonzlib/fill.cpp
file modified
+217 -3
toonz/sources/toonzlib/fxcommand.cpp
file modified
+23 -33
toonz/sources/toonzlib/ikjacobian.cpp
file modified
+4 -4
toonz/sources/toonzlib/imagepainter.cpp
file modified
+21 -15
toonz/sources/toonzlib/levelupdater.cpp
file modified
+1 -1
toonz/sources/toonzlib/movierenderer.cpp
file modified
+2 -2
toonz/sources/toonzlib/mypaintbrushstyle.cpp
file modified
+173 -72
toonz/sources/toonzlib/orientation.cpp
file modified
+121 -60
toonz/sources/toonzlib/palettecmd.cpp
file modified
+6 -6
toonz/sources/toonzlib/preferences.cpp
file modified
+38 -19
toonz/sources/toonzlib/sandor_fxs/CallCircle.cpp
file modified
+1 -1
toonz/sources/toonzlib/sandor_fxs/STPic.h
file modified
+1 -1
toonz/sources/toonzlib/sandor_fxs/blend.cpp
file modified
+1 -1
toonz/sources/toonzlib/stage.cpp
file modified
+4 -4
toonz/sources/toonzlib/stagevisitor.cpp
file modified
+1 -1
toonz/sources/toonzlib/studiopalette.cpp
file modified
+7 -0
toonz/sources/toonzlib/stylemanager.cpp
file modified
+48 -10
toonz/sources/toonzlib/tbinarizer.cpp
file modified
+8 -8
toonz/sources/toonzlib/tcenterlineadjustments.cpp
file modified
+1 -1
toonz/sources/toonzlib/tcenterlinecolors.cpp
file modified
+16 -15
toonz/sources/toonzlib/tcenterlinepolygonizer.cpp
file modified
+1 -1
toonz/sources/toonzlib/tcenterlineskeletonizer.cpp
file modified
+3 -3
toonz/sources/toonzlib/tcenterlinetostrokes.cpp
file modified
+3 -3
toonz/sources/toonzlib/tcenterlinevectP.h
file modified
+4 -4
toonz/sources/toonzlib/tcleanupper.cpp
file modified
+4 -4
toonz/sources/toonzlib/tcolumnfx.cpp
file modified
+2 -2
toonz/sources/toonzlib/tdistort.cpp
file modified
+3 -5
toonz/sources/toonzlib/toonzfolders.cpp
file modified
+12 -5
toonz/sources/toonzlib/toonzscene.cpp
file modified
+24 -60
toonz/sources/toonzlib/tpalettehandle.cpp
file modified
+17 -2
toonz/sources/toonzlib/tproject.cpp
file modified
+26 -19
toonz/sources/toonzlib/tstageobject.cpp
file modified
+1 -1
toonz/sources/toonzlib/tstageobjectcmd.cpp
file modified
+4 -0
toonz/sources/toonzlib/tstageobjecttree.cpp
file modified
+21 -2
toonz/sources/toonzlib/ttileset.cpp
file modified
+10 -0
toonz/sources/toonzlib/txshcolumn.cpp
file modified
+1 -1
toonz/sources/toonzlib/txsheet.cpp
file modified
+25 -13
toonz/sources/toonzlib/txsheetexpr.cpp
file modified
+5 -7
toonz/sources/toonzlib/txshlevelcolumn.cpp
file modified
+1 -1
toonz/sources/toonzlib/txshpalettelevel.cpp
file modified
+5 -0
toonz/sources/toonzlib/txshsimplelevel.cpp
file modified
+111 -30
toonz/sources/toonzlib/txshsoundtextcolumn.cpp
file modified
+1 -1
toonz/sources/toonzqt/CMakeLists.txt
file modified
+3 -1
toonz/sources/toonzqt/Resources/camera_off.svg
file modified
+6 -24
toonz/sources/toonzqt/Resources/camera_on.svg
file modified
+6 -24
toonz/sources/toonzqt/Resources/schematic_hand_mode_off.svg
file added
+76
toonz/sources/toonzqt/Resources/schematic_hand_mode_on.svg
file added
+80
toonz/sources/toonzqt/Resources/schematic_selection_mode_off.svg
file added
+37
toonz/sources/toonzqt/Resources/schematic_selection_mode_on.svg
file added
+37
toonz/sources/toonzqt/Resources/schematic_zoom_mode_off.svg
file added
+49
toonz/sources/toonzqt/Resources/schematic_zoom_mode_on.svg
file added
+49
toonz/sources/toonzqt/colorfield.cpp
file modified
+17 -9
toonz/sources/toonzqt/combohistogram.cpp
file modified
+10 -10
toonz/sources/toonzqt/docklayout.cpp
file modified
+24 -1
toonz/sources/toonzqt/doublefield.cpp
file modified
+62 -23
toonz/sources/toonzqt/doublepairfield.cpp
file modified
+40 -10
toonz/sources/toonzqt/dvdialog.cpp
file modified
+51 -59
toonz/sources/toonzqt/dvtextedit.cpp
file modified
+3 -3
toonz/sources/toonzqt/expressionfield.cpp
file modified
+1 -1
toonz/sources/toonzqt/flipconsole.cpp
file modified
+27 -28
toonz/sources/toonzqt/functionpanel.cpp
file modified
+4 -4
toonz/sources/toonzqt/functionsegmentviewer.cpp
file modified
+32 -33
toonz/sources/toonzqt/functionselection.cpp
file modified
+130 -6
toonz/sources/toonzqt/functionsheet.cpp
file modified
+273 -128
toonz/sources/toonzqt/functiontoolbar.cpp
file modified
+10 -0
toonz/sources/toonzqt/functiontreeviewer.cpp
file modified
+0 -25
toonz/sources/toonzqt/functionviewer.cpp
file modified
+25 -3
toonz/sources/toonzqt/fxschematicnode.cpp
file modified
+90 -10
toonz/sources/toonzqt/fxschematicscene.cpp
file modified
+10 -1
toonz/sources/toonzqt/fxselection.cpp
file modified
+1 -0
toonz/sources/toonzqt/fxsettings.cpp
file modified
+42 -28
toonz/sources/toonzqt/imageutils.cpp
file modified
+30 -13
toonz/sources/toonzqt/infoviewer.cpp
file modified
+4 -4
toonz/sources/toonzqt/intfield.cpp
file modified
+61 -9
toonz/sources/toonzqt/intpairfield.cpp
file modified
+40 -10
toonz/sources/toonzqt/keyframenavigator.cpp
file modified
+28 -1
toonz/sources/toonzqt/lutcalibrator.cpp
file modified
+6 -3
toonz/sources/toonzqt/paletteviewer.cpp
file modified
+89 -57
toonz/sources/toonzqt/paletteviewergui.cpp
file modified
+10 -2
toonz/sources/toonzqt/paramfield.cpp
file modified
+59 -24
toonz/sources/toonzqt/planeviewer.cpp
file modified
+331 -10
toonz/sources/toonzqt/plugin_param_traits.h
file modified
+1 -1
toonz/sources/toonzqt/schematicnode.cpp
file modified
+9 -4
toonz/sources/toonzqt/schematicviewer.cpp
file modified
+428 -44
toonz/sources/toonzqt/spreadsheetviewer.cpp
file modified
+6 -6
toonz/sources/toonzqt/stageschematicnode.cpp
file modified
+5 -3
toonz/sources/toonzqt/studiopaletteviewer.cpp
file modified
+52 -62
toonz/sources/toonzqt/styleeditor.cpp
file modified
+33 -19
toonz/sources/toonzqt/swatchviewer.cpp
file modified
+326 -16
toonz/sources/toonzqt/toonzqt.qrc
file modified
+6 -0
toonz/sources/translations/chinese/tnztools.ts
file modified
+28 -0
toonz/sources/translations/chinese/toonz.ts
file modified
+384 -39
toonz/sources/translations/chinese/toonzqt.ts
file modified
+137 -11
toonz/sources/translations/czech/colorfx.ts
file added
+875
toonz/sources/translations/czech/image.ts
file added
+353
toonz/sources/translations/czech/tnzcore.ts
file added
+97
toonz/sources/translations/czech/tnztools.ts
file added
+2016
toonz/sources/translations/czech/toonz.ts
file added
+13133
toonz/sources/translations/czech/toonzlib.ts
file added
+894
toonz/sources/translations/czech/toonzqt.ts
file added
+3109
toonz/sources/translations/french/tnztools.ts
file modified
+28 -0
toonz/sources/translations/french/toonz.ts
file modified
+374 -51
toonz/sources/translations/french/toonzqt.ts
file modified
+127 -20
toonz/sources/translations/german/tnztools.ts
file modified
+28 -0
toonz/sources/translations/german/toonz.ts
file modified
+374 -51
toonz/sources/translations/german/toonzqt.ts
file modified
+128 -14
toonz/sources/translations/italian/tnztools.ts
file modified
+28 -0
toonz/sources/translations/italian/toonz.ts
file modified
+374 -51
toonz/sources/translations/italian/toonzqt.ts
file modified
+128 -14
toonz/sources/translations/japanese/tnztools.ts
file modified
+28 -0
toonz/sources/translations/japanese/toonz.ts
file modified
+386 -40
toonz/sources/translations/japanese/toonzqt.ts
file modified
+134 -12
toonz/sources/translations/korean/colorfx.ts
file modified
+148 -296
toonz/sources/translations/korean/image.ts
file modified
+65 -125
toonz/sources/translations/korean/tnzcore.ts
file modified
+42 -31
toonz/sources/translations/korean/tnztools.ts
file modified
+409 -764
toonz/sources/translations/korean/toonz.ts
file modified
+3429 -5899
toonz/sources/translations/korean/toonzlib.ts
file modified
+451 -348
toonz/sources/translations/korean/toonzqt.ts
file modified
+839 -1134
toonz/sources/translations/russian/tnzcore.ts
file modified
+1 -1
toonz/sources/translations/russian/tnztools.ts
file modified
+126 -94
toonz/sources/translations/russian/toonz.ts
file modified
+1454 -1051
toonz/sources/translations/russian/toonzlib.ts
file modified
+23 -23
toonz/sources/translations/russian/toonzqt.ts
file modified
+404 -262
toonz/sources/translations/spanish/tnztools.ts
file modified
+28 -0
toonz/sources/translations/spanish/toonz.ts
file modified
+384 -39
toonz/sources/translations/spanish/toonzqt.ts
file modified
+137 -11
toonz/sources/translations_docs/english/AddIno.tex
file added
+46
toonz/sources/translations_docs/english/BlurIno.tex
file added
+46
toonz/sources/translations_docs/english/ChannelSelectorIno.tex
file added
+80
toonz/sources/translations_docs/english/ColorBurnIno.tex
file added
+46
toonz/sources/translations_docs/english/ColorDodgeIno.tex
file added
+46
toonz/sources/translations_docs/english/CrossDissolveIno.tex
file added
+46
toonz/sources/translations_docs/english/DarkenIno.tex
file added
+44
toonz/sources/translations_docs/english/DarkerColorIno.tex
file added
+44
toonz/sources/translations_docs/english/DensityIno.tex
file added
+48
toonz/sources/translations_docs/english/DivideIno.tex
file added
+46
toonz/sources/translations_docs/english/FogIno.tex
file added
+103
toonz/sources/translations_docs/english/HLSAddIno.tex
file added
+101
toonz/sources/translations_docs/english/HLSAdjustIno.tex
file added
+98
toonz/sources/translations_docs/english/HLSNoiseIno.tex
file added
+422
toonz/sources/translations_docs/english/HSVAddIno.tex
file added
+101
toonz/sources/translations_docs/english/HSVAdjustIno.tex
file added
+98
toonz/sources/translations_docs/english/HSVNoiseIno.tex
file added
+422
toonz/sources/translations_docs/english/HardLightIno.tex
file added
+44
toonz/sources/translations_docs/english/HardMixIno.tex
file added
+46
toonz/sources/translations_docs/english/LevelAutoIno.tex
file added
+142
toonz/sources/translations_docs/english/LevelMasterIno.tex
file added
+77
toonz/sources/translations_docs/english/LevelRGBAIno.tex
file added
+80
toonz/sources/translations_docs/english/LightenIno.tex
file added
+44
toonz/sources/translations_docs/english/LighterColorIno.tex
file added
+44
toonz/sources/translations_docs/english/LinearBurnIno.tex
file added
+46
toonz/sources/translations_docs/english/LinearDodgeIno.tex
file added
+45
toonz/sources/translations_docs/english/LinearLightIno.tex
file added
+37
toonz/sources/translations_docs/english/MaxMinIno.tex
file added
+87
toonz/sources/translations_docs/english/MedianIno.tex
file added
+70
toonz/sources/translations_docs/english/MotionBlurIno.tex
file added
+104
toonz/sources/translations_docs/english/MotionWindIno.tex
file added
+333
toonz/sources/translations_docs/english/MultiplyIno.tex
file added
+46
toonz/sources/translations_docs/english/NegateIno.tex
file added
+48
toonz/sources/translations_docs/english/OverIno.tex
file added
+44
toonz/sources/translations_docs/english/OverlayIno.tex
file added
+46
toonz/sources/translations_docs/english/PNCloudsIno.tex
file added
+55
toonz/sources/translations_docs/english/PinLightIno.tex
file added
+46
toonz/sources/translations_docs/english/RadialBlurIno.tex
file added
+131
toonz/sources/translations_docs/english/ScreenIno.tex
file added
+46
toonz/sources/translations_docs/english/SoftLightIno.tex
file added
+52
toonz/sources/translations_docs/english/SpinBlurIno.tex
file added
+134
toonz/sources/translations_docs/english/SubtractIno.tex
file added
+47
toonz/sources/translations_docs/english/VividLightIno.tex
file added
+46
toonz/sources/translations_docs/english/WarpHVIno.tex
file added
+70
toonz/sources/translations_docs/english/fonts/ipaexm.ttf
file added
+0
toonz/sources/translations_docs/english/images/HLSNoiseInoNoiseEffectEffectiveZero.png
file added
+0
toonz/sources/translations_docs/english/images/HLSNoiseInoNoiseEffectKeepContrast.png
file added
+0
toonz/sources/translations_docs/english/images/HLSNoiseInoNoiseEffectKeepNoise.png
file added
+0
toonz/sources/translations_docs/english/images/HLSNoiseInoNoiseEffectOriginal.png
file added
+0
toonz/sources/translations_docs/english/images/HSVNoiseInoNoiseEffectEffectiveZero.png
file added
+0
toonz/sources/translations_docs/english/images/HSVNoiseInoNoiseEffectKeepContrast.png
file added
+0
toonz/sources/translations_docs/english/images/HSVNoiseInoNoiseEffectKeepNoise.png
file added
+0
toonz/sources/translations_docs/english/images/HSVNoiseInoNoiseEffectOriginal.png
file added
+0
toonz/sources/translations_docs/english/images/MotionWindInoFunction1LengthWindA.png
file added
+0
toonz/sources/translations_docs/english/images/MotionWindInoFunction1LengthWindB.png
file added
+0
toonz/sources/translations_docs/english/images/MotionWindInoFunction1LengthWindC.png
file added
+0
toonz/sources/translations_docs/english/images/MotionWindInoFunction2MotionWindA.png
file added
+0
toonz/sources/translations_docs/english/images/MotionWindInoFunction2MotionWindB.png
file added
+0
toonz/sources/translations_docs/english/images/MotionWindInoFunction2MotionWindC.png
file added
+0
toonz/sources/translations_docs/english/images/MotionWindInoFunction3DensityWindA.png
file added
+0
toonz/sources/translations_docs/english/images/MotionWindInoFunction3DensityWindB.png
file added
+0
toonz/sources/translations_docs/english/images/MotionWindInoFunction3DensityWindC.png
file added
+0
toonz/sources/translations_docs/english/images/MotionWindInoFunction4.png
file added
+0
toonz/sources/translations_docs/english/images/MotionWindInoFunction5.png
file added
+0
toonz/sources/translations_docs/english/images/MotionWindInoFunction6.png
file added
+0
toonz/sources/translations_docs/english/images/MotionWindInoFunction7.png
file added
+0
toonz/sources/translations_docs/english/images/RadialBlurInoOriginalImage.png
file added
+0
toonz/sources/translations_docs/english/images/RadialBlurInoRadialBlur30AAOFF.png
file added
+0
toonz/sources/translations_docs/english/images/RadialBlurInoRadialBlur30AAON.png
file added
+0
toonz/sources/translations_docs/english/images/RadialBlurInoTwistBlur20Twist45AAOFF.png
file added
+0
toonz/sources/translations_docs/english/images/RadialBlurInoTwistBlur20Twist45AAON.png
file added
+0
toonz/sources/translations_docs/english/images/SpinBlurInoAcceleratorBlur11AAOFF.png
file added
+0
toonz/sources/translations_docs/english/images/SpinBlurInoAcceleratorBlur11AAON.png
file added
+0
toonz/sources/translations_docs/english/images/SpinBlurInoOriginalImage.png
file added
+0
toonz/sources/translations_docs/english/images/SpinBlurInoUniformBlur11AAOFF.png
file added
+0
toonz/sources/translations_docs/english/images/SpinBlurInoUniformBlur11AAON.png
file added
+0
toonz/sources/translations_docs/japanese/AddIno.tex
file added
+46
toonz/sources/translations_docs/japanese/BlurIno.tex
file added
+46
toonz/sources/translations_docs/japanese/ChannelSelectorIno.tex
file added
+80
toonz/sources/translations_docs/japanese/ColorBurnIno.tex
file added
+46
toonz/sources/translations_docs/japanese/ColorDodgeIno.tex
file added
+46
toonz/sources/translations_docs/japanese/CrossDissolveIno.tex
file added
+46
toonz/sources/translations_docs/japanese/DarkenIno.tex
file added
+44
toonz/sources/translations_docs/japanese/DarkerColorIno.tex
file added
+44
toonz/sources/translations_docs/japanese/DensityIno.tex
file added
+48
toonz/sources/translations_docs/japanese/DivideIno.tex
file added
+46
toonz/sources/translations_docs/japanese/FogIno.tex
file added
+103
toonz/sources/translations_docs/japanese/HLSAddIno.tex
file added
+100
toonz/sources/translations_docs/japanese/HLSAdjustIno.tex
file added
+98
toonz/sources/translations_docs/japanese/HLSNoiseIno.tex
file added
+422
toonz/sources/translations_docs/japanese/HSVAddIno.tex
file added
+100
toonz/sources/translations_docs/japanese/HSVAdjustIno.tex
file added
+98
toonz/sources/translations_docs/japanese/HSVNoiseIno.tex
file added
+422
toonz/sources/translations_docs/japanese/HardLightIno.tex
file added
+44
toonz/sources/translations_docs/japanese/HardMixIno.tex
file added
+46
toonz/sources/translations_docs/japanese/LevelAutoIno.tex
file added
+142
toonz/sources/translations_docs/japanese/LevelMasterIno.tex
file added
+77
toonz/sources/translations_docs/japanese/LevelRGBAIno.tex
file added
+80
toonz/sources/translations_docs/japanese/LightenIno.tex
file added
+44
toonz/sources/translations_docs/japanese/LighterColorIno.tex
file added
+44
toonz/sources/translations_docs/japanese/LinearBurnIno.tex
file added
+46
toonz/sources/translations_docs/japanese/LinearDodgeIno.tex
file added
+45
toonz/sources/translations_docs/japanese/LinearLightIno.tex
file added
+37
toonz/sources/translations_docs/japanese/MaxMinIno.tex
file added
+87
toonz/sources/translations_docs/japanese/MedianIno.tex
file added
+70
toonz/sources/translations_docs/japanese/MotionBlurIno.tex
file added
+104
toonz/sources/translations_docs/japanese/MotionWindIno.tex
file added
+333
toonz/sources/translations_docs/japanese/MultiplyIno.tex
file added
+46
toonz/sources/translations_docs/japanese/NegateIno.tex
file added
+48
toonz/sources/translations_docs/japanese/OverIno.tex
file added
+44
toonz/sources/translations_docs/japanese/OverlayIno.tex
file added
+46
toonz/sources/translations_docs/japanese/PNCloudsIno.tex
file added
+55
toonz/sources/translations_docs/japanese/PinLightIno.tex
file added
+46
toonz/sources/translations_docs/japanese/RadialBlurIno.tex
file added
+131
toonz/sources/translations_docs/japanese/ScreenIno.tex
file added
+46
toonz/sources/translations_docs/japanese/SoftLightIno.tex
file added
+52
toonz/sources/translations_docs/japanese/SpinBlurIno.tex
file added
+134
toonz/sources/translations_docs/japanese/SubtractIno.tex
file added
+47
toonz/sources/translations_docs/japanese/VividLightIno.tex
file added
+46
toonz/sources/translations_docs/japanese/WarpHVIno.tex
file added
+70
toonz/sources/translations_docs/japanese/fonts/ipaexm.ttf
file added
+0
toonz/sources/translations_docs/japanese/images/HLSNoiseInoNoiseEffectEffectiveZero.png
file added
+0
toonz/sources/translations_docs/japanese/images/HLSNoiseInoNoiseEffectKeepContrast.png
file added
+0
toonz/sources/translations_docs/japanese/images/HLSNoiseInoNoiseEffectKeepNoise.png
file added
+0
toonz/sources/translations_docs/japanese/images/HLSNoiseInoNoiseEffectOriginal.png
file added
+0
toonz/sources/translations_docs/japanese/images/HSVNoiseInoNoiseEffectEffectiveZero.png
file added
+0
toonz/sources/translations_docs/japanese/images/HSVNoiseInoNoiseEffectKeepContrast.png
file added
+0
toonz/sources/translations_docs/japanese/images/HSVNoiseInoNoiseEffectKeepNoise.png
file added
+0
toonz/sources/translations_docs/japanese/images/HSVNoiseInoNoiseEffectOriginal.png
file added
+0
toonz/sources/translations_docs/japanese/images/MotionWindInoFunction1LengthWindA.png
file added
+0
toonz/sources/translations_docs/japanese/images/MotionWindInoFunction1LengthWindB.png
file added
+0
toonz/sources/translations_docs/japanese/images/MotionWindInoFunction1LengthWindC.png
file added
+0
toonz/sources/translations_docs/japanese/images/MotionWindInoFunction2MotionWindA.png
file added
+0
toonz/sources/translations_docs/japanese/images/MotionWindInoFunction2MotionWindB.png
file added
+0
toonz/sources/translations_docs/japanese/images/MotionWindInoFunction2MotionWindC.png
file added
+0
toonz/sources/translations_docs/japanese/images/MotionWindInoFunction3DensityWindA.png
file added
+0
toonz/sources/translations_docs/japanese/images/MotionWindInoFunction3DensityWindB.png
file added
+0
toonz/sources/translations_docs/japanese/images/MotionWindInoFunction3DensityWindC.png
file added
+0
toonz/sources/translations_docs/japanese/images/MotionWindInoFunction4.png
file added
+0
toonz/sources/translations_docs/japanese/images/MotionWindInoFunction5.png
file added
+0
toonz/sources/translations_docs/japanese/images/MotionWindInoFunction6.png
file added
+0
toonz/sources/translations_docs/japanese/images/MotionWindInoFunction7.png
file added
+0
toonz/sources/translations_docs/japanese/images/RadialBlurInoOriginalImage.png
file added
+0
toonz/sources/translations_docs/japanese/images/RadialBlurInoRadialBlur30AAOFF.png
file added
+0
toonz/sources/translations_docs/japanese/images/RadialBlurInoRadialBlur30AAON.png
file added
+0
toonz/sources/translations_docs/japanese/images/RadialBlurInoTwistBlur20Twist45AAOFF.png
file added
+0
toonz/sources/translations_docs/japanese/images/RadialBlurInoTwistBlur20Twist45AAON.png
file added
+0
toonz/sources/translations_docs/japanese/images/SpinBlurInoAcceleratorBlur11AAOFF.png
file added
+0
toonz/sources/translations_docs/japanese/images/SpinBlurInoAcceleratorBlur11AAON.png
file added
+0
toonz/sources/translations_docs/japanese/images/SpinBlurInoOriginalImage.png
file added
+0
toonz/sources/translations_docs/japanese/images/SpinBlurInoUniformBlur11AAOFF.png
file added
+0
toonz/sources/translations_docs/japanese/images/SpinBlurInoUniformBlur11AAON.png
file added
+0
toonz/sources/xdg-data/CMakeLists.txt
file added
+3
toonz/sources/xdg-data/io.github.OpenToonz.appdata.xml
file modified
+2 -1
toonz/sources/xdg-data/io.github.OpenToonz.desktop
file modified
+2 -0
    Resolve OT master conflicts
    
        
file modified
+1 -1
file modified
+16 -7
file modified
+4 -3
file modified
+86 -42
file modified
+18 -0
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
stuff/config/loc/Русский/colorfx.qm stuff/config/loc/Russian (Русский)/colorfx.qm
file renamed
file was renamed with no change to the file
stuff/config/loc/Русский/image.qm stuff/config/loc/Russian (Русский)/image.qm
file renamed
file was renamed with no change to the file
stuff/config/loc/Русский/tnzcore.qm stuff/config/loc/Russian (Русский)/tnzcore.qm
file renamed
file was renamed with no change to the file
stuff/config/loc/Русский/tnztools.qm stuff/config/loc/Russian (Русский)/tnztools.qm
file renamed
file was renamed with no change to the file
stuff/config/loc/Русский/toonz.qm stuff/config/loc/Russian (Русский)/toonz.qm
file renamed
file was renamed with no change to the file
stuff/config/loc/Русский/toonzlib.qm stuff/config/loc/Russian (Русский)/toonzlib.qm
file renamed
file was renamed with no change to the file
stuff/config/loc/Русский/toonzqt.qm stuff/config/loc/Russian (Русский)/toonzqt.qm
file renamed
file was renamed with no change to the file
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+27 -27
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+33 -25
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+28 -28
file modified
+0 -0
file modified
+0 -0
file modified
+24 -24
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+78 -84
empty file added
empty file added
stuff/doc/日本語/BokehIwa.html stuff/doc/BokehIwa.html
file renamed
file was renamed with no change to the file
stuff/doc/日本語/BokehRefIwa.html stuff/doc/BokehRefIwa.html
file renamed
file was renamed with no change to the file
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
stuff/doc/日本語/img/fx_iwa_bokeh.png stuff/doc/img/fx_iwa_bokeh.png
file renamed
file was renamed with no change to the file
stuff/doc/日本語/img/fx_iwa_bokeh_ref.png stuff/doc/img/fx_iwa_bokeh_ref.png
file renamed
file was renamed with no change to the file
empty file added
empty file added
empty file added
empty file added
empty file added
file modified
+1 -1
file modified
+8 -7
file modified
+6 -0
file modified
+2 -2
file modified
+82 -44
file modified
+41 -28
file modified
+18 -7
file modified
+192 -125
file modified
+50 -6
file modified
+3 -1
file modified
+44 -35
file modified
+8 -2
file modified
+1 -1
file modified
+18 -0
file modified
+172 -138
file modified
+217 -3