Log In
bw
/
opentoonz
Clone
Source Code
GIT
Source
Issues
0
Pull Requests
0
Stats
Overview
Files
Commits
Branches
Forks
Releases
bd4e8a
Resolve conflicts with master
Merged and Committed by manongjohn
6 years ago
raw
patch
tree
parents
6ea45db0df676b529758ad26398f03b3a93974dc
4efecdf1385c9a497d8c05c5bea81a33151b0df3
47 files changed.
1259 lines added
.
336 lines removed
.
.travis.yml
file modified
+1
-1
ci-scripts/osx/travis-build.sh
file modified
+1
-1
stuff/config/current.txt
file modified
+14
-0
stuff/profiles/layouts/fxs/STD_iwa_CorridorGradientFx.xml
file added
+18
stuff/profiles/layouts/fxs/fxs.lst
file modified
+1
-0
toonz/sources/common/tfx/tfx.cpp
file modified
+25
-11
toonz/sources/common/tstream/tstream.cpp
file modified
+11
-3
toonz/sources/include/tools/cursors.h
file modified
+1
-0
toonz/sources/include/toonz/txsheet.h
file modified
+3
-3
toonz/sources/include/toonzqt/doublefield.h
file modified
+9
-1
toonz/sources/include/toonzqt/doublepairfield.h
file modified
+3
-0
toonz/sources/include/toonzqt/intfield.h
file modified
+8
-0
toonz/sources/include/toonzqt/intpairfield.h
file modified
+5
-2
toonz/sources/include/tproperty.h
file modified
+18
-3
toonz/sources/include/tstopwatch.h
file modified
+1
-1
toonz/sources/include/tstream.h
file modified
+4
-0
toonz/sources/stdfx/CMakeLists.txt
file modified
+2
-0
toonz/sources/stdfx/freedistortfx.cpp
file modified
+11
-41
toonz/sources/stdfx/iwa_corridorgradientfx.cpp
file added
+378
toonz/sources/stdfx/iwa_corridorgradientfx.h
file added
+31
toonz/sources/tnztools/Resources/pointing_hand.png
file added
+0
toonz/sources/tnztools/cursormanager.cpp
file modified
+2
-0
toonz/sources/tnztools/edittoolgadgets.cpp
file modified
+273
-49
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
+24
-12
toonz/sources/tnztools/fullcolorerasertool.cpp
file modified
+4
-2
toonz/sources/tnztools/magnettool.cpp
file modified
+23
-39
toonz/sources/tnztools/paintbrushtool.cpp
file modified
+5
-3
toonz/sources/tnztools/pinchtool.cpp
file modified
+4
-2
toonz/sources/tnztools/rastererasertool.cpp
file modified
+14
-11
toonz/sources/tnztools/selectiontool.cpp
file modified
+43
-12
toonz/sources/tnztools/strokeselection.cpp
file modified
+17
-9
toonz/sources/tnztools/tnztools.qrc
file modified
+1
-0
toonz/sources/tnztools/tooloptionscontrols.cpp
file modified
+19
-15
toonz/sources/tnztools/toonzrasterbrushtool.cpp
file modified
+15
-12
toonz/sources/tnztools/toonzvectorbrushtool.cpp
file modified
+21
-17
toonz/sources/tnztools/vectorerasertool.cpp
file modified
+11
-9
toonz/sources/toonz/main.cpp
file modified
+14
-5
toonz/sources/toonz/sceneviewerevents.cpp
file modified
+7
-7
toonz/sources/toonzlib/tcenterlinetostrokes.cpp
file modified
+1
-1
toonz/sources/toonzlib/tcleanupper.cpp
file modified
+2
-2
toonz/sources/toonzqt/docklayout.cpp
file modified
+1
-1
toonz/sources/toonzqt/doublefield.cpp
file modified
+57
-22
toonz/sources/toonzqt/doublepairfield.cpp
file modified
+38
-9
toonz/sources/toonzqt/intfield.cpp
file modified
+61
-9
toonz/sources/toonzqt/intpairfield.cpp
file modified
+40
-10
Resolve conflicts with master
.travis.yml
file modified
+1
-1
ci-scripts/osx/travis-build.sh
file modified
+1
-1
stuff/config/current.txt
file modified
+14
-0
stuff/profiles/layouts/fxs/STD_iwa_CorridorGradientFx.xml
file added
+18
stuff/profiles/layouts/fxs/fxs.lst
file modified
+1
-0
toonz/sources/common/tfx/tfx.cpp
file modified
+25
-11
toonz/sources/common/tstream/tstream.cpp
file modified
+11
-3
toonz/sources/include/tools/cursors.h
file modified
+1
-0
toonz/sources/include/toonz/txsheet.h
file modified
+3
-3
toonz/sources/include/toonzqt/doublefield.h
file modified
+9
-1
toonz/sources/include/toonzqt/doublepairfield.h
file modified
+3
-0
toonz/sources/include/toonzqt/intfield.h
file modified
+8
-0
toonz/sources/include/toonzqt/intpairfield.h
file modified
+5
-2
toonz/sources/include/tproperty.h
file modified
+18
-3
toonz/sources/include/tstopwatch.h
file modified
+1
-1
toonz/sources/include/tstream.h
file modified
+4
-0
toonz/sources/stdfx/CMakeLists.txt
file modified
+2
-0
toonz/sources/stdfx/freedistortfx.cpp
file modified
+11
-41
toonz/sources/stdfx/iwa_corridorgradientfx.cpp
file added
+378
toonz/sources/stdfx/iwa_corridorgradientfx.h
file added
+31
toonz/sources/tnztools/Resources/pointing_hand.png
file added
+0
empty file added
toonz/sources/tnztools/cursormanager.cpp
file modified
+2
-0
toonz/sources/tnztools/edittoolgadgets.cpp
file modified
+273
-49
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
+24
-12
toonz/sources/tnztools/fullcolorerasertool.cpp
file modified
+4
-2
toonz/sources/tnztools/magnettool.cpp
file modified
+23
-39
toonz/sources/tnztools/paintbrushtool.cpp
file modified
+5
-3
toonz/sources/tnztools/pinchtool.cpp
file modified
+4
-2
toonz/sources/tnztools/rastererasertool.cpp
file modified
+14
-11
toonz/sources/tnztools/selectiontool.cpp
file modified
+43
-12
toonz/sources/tnztools/strokeselection.cpp
file modified
+17
-9
toonz/sources/tnztools/tnztools.qrc
file modified
+1
-0
toonz/sources/tnztools/tooloptionscontrols.cpp
file modified
+19
-15
toonz/sources/tnztools/toonzrasterbrushtool.cpp
file modified
+15
-12
toonz/sources/tnztools/toonzvectorbrushtool.cpp
file modified
+21
-17
toonz/sources/tnztools/vectorerasertool.cpp
file modified
+11
-9
toonz/sources/toonz/main.cpp
file modified
+14
-5
toonz/sources/toonz/sceneviewerevents.cpp
file modified
+7
-7
toonz/sources/toonzlib/tcenterlinetostrokes.cpp
file modified
+1
-1
toonz/sources/toonzlib/tcleanupper.cpp
file modified
+2
-2
toonz/sources/toonzqt/docklayout.cpp
file modified
+1
-1
toonz/sources/toonzqt/doublefield.cpp
file modified
+57
-22
toonz/sources/toonzqt/doublepairfield.cpp
file modified
+38
-9
toonz/sources/toonzqt/intfield.cpp
file modified
+61
-9
toonz/sources/toonzqt/intpairfield.cpp
file modified
+40
-10
