Commit graph

93 commits

Author SHA1 Message Date
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
Jeremy Bullock
29a430ce11 Updated for 1.0.3 2016-06-16 21:41:54 -06:00
walkerka
22f456eed6 apply clang-format. 2016-06-16 20:29:56 +08:00
walkerka
bb91cdfce5 Merge branch 'master' of https://github.com/opentoonz/opentoonz
# Conflicts:
#	toonz/sources/tnztools/brushtool.cpp
#	toonz/sources/tnztools/brushtool.h
2016-06-15 23:27:23 +08: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
walkerka
bb2a4209f5 change max smooth value to 50 for better control. 2016-06-11 21:26:50 +08:00
walkerka
611fd32a6f added stroke stabilizer for toonz raster level. 2016-06-11 18:16:00 +08:00
walkerka
2e244a2acf added UI for stroke smooth value. 2016-06-11 10:33:39 +08:00
walkerka
54ae3222f2 Merge branch 'master' of https://github.com/opentoonz/opentoonz 2016-06-09 23:49:43 +08:00
walkerka
57fb3c27b9 WIP semi-realtime vector stroke smoothing. 2016-06-09 23:43:25 +08: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
d0657441de Level settings now support pixels 2016-06-04 14:19:27 -06:00
Jeremy Bullock
99ca93cb90 Ruler tool now working too 2016-06-04 01:01:44 -06:00
Shinya Kitaoka
210a8af034 Use QGLWidget instead of QOpenGLWidget (#337)
* use QGLWidget instead of QOpenGLWidget for PlaneView

* fix ImageViewer and HexagonalColorWhell
2016-05-25 18:19:38 +09:00
Banbury
d26accb4e8 Added checkbox 'Global Key' to edit tool. (#300) (#308)
* Added checkbox 'Global Key' to edit tool. (#300)

The code for the global key option was still in place. The only thing missing
was the checkbox in the tool options.
2016-05-24 20:29:28 +09:00
Shinya Kitaoka
3fa3e1e9b8 Use "range-based for" instead of iterators (#339)
* use "range-based for" instead of iterators

* fix assertions
2016-05-23 17:40:49 +09:00
Shinya Kitaoka
12c444ee0d use std::min and std::max (#318) 2016-05-18 13:03:37 +09:00
Shinya Kitaoka
8105532604 add #pragma once (#303) 2016-05-17 00:04:11 +09:00
Shinya Kitaoka
1660e0d627 Fix conflicts (Remove license and edition defines and code) (#291)
* Remove license support, and old editions

Previously, old code to support various editions of Toonz, as well as
license activiation code, was cluttering the repository.
Support for LINETEST is retained.

* fix conflicts
2016-05-16 20:45:31 +09:00
Shinya Kitaoka
d4642c34e8 Remove macros: CASE, __OR, and DEFAULT (#286)
* remove syntax macros: CASE, __OR, and DEFAULT

* define VC_EXTRALEAN

* remove meaningless comments
2016-05-13 19:49:17 +09:00
Campbell Barton
f08982dd33 CMake: cleanup indentation, remove redundant endif args 2016-04-27 21:48:12 +10:00
shun_iwasawa
091edd3f55 fix pinch tool crash 2016-04-26 15:45:22 +09:00
Shinya Kitaoka
8016de0b54 add std:: 2016-04-21 17:52:56 +09:00
Keisuke Ogaki
322ff72902 Merge pull request #193 from shun-iwasawa/fix_brush_tool_crash
Fix brush tool crash
2016-04-21 16:50:56 +09:00
Shinya Kitaoka
3bfa549e8b remove "using"
- using std::string;
- using std::wstring;
- using std::ostream;
- using std::istream;
- using std::iostream;
- using std::ostrstream;
- using std::istrstream;
- using std::fstream;
2016-04-21 16:23:15 +09:00
Shinya Kitaoka
c12eacf2f3 remove #define NOMINMAX 2016-04-20 10:24:50 +09:00
Shinya Kitaoka
bb1d046db8 remove using namespace DVGui; from headers 2016-04-20 10:24:49 +09:00
Shinya Kitaoka
2148c874dd remove using namespace std; from headers 2016-04-20 10:24:48 +09:00
Shinya Kitaoka
9f5a1bd760 use _WIN32 instead of WIN32 2016-04-20 10:24:44 +09:00
shun_iwasawa
b5d548dbf0 fix showing preset name 2016-04-19 18:14:52 +09:00
shun_iwasawa
a508475413 fix brush tool crash 2016-04-18 20:24:03 +09:00
Campbell Barton
40cabe2c56 Include memory, needed for auto_ptr references 2016-04-17 15:56:16 +10:00
Shinya Kitaoka
06e491a6f7 Merge pull request #62 from ideasman42/linux-header-case-fix
Linux: Use correct upper/lower case for includes
2016-04-15 13:42:35 +09:00
Shinya Kitaoka
9c6c0f1688 Merge pull request #132 from janisozaur/parentheses
Encapsulate expressions in parentheses
2016-04-13 14:14:19 +09:00
Shinya Kitaoka
bbf7b2dac8 Merge pull request #120 from ideasman42/linux-preproc-error-fix
Use #error directive instead of explicit syntax error
2016-04-13 14:12:16 +09:00
Campbell Barton
d0e335dfee Fix include case 2016-04-12 02:58:51 +10:00
Michał Janiszewski
b1cc3ceeac Encapsulate expressions in parentheses
Some expressions appear to be confusing, adding parentheses removes
doubt in those cases.
2016-04-03 02:24:43 +02:00
Campbell Barton
42d601e918 Use #error preprocessor
We had a report (that I can't confirm), that this caused errors.
Best to use `error` here.
2016-04-01 05:19:41 +11:00
Campbell Barton
3dcf6bfa09 CMake: use tab indentation & whitespace edits 2016-03-27 14:44:29 +11:00
Arseniy Shestakov
5e9e969bb2 Fix letter case in CMakeLists.txt 2016-03-26 06:16:40 +03:00
Toshihiro Shimizu
890dddabbd first commit 2016-03-19 02:57:51 +09:00