Commit graph

230 commits

Author SHA1 Message Date
Jeremy Bullock
87079a9312 Merge pull request #1314 from shun-iwasawa/fix_camera_capture
Camera Capture Enhancements
2017-08-08 20:12:45 -06:00
Jeremy Bullock
7513dc5ab9 Merge branch 'master' into shaders 2017-08-08 13:49:34 -06:00
shun_iwasawa
22312d2e9c fix scroll xsheet 2017-08-08 15:14:55 +09:00
Ivan Mahonin
bf1d82af08 MyPaint brushes for OpenToonz raster levels (#1124)
close #417
2017-08-04 12:31:50 +09:00
Jeremy Bullock
6095dd52ec Fix popup locations (#1287) 2017-07-28 16:16:25 +09:00
shun_iwasawa
d77cdf23f3 fixed fps update 2017-07-26 14:05:17 +09:00
Jeremy Bullock
e93b47f8dd Merge pull request #1313 from shun-iwasawa/konero_svg_icons
Konero svg icons (Part 1)
2017-07-24 23:45:17 -06:00
Jeremy Bullock
e8422eb87f Merge branch 'master' into konero_svg_icons 2017-07-23 14:38:57 -06:00
shun_iwasawa
0cae242b72 clang format all 2017-07-20 19:46:27 +09:00
Jaroslav
203cc81f42 Horizontal timeline option in Xsheet (issue#503) (#1019)
* Added the horizontal timeline support
2017-07-20 18:03:13 +09:00
shun_iwasawa
1351732653 fix_camera_capture 2017-07-03 15:46:30 +09:00
shun_iwasawa
4a5f426fc0 konero svg icons part 1 2017-07-03 12:33:11 +09:00
Jeremy Bullock
1ef2a2a4d7 start of shaders fix 2017-06-30 22:51:18 -06:00
shun-iwasawa
5b7b9fb309 V1.1.3 (#1255) 2017-06-06 21:19:00 +09:00
Jeremy Bullock
c82a0a73f1 Move keyframe navigator to qss (#1244)
* Move keyframe navigator to qss
2017-06-05 13:28:00 +09:00
Jeremy Bullock
72c1f103e2 Fix for pairfield drawing with new themes (#1246)
* Clean pairField drawing
2017-06-05 10:54:53 +09:00
Jeremy Bullock
15fcba2e23 XSheet Toolbar (#989)
* XSheet Toolbar Added
2017-06-02 16:18:05 +09:00
Jeremy Bullock
f880392f33 Merge pull request #1206 from shun-iwasawa/fix_high_dpi
Fix GUI glitches with high dpi monitors
2017-06-01 23:48:45 -06:00
Ivan Mahonin
429ee8c8e4 Allow to cross compile for Windows with Linux/Mingw (part 3 of 3, cmake) (#1150)
* #mingw #cmake: rules for native and cross compilation

* #mingw #cmake: fix CMakeLists.txt for using with MinGW under Windows

* #mingw #cmake: fix typo (BUILD_ENV_WIN -> BUILD_ENV_MSVC)
2017-05-26 15:00:05 +09:00
shun_iwasawa
2732f7220e remove CurrentOpenedBrowser based modality control 2017-05-23 11:54:40 +09:00
shun-iwasawa
1584bbb473 Fixes on convert feature from NAA raster images to TLV (#1203)
* prevent the gap on anti-aliased

* add dpi settings
2017-05-19 18:01:43 +09:00
shun-iwasawa
e33f9a51d2 create zerary fx node at clicked pos (#1191) 2017-05-19 17:42:55 +09:00
shun_iwasawa
96fddba5b4 fix swatches (planeviewer) 2017-05-19 10:18:28 +09:00
Jeremy Bullock
0cb7c2dfec Fix playback stuck bug (#1025) 2017-05-09 13:45:52 +09:00
Ivan Mahonin
e280ae86d6 Allow to cross compile for Windows with Linux/Mingw (part 1 of 3, preprocessor) (#1148)
* split _WIN32 and _MSC_VER, lowercase includes
2017-05-08 21:13:29 +09:00
Jeremy Bullock
039ecc9c2c Merge pull request #1132 from shun-iwasawa/hi_resolution
High dpi monitors support
2017-04-20 23:58:37 -06:00
Jeremy Bullock
b53dbaca95 Allow importing files to project dialog box (#1037)
* Allow importing files to project dialog box
2017-04-21 13:41:45 +09:00
岩澤 駿 
34178f6c6e Merge branch 'hi_resolution' of https://github.com/shun-iwasawa/opentoonz into shun-iwasawa-hi_resolution 2017-04-20 11:11:59 +09:00
shun_iwasawa
01e417ce4b font size : replace point with pixel 2017-04-19 20:45:36 +09:00
shun_iwasawa
7c988d9428 fix other panels for high dpi monitors 2017-04-19 19:31:31 +09:00
shun_iwasawa
a35b8f8c48 bokeh fx iwa 2017-03-24 15:14:07 +09:00
Campbell Barton
54b714a0b6 Resolve #1046, profile errors flooding stdout 2017-03-24 09:51:25 +11:00
Jeremy Bullock
9bc9a3315a Merge pull request #1071 from shun-iwasawa/fix_flipconsole_connection
Fix the Flipbook's console to be updated when the "Blank Frame" option is changed in the Preferences
2017-03-15 21:45:09 -06:00
Jeremy Bullock
0f89c59f13 Move level palette lines to qss (#1035) 2017-03-15 20:48:06 +09:00
Jeremy Bullock
2739e0d08c Pair field style #881 (#1034)
* Moved Pair Fields to qss
2017-03-15 20:47:32 +09:00
Jeremy Bullock
3a998ec844 Allow border on docks- use QFrame (#1054) 2017-03-15 13:32:57 +09:00
Jeremy Bullock
915f195e70 Remove hard-coded lines around panels (#1053)
* Remove line around style editor, schematic and flipbook
2017-03-15 13:16:21 +09:00
shun_iwasawa
1f4a70bdba fix flipconsole connection 2017-02-28 13:56:07 +09:00
Campbell Barton
fb6d38d59c CMake: cleanup indentation 2017-02-11 11:13:07 +11:00
Jeremy Bullock
d9eff09619 changed separator spacing to 4 (#772)
close #771
2016-12-09 22:55:45 +09:00
Campbell Barton
6e785fd361 Fix use after free error (#896)
Fixing a crash problem related to the Function Viewer
close #892
2016-11-24 11:10:50 +09:00
Jeremy Bullock
37acd430c0 Merge pull request #911 from shun-iwasawa/nameeditor_stamp
Introducing easy input feature for the Style Name Editor
2016-11-15 20:56:09 -07:00
shun_iwasawa
0854e84066 label on top 2016-11-15 15:36:06 +09:00
shun_iwasawa
6c76ac8b5c resizable buttons 2016-11-15 14:27:15 +09:00
shun_iwasawa
03feedea0f fixes 2016-11-14 20:55:04 +09:00
shun_iwasawa
4ada6a9de4 dialog position fix 2016-11-14 15:56:58 +09:00
Campbell Barton
d6e3ed1575 Comments: translate icon-generator notes 2016-11-14 08:36:58 +11:00
shun_iwasawa
aa32e96af2 medium chip menu 2016-11-11 17:35:22 +09:00
shun_iwasawa
16057916f3 easy input for name editor 2016-11-10 22:42:13 +09:00
shun_iwasawa
22ad9ee8ef fix convert to painted tlv 2016-11-09 16:20:58 +09:00
shun_iwasawa
ffb2f05d63 changed scrollbar width to 16 2016-11-07 16:45:43 +09:00
shun_iwasawa
7292b3f0dc Merge remote-tracking branch 'origin/master' into numpad_for_palette_shortcut 2016-10-31 19:57:30 +09:00
shun_iwasawa
cede7cbd47 enable shortcut in paletteviewer 2016-10-31 19:45:48 +09:00
Jeremy Bullock
c21b57cc2f Merge pull request #853 from shun-iwasawa/convert_to_painted_tlv
Improved convert command from non AA raster images to painted tlv
2016-10-28 12:42:07 -06:00
shun_iwasawa
754d4551b7 fix not to browse initial description text 2016-10-28 20:05:27 +09:00
Campbell Barton
f2b2c436ef Fix for crash inserting a keyframe (#798)
Make a copy of `TParamChange` in `FunctionTreeModel::onChange()` since the notifier would run later on (via Qt's event loop).
2016-10-28 14:48:26 +09:00
shun_iwasawa
53bef61327 Merge remote-tracking branch 'origin/master' into numpad_for_palette_shortcut 2016-10-26 20:54:28 +09:00
shun_iwasawa
0148381f16 fix studiopalette drag 2016-10-26 16:27:19 +09:00
shun_iwasawa
db5f54040c locator popup 2016-10-14 15:12:24 +09:00
Jeremy Bullock
e8903b4e25 Shortcuts Selection Choice and Proposed New Shortcuts (#691)
* Enabled to save shortcuts and to select from shortcut configurations of other softwares
2016-10-07 20:45:49 +09:00
shun_iwasawa
1fa45a0da6 add remove unused styles option 2016-10-03 21:04:35 +09:00
Jeremy Bullock
63610baef4 Merge pull request #764 from shun-iwasawa/organize_palette
"Organize palette" and "Update colors by using picked position" features for the workflow using raster level as a color model
2016-10-02 22:33:36 -06:00
Jeremy Bullock
b84282fcc8 Merge pull request #817 from shun-iwasawa/turtletooth-stylelink
Modified: Linked styles enabled and style right click menu organized by turtletooth
2016-09-28 22:48:36 -06:00
Jeremy Bullock
33e7d1707e Save settings updated - Updated and Fixed (#474)
* Auto-save settings updated - now auto-save will save not only the current scene but also all levels, according to preferences option.

N.B. Note that the default value of "Automatically save non-scene files" is ON. Please make sure to disable it if you would like to automatically save the scene only.
2016-09-26 17:35:34 +09:00
shun_iwasawa
9f19cf15da small fixes 2016-09-20 17:32:21 +09:00
shun_iwasawa
640862e570 revert link style 2016-09-15 20:50:22 +09:00
shun_iwasawa
202d1959be Merge branch 'stylelink' of https://github.com/turtletooth/opentoonz into turtletooth-stylelink 2016-09-15 19:39:31 +09:00
shun_iwasawa
4635d82930 numpad for palette shortcut 2016-09-12 19:51:52 +09:00
MCCCS
a0ce326e1b 🐛 Fix spelling mistakes 2016-09-07 16:28:50 +03:00
shun_iwasawa
c53f280f96 Merge remote-tracking branch 'origin/master' into organize_palette 2016-08-26 21:01:24 +09:00
shun_iwasawa
9cbd0e8743 organize_palette 4 2016-08-26 20:59:54 +09:00
shun_iwasawa
217e7193db resize scene instead of changing dpi 2016-08-19 15:09:48 +09:00
shun_iwasawa
98ad89fbd3 Merge remote-tracking branch 'origin/master' into stageinch2 2016-08-19 12:33:38 +09:00
Jeremy Bullock
f3ea7c244f Allow Enter in Save File Field to Save (#687)
* Allow enter key in save field to trigger save procedure
2016-08-18 18:38:37 +09:00
shun_iwasawa
d6df3f9261 introducing stage-standarddpi 2016-08-16 13:52:38 +09:00
Campbell Barton
88b15e4c55 Cleanup: format warnings 2016-08-11 08:54:20 +10:00
shun_iwasawa
39baf50099 clang format 2016-08-05 15:40:11 +09:00
shun_iwasawa
64e800caf5 Merge branch 'pixels2' of https://github.com/turtletooth/opentoonz into turtletooth-pixels2 2016-08-05 15:28:35 +09:00
shun-iwasawa
27b0cfd38c clang formatting (#703) 2016-08-04 16:23:36 +09:00
turtletooth
04d8fdc45c FFmpeg Integration - mp4, webm, gif (#624)
* Webm and Gif Export

* added intermediate jpg conversion to save hard drive space

* Started preferences ffmpegPath selection

* grouped ffmpeg files together

* Working with intermediate format

* Fixed running multiple CPU cores for export

* audio works

* all working, need refactoring and error checking

* Changed Qt includes

* revisited Qt includes

* Clean up code, refactor file cleanup, clean up includes

* started gif import

* import working

* Removed import again, fixed export settings being remembered

* import working, bypassed precompute, back to single core export

* clang formatting applied

* added beta warnings in Preferences Popup

* fixed frame flipping and made looping gif default

* added toonzlibs

* added format checks

* added check to help t32bitsrv crash

* sliders for settings are back

* added customizable timeout for ffmpeg

* fixed gif fps and scale for no palette
2016-07-29 14:35:10 +09:00
turtletooth
21dab2ca87 updated level export default settings (#621)
close #530
2016-07-25 12:37:48 +09:00
Jeremy Bullock
2322767e25 Fixed preset dropdown, dpi lock, labels, decimals 2016-07-23 23:11:49 -06:00
Campbell Barton
9ece9c0c92 Cleanup: CMake style
Use parens on newline, avoids diff-noise when adding values.
2016-07-23 04:59:47 +10:00
turtletooth
66af7cc365 Function Curves Window Usability - Option 1 (#657)
* removed ctrl key requirement from function curves editor

* removed commented code
2016-07-21 10:29:28 +09:00
Shinya Kitaoka
2a7129aa92 use std::unique_ptr<> instead of std::auto_ptr<> (#601) 2016-07-20 21:49:32 +09:00
tomosu
8d9526db1b add doneCurrent in fx and raster code (#636) 2016-07-14 17:42:21 +09:00
Campbell Barton
ccd5052709 Cleanup: declare local functions static (#632)
Applies to toonz, toonzfarm, toonzqt.
2016-07-14 15:51:27 +09:00
shun-iwasawa
535d3f26d8 Merge pull request #400 from turtletooth/pixels
Add pixels - Finished.
2016-07-14 12:40:30 +09:00
Jeremy Bullock
59dbbf498a Clang formatting applied 2016-07-12 21:09:46 -06:00
turtletooth
9e7a9d2cd4 Merge pull request #581 from shun-iwasawa/turtletooth-maximize
Maximize Pane where mouse is shortcut by turtletooth (modified)
2016-07-12 14:05:10 -06:00
Jeremy Bullock
0b1ad71d3b updated style link and right click menu 2016-07-11 22:36:05 -06:00
shun_iwasawa
21a6b6ba06 pencil test popup 2016-07-06 20:06:20 +09:00
Shinya Kitaoka
c08330d1ae Merge pull request #567 from opentoonz/cmake-cleanup-defines-pr
CMake: use multi-line defines
2016-07-06 13:56:49 +09:00
shun_iwasawa
01efa14358 add small fix and clang format 2016-07-05 19:28:44 +09:00
shun_iwasawa
617a6d6d2f Merge branch 'maximize' of https://github.com/turtletooth/opentoonz into turtletooth-maximize 2016-07-05 17:21:24 +09:00
shun_iwasawa
fd6c3c05ac revert behavior on dblclking style, and more 2016-07-05 16:15:29 +09:00
Shinya Kitaoka
fd19c4eedf Support Visual Studio 2015 (#544)
* Small changes, for some reason VS 2015 can't link cprintf and they added a second function std::map::count and bind couldn't resolve the function. Substituted with a lambda-expression.

* Created all 64bit version of the 3rd party libs.

* Cleanup popup opens CleanupSettings instead of CleanupSettingsPane. Not finished, panel is wrong now (also uses CleanupSettings).

* Tried to get Twain working, failed.

* When there are more then 3 peg holes create additional holes.

* When a hole touches the boundary it should still be considered a hole.

* Do not compare dot size against fixed size. Will not work in some scan resolutions. Used the same value (PERCENT * max dot size) as later in the code in compare_dots.

* When there are more than three peg holes the code looked for the best fit and used that. The problem was, that the middle hole was used as center for auto center. For three peg holes that is correct, but does not work for more than three. Now the best fit is calculated and from there the offset of the middle of the three best fit holes is calculated and applied.

* One of the last changes broke VS2015 compatibility, it chocked on a missing include.

* fix for msvs2013

* revert autopos.cpp

* apply clang-format

* use GIT-LFS
2016-07-04 17:50:30 +09:00
Jeremy Bullock
3c545e0522 removed duplicate code 2016-07-02 23:35:53 -06:00
Jeremy Bullock
733ddbef67 hid gui elements if pixels selected 2016-07-02 23:30:00 -06:00
Campbell Barton
f2d492861f CMake: use multi-line defines
Easier to read and avoids merge conflicts
2016-07-02 22:23:18 +10:00