Commit graph

109 commits

Author SHA1 Message Date
MCCCS
a0ce326e1b 🐛 Fix spelling mistakes 2016-09-07 16:28:50 +03: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
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
Jeremy Bullock
5e3b5e8cc3 Merge branch 'master' into pixels 2016-06-30 20:57:15 -06:00
Campbell Barton
f493896cc0 Cleanup: typo (sensibility) 2016-06-29 20:49:17 +10:00
Shinya Kitaoka
d1f6c4e95b REFACTORING: Add final specifiers (#537)
* add final specifiers

* apply clang-format

* fix for macOS
2016-06-29 15:17:12 +09:00
Shinya Kitaoka
91695244e8 Merge pull request #532 from shun-iwasawa/fix_infoviewer_text_color
Fix File Info text color
2016-06-29 12:56:16 +09:00
shun-iwasawa
c86c5d6189 Organizing the Tool option bar layout (#443)
* edit tool, selection tool, brush tool

* other tools

* include cmath
2016-06-27 15:22:54 +09:00
shun_iwasawa
b102ca20bb fix infoviewer text color (and some other ui color) 2016-06-27 14:21:30 +09:00
Shinya Kitaoka
0d7879fb9b Merge pull request #495 from shun-iwasawa/revert_planeviewer
(incompletely) Fix crash on using Shader Fx
2016-06-23 17:06:54 +09:00
tomosu
965183e43c Merge pull request #475 from skitaoka/refactoring/add-override
REFACTORING: add override specifiers
2016-06-23 17:03:53 +09:00
shun_iwasawa
24d63588e8 autopaint indicator on palette viewer 2016-06-22 22:27:06 +09:00
shun_iwasawa
2bdc044b89 revert planeviewer to inherit qglwidget 2016-06-22 20:46:24 +09:00
shun-iwasawa
76270a4b64 Merge pull request #395 from turtletooth/palettes
Toonz Palettes folder now working and has 3 starter palettes
2016-06-20 15:55:47 +09:00
Shinya Kitaoka
38fd868138 apply clang-format 2016-06-20 11:34:17 +09:00
Shinya Kitaoka
473e70432a add override specifier 2016-06-20 11:34:15 +09:00
shun-iwasawa
eec8419456 Fix text color in the Script console and the Rename popup (#458)
* set object names

* add style sheet

* close #442 and #449
2016-06-17 17:35:41 +09:00
Jeremy Bullock
29a430ce11 Updated for 1.0.3 2016-06-16 21:41:54 -06:00
Jeremy Bullock
ca9ce50047 Updated to 1.0.3 2016-06-15 23:36:00 -06:00
Jeremy Bullock
946edbcf47 Fixed for 1.0.3 2016-06-15 23:15:05 -06:00
Shinya Kitaoka
120a6e041c apply clang-format 2016-06-15 15:43:10 +09:00
Shinya Kitaoka
ee259ffaf7 remove duplicated constants (#296) 2016-06-13 21:37:09 +09:00
Shinya Kitaoka
9eb50de5fe Use std functions (#297)
* use std functions

* replace toInt        to std::stoi
* replace toDouble     to std::stod
* replace toString     to std::to_string
* replace toWideString to std::to_wstring

* fix for MacOS

* cosmetic change
2016-06-07 16:06:00 +09:00
Jeremy Bullock
d07b20fdf6 Maximize Pane where mouse is with ` 2016-06-05 00:31:00 -06:00