manongjohn
df81651d5e
Display Fx Icon as timeline/xsheet thumbnail ( #130 )
2020-08-31 15:44:23 -06:00
artisteacher
4871443ae5
Fix unused command line arguments ( #99 )
...
This uses some of PR opentoonz/opentoonz#3031 by Otakuto with some small additions so that command line arguments can function.
2020-07-25 22:53:56 -06:00
manongjohn
07a2f0ea21
Merged in opentoonz master to resolve conflicts
2019-08-09 20:59:48 -04:00
manongjohn
2c447c1ed4
Image viewer gesture controls ( #2500 )
...
* Add gesture control to ImageViewer, PlaneViewer and SwatchViewer
2019-05-09 15:44:40 +09:00
manongjohn
a495be841d
Merge OT master updates and fixed conflicts
2019-02-21 19:04:10 -05:00
otakuto
8181b0e88f
Exclude regular headers from MOC_HEADER ( #2458 )
2019-02-21 13:49:39 +09:00
manongjohn
da05a053d1
Change pointer cursor icon per navigation mode
2018-07-25 09:58:49 -04:00
manongjohn
d6e3cc2282
Schematic UI Update ( #2034 )
...
* Schematic UI update
2018-07-24 16:52:45 +09:00
shun-iwasawa
ad7711e42d
color calibration with 3d lut ( #1793 )
2018-02-19 12:06:07 +09:00
shun-iwasawa
5a2ff6d279
Add add_dependencies Command to CMake for OSX ( #1587 )
...
* fix cmake for osx
* try using make -j 2 for osx travis
* obtain qt5.9.2 from the previous homebrew
2017-11-24 13:10:45 +09:00
shun_iwasawa
3cc41fdb9a
konero svg icons cont'd
2017-08-22 19:38:27 +09: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
7c988d9428
fix other panels for high dpi monitors
2017-04-19 19:31:31 +09:00
Campbell Barton
fb6d38d59c
CMake: cleanup indentation
2017-02-11 11:13:07 +11: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
Campbell Barton
f2d492861f
CMake: use multi-line defines
...
Easier to read and avoids merge conflicts
2016-07-02 22:23:18 +10: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
Campbell Barton
f08982dd33
CMake: cleanup indentation, remove redundant endif args
2016-04-27 21:48:12 +10:00
Campbell Barton
3dcf6bfa09
CMake: use tab indentation & whitespace edits
2016-03-27 14:44:29 +11:00
Toshihiro Shimizu
890dddabbd
first commit
2016-03-19 02:57:51 +09:00
