39e85d Merge remote-tracking branch 'origin' into fix-thirdparty

Merged and Committed by fukasawa 8 years ago
261 files changed. 2602 lines added. 30279 lines removed.
stuff/config/loc/japanese/colorfx.qm
file modified
+0 -0
stuff/config/loc/japanese/tnzcore.qm
file modified
+0 -0
stuff/config/loc/japanese/tnztools.qm
file modified
+0 -0
stuff/config/loc/japanese/toonz.qm
file modified
+0 -0
stuff/config/loc/japanese/toonzlib.qm
file modified
+0 -0
stuff/config/loc/japanese/toonzqt.qm
file modified
+0 -0
stuff/config/qss/dark/bottomseparator.png
file removed
-0
stuff/config/qss/dark/but.png
file removed
-0
stuff/config/qss/dark/butdis.png
file removed
-0
stuff/config/qss/dark/buthover.png
file removed
-0
stuff/config/qss/dark/chk_chk.png
file removed
-0
stuff/config/qss/dark/chk_chk_disabled.png
file removed
-0
stuff/config/qss/dark/chk_unchk.png
file removed
-0
stuff/config/qss/dark/chk_unchk_disabled.png
file removed
-0
stuff/config/qss/dark/click.png
file removed
-0
stuff/config/qss/dark/current.png
file removed
-0
stuff/config/qss/dark/dark.qss
file removed
-1009
stuff/config/qss/dark/dark_mac.qss
file removed
-1049
stuff/config/qss/dark/down_arrow.png
file removed
-0
stuff/config/qss/dark/down_arrow_black.png
file removed
-0
stuff/config/qss/dark/down_arrow_disabled.png
file removed
-0
stuff/config/qss/dark/flipmarker.png
file removed
-0
stuff/config/qss/dark/flipslider.png
file removed
-0
stuff/config/qss/dark/frame.png
file removed
-0
stuff/config/qss/dark/framedisable.png
file removed
-0
stuff/config/qss/dark/framehover.png
file removed
-0
stuff/config/qss/dark/ftab.png
file removed
-0
stuff/config/qss/dark/ftbtab.png
file removed
-0
stuff/config/qss/dark/fuptab.png
file removed
-0
stuff/config/qss/dark/fuptbtab.png
file removed
-0
stuff/config/qss/dark/h_chandle.png
file removed
-0
stuff/config/qss/dark/h_handle.png
file removed
-0
stuff/config/qss/dark/h_handle_disabled.png
file removed
-0
stuff/config/qss/dark/h_slider_left.png
file removed
-0
stuff/config/qss/dark/h_slider_left_disabled.png
file removed
-0
stuff/config/qss/dark/h_slider_right.png
file removed
-0
stuff/config/qss/dark/h_slider_right_disabled.png
file removed
-0
stuff/config/qss/dark/hsplitter_handle.png
file removed
-0
stuff/config/qss/dark/left_arrow_black.png
file removed
-0
stuff/config/qss/dark/ltab.png
file removed
-0
stuff/config/qss/dark/ltbtab.png
file removed
-0
stuff/config/qss/dark/menuseparator.PNG
file removed
-0
stuff/config/qss/dark/oouptab.png
file removed
-0
stuff/config/qss/dark/over.png
file removed
-0
stuff/config/qss/dark/radio.png
file removed
-0
stuff/config/qss/dark/radio_p.png
file removed
-0
stuff/config/qss/dark/right_arrow_black.png
file removed
-0
stuff/config/qss/dark/sb_downarrow.png
file removed
-0
stuff/config/qss/dark/sb_h.png
file removed
-0
stuff/config/qss/dark/sb_hhandle.png
file removed
-0
stuff/config/qss/dark/sb_hline.png
file removed
-0
stuff/config/qss/dark/sb_larrow.png
file removed
-0
stuff/config/qss/dark/sb_rarrow.png
file removed
-0
stuff/config/qss/dark/sb_uparrow.png
file removed
-0
stuff/config/qss/dark/sb_v.png
file removed
-0
stuff/config/qss/dark/sb_vhandle.png
file removed
-0
stuff/config/qss/dark/sb_vline.png
file removed
-0
stuff/config/qss/dark/sl_groove.png
file removed
-0
stuff/config/qss/dark/tab.png
file removed
-0
stuff/config/qss/dark/tbtab.png
file removed
-0
stuff/config/qss/dark/titlebar_horizontal.png
file removed
-0
stuff/config/qss/dark/titlebar_vertical.png
file removed
-0
stuff/config/qss/dark/titlebar_vertical_inactive.png
file removed
-0
stuff/config/qss/dark/up_arrow.png
file removed
-0
stuff/config/qss/dark/up_arrow_black.png
file removed
-0
stuff/config/qss/dark/up_arrow_disabled.png
file removed
-0
stuff/config/qss/dark/uptab.png
file removed
-0
stuff/config/qss/dark/uptbtab.png
file removed
-0
stuff/config/qss/dark/vsplitter_handle.png
file removed
-0
stuff/config/qss/gray_048/gray_048.less
file modified
+8 -7
stuff/config/qss/gray_048/gray_048.qss
file modified
+95 -87
stuff/config/qss/gray_048/gray_048_mac.qss
file modified
+95 -95
stuff/config/qss/gray_072/gray_072.less
file modified
+8 -7
stuff/config/qss/gray_072/gray_072.qss
file modified
+95 -87
stuff/config/qss/gray_072/gray_072_mac.qss
file modified
+95 -87
stuff/config/qss/gray_128/gray_128.less
file modified
+1 -2
stuff/config/qss/gray_128/gray_128.qss
file modified
+76 -76
stuff/config/qss/gray_128/gray_128_mac.qss
file modified
+76 -76
stuff/config/qss/production/Thumbs.db
file removed
-0
stuff/config/qss/production/bottomseparator.png
file removed
-0
stuff/config/qss/production/but.png
file removed
-0
stuff/config/qss/production/butdis.png
file removed
-0
stuff/config/qss/production/buthover.png
file removed
-0
stuff/config/qss/production/chk_chk.png
file removed
-0
stuff/config/qss/production/chk_unchk.png
file removed
-0
stuff/config/qss/production/click.png
file removed
-0
stuff/config/qss/production/current.png
file removed
-0
stuff/config/qss/production/down_arrow.png
file removed
-0
stuff/config/qss/production/down_arrow_black.png
file removed
-0
stuff/config/qss/production/down_arrow_disabled.png
file removed
-0
stuff/config/qss/production/flipmarker.png
file removed
-0
stuff/config/qss/production/flipslider.png
file removed
-0
stuff/config/qss/production/frame.png
file removed
-0
stuff/config/qss/production/framedisable.png
file removed
-0
stuff/config/qss/production/framehover.png
file removed
-0
stuff/config/qss/production/ftab.png
file removed
-0
stuff/config/qss/production/ftbtab.png
file removed
-0
stuff/config/qss/production/fuptab.png
file removed
-0
stuff/config/qss/production/fuptbtab.png
file removed
-0
stuff/config/qss/production/h_chandle.png
file removed
-0
stuff/config/qss/production/h_handle.png
file removed
-0
stuff/config/qss/production/h_slider_left.png
file removed
-0
stuff/config/qss/production/h_slider_right.png
file removed
-0
stuff/config/qss/production/hsplitter_handle.png
file removed
-0
stuff/config/qss/production/left_arrow_black.png
file removed
-0
stuff/config/qss/production/ltab.png
file removed
-0
stuff/config/qss/production/ltbtab.png
file removed
-0
stuff/config/qss/production/menuseparator.PNG
file removed
-0
stuff/config/qss/production/oouptab.png
file removed
-0
stuff/config/qss/production/out_sb_h.png
file removed
-0
stuff/config/qss/production/over.png
file removed
-0
stuff/config/qss/production/production.qss
file removed
-963
stuff/config/qss/production/production_mac.qss
file removed
-998
stuff/config/qss/production/radio.png
file removed
-0
stuff/config/qss/production/radio_p.png
file removed
-0
stuff/config/qss/production/right_arrow_black.png
file removed
-0
stuff/config/qss/production/sb_downarrow.png
file removed
-0
stuff/config/qss/production/sb_h.png
file removed
-0
stuff/config/qss/production/sb_hhandle.png
file removed
-0
stuff/config/qss/production/sb_hline.png
file removed
-0
stuff/config/qss/production/sb_larrow.png
file removed
-0
stuff/config/qss/production/sb_rarrow.png
file removed
-0
stuff/config/qss/production/sb_uparrow.png
file removed
-0
stuff/config/qss/production/sb_v.png
file removed
-0
stuff/config/qss/production/sb_vhandle.png
file removed
-0
stuff/config/qss/production/sb_vline.png
file removed
-0
stuff/config/qss/production/sl_groove.png
file removed
-0
stuff/config/qss/production/tab.png
file removed
-0
stuff/config/qss/production/tbtab.png
file removed
-0
stuff/config/qss/production/titlebar_horizontal.png
file removed
-0
stuff/config/qss/production/titlebar_vertical _inactive.png
file removed
-0
stuff/config/qss/production/titlebar_vertical.png
file removed
-0
stuff/config/qss/production/topfade.png
file removed
-0
stuff/config/qss/production/up_arrow.png
file removed
-0
stuff/config/qss/production/up_arrow_black.png
file removed
-0
stuff/config/qss/production/up_arrow_disabled.png
file removed
-0
stuff/config/qss/production/uptab.png
file removed
-0
stuff/config/qss/production/uptbtab.png
file removed
-0
stuff/config/qss/production/vsplitter_handle.png
file removed
-0
stuff/config/qss/standard/bottomseparator.png
file removed
-0
stuff/config/qss/standard/but.png
file removed
-0
stuff/config/qss/standard/butdis.png
file removed
-0
stuff/config/qss/standard/buthover.png
file removed
-0
stuff/config/qss/standard/chk_chk.png
file removed
-0
stuff/config/qss/standard/chk_chk_disabled.png
file removed
-0
stuff/config/qss/standard/chk_unchk.png
file removed
-0
stuff/config/qss/standard/chk_unchk_disabled.png
file removed
-0
stuff/config/qss/standard/click.png
file removed
-0
stuff/config/qss/standard/current.png
file removed
-0
stuff/config/qss/standard/down_arrow.png
file removed
-0
stuff/config/qss/standard/down_arrow_black.png
file removed
-0
stuff/config/qss/standard/down_arrow_disabled.png
file removed
-0
stuff/config/qss/standard/flipmarker.png
file removed
-0
stuff/config/qss/standard/flipslider.png
file removed
-0
stuff/config/qss/standard/frame.png
file removed
-0
stuff/config/qss/standard/framedisable.png
file removed
-0
stuff/config/qss/standard/framehover.png
file removed
-0
stuff/config/qss/standard/ftab.png
file removed
-0
stuff/config/qss/standard/ftbtab.png
file removed
-0
stuff/config/qss/standard/fuptab.png
file removed
-0
stuff/config/qss/standard/fuptbtab.png
file removed
-0
stuff/config/qss/standard/h_chandle.png
file removed
-0
stuff/config/qss/standard/h_handle.png
file removed
-0
stuff/config/qss/standard/h_handle_disabled.png
file removed
-0
stuff/config/qss/standard/h_slider_left.png
file removed
-0
stuff/config/qss/standard/h_slider_left_disabled.png
file removed
-0
stuff/config/qss/standard/h_slider_right.png
file removed
-0
stuff/config/qss/standard/h_slider_right_disabled.png
file removed
-0
stuff/config/qss/standard/hsplitter_handle.png
file removed
-0
stuff/config/qss/standard/left_arrow_black.png
file removed
-0
stuff/config/qss/standard/ltab.png
file removed
-0
stuff/config/qss/standard/ltbtab.png
file removed
-0
stuff/config/qss/standard/menuseparator.PNG
file removed
-0
stuff/config/qss/standard/oouptab.png
file removed
-0
stuff/config/qss/standard/over.png
file removed
-0
stuff/config/qss/standard/radio.png
file removed
-0
stuff/config/qss/standard/radio_p.png
file removed
-0
stuff/config/qss/standard/right_arrow_black.png
file removed
-0
stuff/config/qss/standard/sb_downarrow.png
file removed
-0
stuff/config/qss/standard/sb_h.png
file removed
-0
stuff/config/qss/standard/sb_hhandle.png
file removed
-0
stuff/config/qss/standard/sb_hline.png
file removed
-0
stuff/config/qss/standard/sb_larrow.png
file removed
-0
stuff/config/qss/standard/sb_rarrow.png
file removed
-0
stuff/config/qss/standard/sb_uparrow.png
file removed
-0
stuff/config/qss/standard/sb_v.png
file removed
-0
stuff/config/qss/standard/sb_vhandle.png
file removed
-0
stuff/config/qss/standard/sb_vline.png
file removed
-0
stuff/config/qss/standard/sl_groove.png
file removed
-0
stuff/config/qss/standard/standard.qss
file removed
-1020
stuff/config/qss/standard/standard_mac.qss
file removed
-1054
stuff/config/qss/standard/tab.png
file removed
-0
stuff/config/qss/standard/tbtab.png
file removed
-0
stuff/config/qss/standard/titlebar_horizontal.png
file removed
-0
stuff/config/qss/standard/titlebar_vertical.png
file removed
-0
stuff/config/qss/standard/titlebar_vertical_inactive.png
file removed
-0
stuff/config/qss/standard/up_arrow.png
file removed
-0
stuff/config/qss/standard/up_arrow_black.png
file removed
-0
stuff/config/qss/standard/up_arrow_disabled.png
file removed
-0
stuff/config/qss/standard/uptab.png
file removed
-0
stuff/config/qss/standard/uptbtab.png
file removed
-0
stuff/config/qss/standard/vsplitter_handle.png
file removed
-0
stuff/plugins/.gitkeep
file added
+0
stuff/toonzfarm/.gitkeep
file added
+0
toonz/sources/common/flash/F3SDK.h
file removed
-32
toonz/sources/common/flash/FAction.cpp
file removed
-842
toonz/sources/common/flash/FAction.h
file removed
-1346
toonz/sources/common/flash/FCT.cpp
file removed
-502
toonz/sources/common/flash/FCT.h
file removed
-302
toonz/sources/common/flash/FDT.cpp
file removed
-20
toonz/sources/common/flash/FDT.h
file removed
-68
toonz/sources/common/flash/FDTBitmaps.cpp
file removed
-295
toonz/sources/common/flash/FDTBitmaps.h
file removed
-196
toonz/sources/common/flash/FDTButtons.cpp
file removed
-411
toonz/sources/common/flash/FDTButtons.h
file removed
-201
toonz/sources/common/flash/FDTFonts.cpp
file removed
-486
toonz/sources/common/flash/FDTFonts.h
file removed
-189
toonz/sources/common/flash/FDTShapes.cpp
file removed
-1771
toonz/sources/common/flash/FDTShapes.h
file removed
-1278
toonz/sources/common/flash/FDTSounds.cpp
file removed
-483
toonz/sources/common/flash/FDTSounds.h
file removed
-216
toonz/sources/common/flash/FDTSprite.cpp
file removed
-74
toonz/sources/common/flash/FDTSprite.h
file removed
-54
toonz/sources/common/flash/FDTText.cpp
file removed
-448
toonz/sources/common/flash/FDTText.h
file removed
-202
toonz/sources/common/flash/FFixed.h
file removed
-56
toonz/sources/common/flash/FObj.cpp
file removed
-246
toonz/sources/common/flash/FObj.h
file removed
-120
toonz/sources/common/flash/FPrimitive.cpp
file removed
-268
toonz/sources/common/flash/FPrimitive.h
file removed
-235
toonz/sources/common/flash/FSWFStream.cpp
file removed
-494
toonz/sources/common/flash/FSWFStream.h
file removed
-103
toonz/sources/common/flash/FSound.cpp
file removed
-232
toonz/sources/common/flash/FSound.h
file removed
-146
toonz/sources/common/flash/Macromedia.h
file removed
-514
toonz/sources/common/tvrender/tflash.cpp
file modified
+51 -2475
toonz/sources/include/tflash.h
file modified
+44 -243
toonz/sources/tcomposer/CMakeLists.txt
file modified
+2 -1
toonz/sources/tcomposer/tcomposer.cpp
file modified
+6 -0
toonz/sources/tnzcore/CMakeLists.txt
file modified
+0 -31
toonz/sources/toonz/CMakeLists.txt
file modified
+3 -1
toonz/sources/toonz/OpenToonz.icns
file added
+0
toonz/sources/toonz/glext.h
file removed
-7260
toonz/sources/toonz/linetestviewer.cpp
file modified
+0 -1
toonz/sources/toonz/main.cpp
file modified
+1 -5
toonz/sources/toonz/mainwindow.cpp
file modified
+2 -2
toonz/sources/toonz/preferencespopup.cpp
file modified
+6 -10
toonz/sources/toonz/sceneviewer.cpp
file modified
+10 -6
toonz/sources/toonz/toonz.ico
file modified
+0 -0
toonz/sources/toonz/tpanels.cpp
file modified
+3 -3
toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp
file modified
+1 -1
toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
file modified
+1 -1
toonz/sources/toonzlib/preferences.cpp
file modified
+1 -1
toonz/sources/toonzlib/tproject.cpp
file modified
+3 -1
toonz/sources/toonzqt/pluginhost.cpp
file modified
+13 -3
toonz/sources/translations/japanese/colorfx.ts
file modified
+49 -49
toonz/sources/translations/japanese/tnzcore.ts
file modified
+4 -4
toonz/sources/translations/japanese/tnztools.ts
file modified
+88 -85
toonz/sources/translations/japanese/toonz.ts
file modified
+1285 -1188
toonz/sources/translations/japanese/toonzlib.ts
file modified
+142 -141
toonz/sources/translations/japanese/toonzqt.ts
file modified
+338 -320
    Merge remote-tracking branch 'origin' into fix-thirdparty
    
        
empty file added
empty file added
file modified
+44 -243
empty file added
file modified
+1 -5