Log In
bw
/
opentoonz
Clone
Source Code
GIT
Source
Issues
0
Pull Requests
0
Stats
Overview
Files
Commits
Branches
Forks
Releases
d27488
Fix conflicts with opentoonz master
Merged and Committed by manongjohn
5 years ago
raw
patch
tree
parents
df7b097208ca820b48ecaf0d609f112fafe6d302
b1dada5d176f3e8ec88c51daf09bd331df7291fa
122 files changed.
2174 lines added
.
1228 lines removed
.
appveyor.yml
file modified
+16
-7
doc/how_to_build_linux.md
file modified
+1
-1
doc/how_to_build_macosx.md
file modified
+86
-42
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/less/Default.less
file modified
+6
-0
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/profiles/layouts/rooms/Default/layouts.txt
file modified
+1
-1
stuff/profiles/layouts/rooms/Default/menubar_template.xml
file modified
+3
-1
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/sources/CMakeLists.txt
file modified
+5
-2
toonz/sources/common/tapptools/tenv.cpp
file modified
+11
-9
toonz/sources/include/cellposition.h
file modified
+2
-2
toonz/sources/include/toonz/columnfan.h
file modified
+3
-3
toonz/sources/include/toonz/preferences.h
file modified
+11
-0
toonz/sources/include/toonz/tcolumnhandle.h
file modified
+1
-0
toonz/sources/include/toonz/tstageobjecttree.h
file modified
+10
-8
toonz/sources/include/toonz/txsheet.h
file modified
+9
-0
toonz/sources/include/toonz/txsheethandle.h
file modified
+2
-0
toonz/sources/include/toonzqt/colorfield.h
file modified
+1
-0
toonz/sources/include/toonzqt/paramfield.h
file modified
+8
-7
toonz/sources/include/tversion.h
file modified
+12
-0
toonz/sources/tcleanupper/tcleanupper.cpp
file modified
+8
-2
toonz/sources/tcomposer/tcomposer.cpp
file modified
+5
-0
toonz/sources/tnzbase/CMakeLists.txt
file modified
+1
-1
toonz/sources/tnzext/CMakeLists.txt
file modified
+2
-2
toonz/sources/tnztools/controlpointeditortool.cpp
file modified
+2
-1
toonz/sources/tnztools/edittool.cpp
file modified
+7
-4
toonz/sources/tnztools/edittoolgadgets.cpp
file modified
+2
-1
toonz/sources/tnztools/fullcolorbrushtool.cpp
file modified
+45
-18
toonz/sources/tnztools/fullcolorbrushtool.h
file modified
+4
-0
toonz/sources/tnztools/tool.cpp
file modified
+5
-0
toonz/sources/tnztools/tooloptions.cpp
file modified
+5
-0
toonz/sources/tnztools/toonzrasterbrushtool.cpp
file modified
+46
-23
toonz/sources/tnztools/toonzrasterbrushtool.h
file modified
+4
-0
toonz/sources/tnztools/toonzvectorbrushtool.cpp
file modified
+69
-38
toonz/sources/tnztools/toonzvectorbrushtool.h
file modified
+6
-2
toonz/sources/tnztools/typetool.cpp
file modified
+21
-3
toonz/sources/toonz/CMakeLists.txt
file modified
+16
-16
toonz/sources/toonz/Resources/camera.svg
file added
+8
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/cellkeyframeselection.cpp
file modified
+4
-2
toonz/sources/toonz/cellselection.cpp
file modified
+11
-5
toonz/sources/toonz/cellselectioncommand.cpp
file modified
+3
-1
toonz/sources/toonz/columncommand.cpp
file modified
+19
-7
toonz/sources/toonz/columnselection.cpp
file modified
+24
-1
toonz/sources/toonz/columnselection.h
file modified
+1
-0
toonz/sources/toonz/filmstrip.cpp
file modified
+17
-0
toonz/sources/toonz/iocommand.cpp
file modified
+1
-1
toonz/sources/toonz/keyframedata.cpp
file modified
+5
-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/levelcreatepopup.cpp
file modified
+9
-5
toonz/sources/toonz/main.cpp
file modified
+6
-7
toonz/sources/toonz/mainwindow.cpp
file modified
+107
-12
toonz/sources/toonz/mainwindow.h
file modified
+1
-0
toonz/sources/toonz/menubar.cpp
file modified
+3
-1
toonz/sources/toonz/menubarcommandids.h
file modified
+2
-1
toonz/sources/toonz/penciltestpopup.cpp
file modified
+1
-1
toonz/sources/toonz/preferencespopup.cpp
file modified
+35
-11
toonz/sources/toonz/preferencespopup.h
file modified
+4
-3
toonz/sources/toonz/tapp.cpp
file modified
+5
-0
toonz/sources/toonz/toonz.qrc
file modified
+1
-0
toonz/sources/toonz/vectorizerpopup.cpp
file modified
+1
-0
toonz/sources/toonz/xshcellviewer.cpp
file modified
+111
-100
toonz/sources/toonz/xshcolumnviewer.cpp
file modified
+142
-65
toonz/sources/toonz/xshcolumnviewer.h
file modified
+56
-0
toonz/sources/toonz/xsheetcmd.cpp
file modified
+68
-89
toonz/sources/toonz/xsheetdragtool.cpp
file modified
+18
-12
toonz/sources/toonz/xsheetviewer.cpp
file modified
+37
-13
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/toonzlib/CMakeLists.txt
file modified
+3
-3
toonz/sources/toonzlib/columnfan.cpp
file modified
+35
-6
toonz/sources/toonzlib/fxcommand.cpp
file modified
+3
-0
toonz/sources/toonzlib/preferences.cpp
file modified
+22
-12
toonz/sources/toonzlib/toonzfolders.cpp
file modified
+12
-5
toonz/sources/toonzlib/tstageobjectcmd.cpp
file modified
+3
-0
toonz/sources/toonzlib/tstageobjecttree.cpp
file modified
+21
-2
toonz/sources/toonzlib/txsheet.cpp
file modified
+16
-7
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/colorfield.cpp
file modified
+17
-9
toonz/sources/toonzqt/fxsettings.cpp
file modified
+12
-14
toonz/sources/toonzqt/paramfield.cpp
file modified
+59
-24
Fix conflicts with opentoonz master
appveyor.yml
file modified
+16
-7
doc/how_to_build_linux.md
file modified
+1
-1
doc/how_to_build_macosx.md
file modified
+86
-42
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/less/Default.less
file modified
+6
-0
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/profiles/layouts/rooms/Default/layouts.txt
file modified
+1
-1
stuff/profiles/layouts/rooms/Default/menubar_template.xml
file modified
+3
-1
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/sources/CMakeLists.txt
file modified
+5
-2
toonz/sources/common/tapptools/tenv.cpp
file modified
+11
-9
toonz/sources/include/cellposition.h
file modified
+2
-2
toonz/sources/include/toonz/columnfan.h
file modified
+3
-3
toonz/sources/include/toonz/preferences.h
file modified
+11
-0
toonz/sources/include/toonz/tcolumnhandle.h
file modified
+1
-0
toonz/sources/include/toonz/tstageobjecttree.h
file modified
+10
-8
toonz/sources/include/toonz/txsheet.h
file modified
+9
-0
toonz/sources/include/toonz/txsheethandle.h
file modified
+2
-0
toonz/sources/include/toonzqt/colorfield.h
file modified
+1
-0
toonz/sources/include/toonzqt/paramfield.h
file modified
+8
-7
toonz/sources/include/tversion.h
file modified
+12
-0
toonz/sources/tcleanupper/tcleanupper.cpp
file modified
+8
-2
toonz/sources/tcomposer/tcomposer.cpp
file modified
+5
-0
toonz/sources/tnzbase/CMakeLists.txt
file modified
+1
-1
toonz/sources/tnzext/CMakeLists.txt
file modified
+2
-2
toonz/sources/tnztools/controlpointeditortool.cpp
file modified
+2
-1
toonz/sources/tnztools/edittool.cpp
file modified
+7
-4
toonz/sources/tnztools/edittoolgadgets.cpp
file modified
+2
-1
toonz/sources/tnztools/fullcolorbrushtool.cpp
file modified
+45
-18
toonz/sources/tnztools/fullcolorbrushtool.h
file modified
+4
-0
toonz/sources/tnztools/tool.cpp
file modified
+5
-0
toonz/sources/tnztools/tooloptions.cpp
file modified
+5
-0
toonz/sources/tnztools/toonzrasterbrushtool.cpp
file modified
+46
-23
toonz/sources/tnztools/toonzrasterbrushtool.h
file modified
+4
-0
toonz/sources/tnztools/toonzvectorbrushtool.cpp
file modified
+69
-38
toonz/sources/tnztools/toonzvectorbrushtool.h
file modified
+6
-2
toonz/sources/tnztools/typetool.cpp
file modified
+21
-3
toonz/sources/toonz/CMakeLists.txt
file modified
+16
-16
toonz/sources/toonz/Resources/camera.svg
file added
+8
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/cellkeyframeselection.cpp
file modified
+4
-2
toonz/sources/toonz/cellselection.cpp
file modified
+11
-5
toonz/sources/toonz/cellselectioncommand.cpp
file modified
+3
-1
toonz/sources/toonz/columncommand.cpp
file modified
+19
-7
toonz/sources/toonz/columnselection.cpp
file modified
+24
-1
toonz/sources/toonz/columnselection.h
file modified
+1
-0
toonz/sources/toonz/filmstrip.cpp
file modified
+17
-0
toonz/sources/toonz/iocommand.cpp
file modified
+1
-1
toonz/sources/toonz/keyframedata.cpp
file modified
+5
-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/levelcreatepopup.cpp
file modified
+9
-5
toonz/sources/toonz/main.cpp
file modified
+6
-7
toonz/sources/toonz/mainwindow.cpp
file modified
+107
-12
toonz/sources/toonz/mainwindow.h
file modified
+1
-0
toonz/sources/toonz/menubar.cpp
file modified
+3
-1
toonz/sources/toonz/menubarcommandids.h
file modified
+2
-1
toonz/sources/toonz/penciltestpopup.cpp
file modified
+1
-1
toonz/sources/toonz/preferencespopup.cpp
file modified
+35
-11
toonz/sources/toonz/preferencespopup.h
file modified
+4
-3
toonz/sources/toonz/tapp.cpp
file modified
+5
-0
toonz/sources/toonz/toonz.qrc
file modified
+1
-0
toonz/sources/toonz/vectorizerpopup.cpp
file modified
+1
-0
toonz/sources/toonz/xshcellviewer.cpp
file modified
+111
-100
toonz/sources/toonz/xshcolumnviewer.cpp
file modified
+142
-65
toonz/sources/toonz/xshcolumnviewer.h
file modified
+56
-0
toonz/sources/toonz/xsheetcmd.cpp
file modified
+68
-89
toonz/sources/toonz/xsheetdragtool.cpp
file modified
+18
-12
toonz/sources/toonz/xsheetviewer.cpp
file modified
+37
-13
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/toonzlib/CMakeLists.txt
file modified
+3
-3
toonz/sources/toonzlib/columnfan.cpp
file modified
+35
-6
toonz/sources/toonzlib/fxcommand.cpp
file modified
+3
-0
toonz/sources/toonzlib/preferences.cpp
file modified
+22
-12
toonz/sources/toonzlib/toonzfolders.cpp
file modified
+12
-5
toonz/sources/toonzlib/tstageobjectcmd.cpp
file modified
+3
-0
toonz/sources/toonzlib/tstageobjecttree.cpp
file modified
+21
-2
toonz/sources/toonzlib/txsheet.cpp
file modified
+16
-7
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/colorfield.cpp
file modified
+17
-9
toonz/sources/toonzqt/fxsettings.cpp
file modified
+12
-14
toonz/sources/toonzqt/paramfield.cpp
file modified
+59
-24