bw / opentoonz

Clone
Source Code
GIT

34c2db Merged in OT master and resolved conflicts

Merged and Committed by John Dancel 6 years ago
raw patch tree
89d222fa515f7b376558ec4979ed188d16a75e13 a0f8f76edc8b324d5841c5530f084c2eefe9c349
53 files changed. 21125 lines added. 539 lines removed.
ci-scripts/osx/travis-build.sh
file modified
+1 -1
doc/how_to_build_linux.md
file modified
+3 -2
stuff/config/loc/Czech/colorfx.qm
file added
+0
stuff/config/loc/Czech/image.qm
file added
+0
stuff/config/loc/Czech/tnzcore.qm
file added
+0
stuff/config/loc/Czech/tnztools.qm
file added
+0
stuff/config/loc/Czech/toonz.qm
file added
+0
stuff/config/loc/Czech/toonzlib.qm
file added
+0
stuff/config/loc/Czech/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/layouts/popups.less
file modified
+8 -0
stuff/config/qss/Light/Light.qss
file modified
+1 -1
stuff/profiles/layouts/fxs/STD_rgbmCutFx.xml
file modified
+1 -1
toonz/sources/CMakeLists.txt
file modified
+1 -1
toonz/sources/common/tmeshimage/tmeshimage.cpp
file modified
+5 -39
toonz/sources/common/tvectorimage/tcomputeregions.cpp
file modified
+12 -9
toonz/sources/include/tcg/iterator_ops.h
file modified
+0 -153
toonz/sources/include/toonz/tpalettehandle.h
file modified
+1 -1
toonz/sources/tnzext/plasticskeleton.cpp
file modified
+5 -13
toonz/sources/tnztools/plastictool_build.cpp
file modified
+5 -12
toonz/sources/tnztools/plastictool_meshedit.cpp
file modified
+5 -11
toonz/sources/tnztools/toonzrasterbrushtool.cpp
file modified
+5 -0
toonz/sources/toonz/adjustthicknesspopup.cpp
file modified
+10 -15
toonz/sources/toonz/levelcommand.cpp
file modified
+2 -2
toonz/sources/toonz/mainwindow.cpp
file modified
+1 -1
toonz/sources/toonz/outputsettingspopup.cpp
file modified
+10 -7
toonz/sources/toonz/penciltestpopup.cpp
file modified
+598 -177
toonz/sources/toonz/penciltestpopup.h
file modified
+123 -20
toonz/sources/toonz/rendercommand.cpp
file modified
+5 -1
toonz/sources/toonz/scenesettingspopup.cpp
file modified
+2 -0
toonz/sources/toonz/sceneviewer.cpp
file modified
+1 -1
toonz/sources/toonz/sceneviewerevents.cpp
file modified
+8 -8
toonz/sources/toonz/xsheetviewer.cpp
file modified
+20 -8
toonz/sources/toonzlib/fxcommand.cpp
file modified
+18 -31
toonz/sources/toonzlib/imagepainter.cpp
file modified
+21 -15
toonz/sources/toonzlib/tpalettehandle.cpp
file modified
+4 -2
toonz/sources/toonzlib/txshsimplelevel.cpp
file modified
+2 -1
toonz/sources/toonzqt/fxschematicnode.cpp
file modified
+2 -1
toonz/sources/toonzqt/fxselection.cpp
file modified
+1 -0
toonz/sources/toonzqt/imageutils.cpp
file modified
+1 -1
toonz/sources/toonzqt/paletteviewergui.cpp
file modified
+6 -1
toonz/sources/toonzqt/schematicnode.cpp
file modified
+6 -0
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
+1984
toonz/sources/translations/czech/toonz.ts
file added
+12788
toonz/sources/translations/czech/toonzlib.ts
file added
+894
toonz/sources/translations/czech/toonzqt.ts
file added
+2971 
    Merged in OT master and resolved conflicts
file modified
+1 -1
file modified
+3 -2
file added
+0
empty file added
file added
+0
empty file added
file added
+0
empty file added
file added
+0
empty file added
file added
+0
empty file added
file added
+0
empty file added
file added
+0
empty file added
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file added
+133
file added
+133
file modified
+8 -0
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+5 -39
file modified
+12 -9
file modified
+0 -153
file modified
+1 -1
file modified
+5 -13
file modified
+5 -12
file modified
+5 -11
file modified
+5 -0
file modified
+10 -15
file modified
+2 -2
file modified
+1 -1
file modified
+10 -7
file modified
+598 -177
file modified
+123 -20
file modified
+5 -1
file modified
+2 -0
file modified
+1 -1
file modified
+8 -8
file modified
+20 -8
file modified
+18 -31
file modified
+21 -15
file modified
+4 -2
file modified
+2 -1
file modified
+2 -1
file modified
+1 -0
file modified
+1 -1
file modified
+6 -1
file modified
+6 -0
file added
+875
file added
+353
file added
+97
file added
+1984
file added
+12788
file added
+894
file added
+2971

Powered by Pagure 5.11.3

SSH Hostkey/Fingerprint | Documentation | About

© 2014-2019 Red Hat, Inc. and others.

Logo by Pavel Lashutin