Commit graph

542 commits

Author SHA1 Message Date
luzpaz
27707d841e Fix misc. source comment and doxygen typos in ./toonz/sources/toonzlib (#2740)
* Fix misc. source comment and doxygen typos in ./toonz/sources/toonzlib
Found via `codespell -q 3 -S *.ts,./thirdparty -L dum,inbetween,sinc,uint ./toonz/sources/toonzlib`
2019-09-02 17:49:49 +09:00
manongjohn
cde88863c4 Merged in opentoonz master with conflicts resolved 2019-08-26 22:20:19 -04:00
Rodney
ec5bd26a54
Merge pull request #2619 from manongjohn/fix_version_control
Fix version control issues
2019-08-26 03:14:46 -05:00
shun-iwasawa
14154fdd37
fix crash on activating cycle (#2714) 2019-08-20 02:49:34 +09:00
manongjohn
9bcf518448 Merged in opentoonz master to resolve conflicts 2019-08-10 01:30:03 -04:00
manongjohn
825aea606b Merged in opentoonz master to resolve conflicts 2019-08-09 21:06:14 -04:00
shun-iwasawa
d74d26669d Merge remote-tracking branch 'origin' into otakuto-remove-tArrayCount-macro 2019-08-07 11:19:41 +09:00
Rodney
3ca92c27e4
Merge pull request #2655 from shun-iwasawa/display_cycle_in_function_sheet
Display Cycled Values in Function Editor Spread Sheet
2019-08-06 16:41:26 -05:00
shun-iwasawa
55822841a2
fix update styleeditor on picking style (#2615) 2019-08-02 18:06:02 +09:00
manongjohn
5bceaad2c4 Note Level enhancement and crash fixe (#2568)
* Add Note Level context menu

* Fix Replace Note Level crash
2019-08-02 17:44:29 +09:00
shun-iwasawa
fe2893b15c clang format 2019-08-02 15:48:26 +09:00
shun-iwasawa
31b6f77785 Merge branch 'remove-tArrayCount-macro' of https://github.com/otakuto/opentoonz into otakuto-remove-tArrayCount-macro 2019-08-02 15:47:17 +09:00
manongjohn
649b9abaec Palette switching behavior changes (#2518)
* Track and restore current style

* Auto switch to new style page

* Auto Switch to drag/drop-merged palette page

* Default to style 1 when returning to deleted style
2019-07-12 00:57:23 +09:00
shun-iwasawa
4f9e2cbf02 fix crash on convert to vector (#2651) 2019-07-10 23:06:53 -06:00
shun-iwasawa
339c73ea68 fix sound not played (#2666) 2019-07-10 23:05:19 -06:00
shun_iwasawa
768e206cf8 display cycle in function sheet 2019-07-01 18:22:30 +09:00
manongjohn
ec91972302 Merged in OT master with conflicts resolved 2019-06-30 10:47:11 -04:00
manongjohn
878a50dfa6 Project file detection modifications 2019-06-30 09:44:24 -04:00
Campbell Barton
e4aac6f433 Cleanup: undeclared function warnings
Make static or comment out.
2019-06-30 12:59:14 +10:00
shun-iwasawa
14c78752d6 Fill Tool for Raster Level (#2646)
* filltool for raster level

* fill depth behavior fix
2019-06-22 10:13:38 -06:00
shun-iwasawa
c96e497d75 Fix Crash on Switch to Vector Tab (#2634)
* fix osx style render

* adding fail-safe and fix
2019-06-19 22:47:36 -06:00
Jeremy Bullock
890b5274a0 Short Play Function 2019-06-17 22:15:39 -06:00
manongjohn
8138f88b46 Add projects outside project root to dropdowns 2019-06-09 17:14:08 -04:00
manongjohn
256551767b Fix crash saving new palette directly 2019-06-06 21:08:15 -04:00
John Dancel
d73b1593ac Fix crash writing edit frame range temp files 2019-05-21 19:56:21 -04:00
John Dancel
8629144894 Get raster and mesh frame read-only status from OS 2019-05-19 18:53:30 -04:00
John Dancel
780e0a1268 Fix edit frame range not creating temp files 2019-05-18 21:38:51 -04:00
John Dancel
334bbe9072 Fix saving partial locked file in endless loop 2019-05-15 16:02:34 -04:00
John Dancel
35a3a8bd7e Fix crash when saving read-only palette file 2019-05-15 15:04:48 -04:00
John Dancel
1e3f0ccee9 Fix for SVN 1.7+ changes 2019-05-13 22:14:53 -04:00
John Dancel
34c2db8e0c Merged in OT master and resolved conflicts 2019-05-04 09:06:19 -04:00
John Dancel
83fae996d8 Xcode IDE support 2019-04-20 22:54:44 -04:00
otakuto
e347adcb20 Remove make_cast_it (#2594) 2019-04-16 14:56:35 +09:00
shun-iwasawa
fcbc0a6582 fix update styleeditor (#2558) 2019-04-01 17:18:10 +09:00
shun-iwasawa
de71c0db14 fix flipbook color mask for tlv (#2537) 2019-04-01 16:44:51 +09:00
John Dancel
c323acf64c Select camera with Camera Column Config button 2019-03-26 06:21:46 -04:00
John Dancel
421acddedf Add Camera Column to Xsheet 2019-03-22 09:09:34 -04:00
shun-iwasawa
bcc4cf8c29 fix psd removed on save (#2559) 2019-03-14 10:56:48 +09:00
artisteacher
7db72b636a Replace RGBM and fix typos (#2551)
* Remove extra t from contain

* Fix error message to use rgba

* Fix label to use RGBA

* Clarify send back menu item
2019-03-10 15:41:13 -06:00
otakuto
8181b0e88f Exclude regular headers from MOC_HEADER (#2458) 2019-02-21 13:49:39 +09:00
otakuto
dfe1cf8a78 Use range-based for instead of foreach (#2433) 2019-02-20 16:31:03 +09:00
shun-iwasawa
a384884f4c fix sound with clapperboard (#2510) 2019-02-12 15:51:49 +09:00
manongjohn
d754974e14 Add disable tool preference 2019-02-09 09:54:57 -05:00
manongjohn
e444f9b157 Change toolbar preference wording 2019-02-09 09:50:10 -05:00
manongjohn
2cd8cdf1ab Show disabled tool preference 2019-02-09 09:44:39 -05:00
manongjohn
177b7c8bac Keep multiple backups preference 2019-02-08 21:28:29 -05:00
manongjohn
3d043c5538 Change backup naming convention to use .bak 2019-02-08 20:11:06 -05:00
manongjohn
e1c9282ee2 Backup scene file 2019-02-06 21:25:45 -05:00
manongjohn
54e85db21d Fix Z=0 Camera Preview crash (#2405)
* Fix Z=0 Camera Preview crash
2019-01-23 10:59:53 +09:00
manongjohn
d442970deb Improved onion skin marker targeting (#2378)
* Improved onionskin targeting

* Clear onion skin marker menu options
2018-12-28 18:07:09 +09:00
manongjohn
f37f4a146c Fix fx schematic display issues (#2407)
* Fix fx node display issues

* Undo computePos changes

* Fix macroFx editor content placement

* Fix unconnected node and children placement

*  Improved macro node placement

* Fix new macroFx node placement

* Fix loaded preset macro nodes placement

* Fix open and closed macroFx positioning
2018-12-28 14:53:30 +09:00
manongjohn
ffd27d4dce Fix replace fx nodes (#2417) 2018-12-27 10:49:03 +09:00
manongjohn
09549bc679 Fix empty column property issues (#2395)
* Fix locked empty column issue

* Fix color tag/filter not moving to empty column
2018-12-26 10:59:43 +09:00
Tact Yoshida
1d7cf9a5bf Remove tArrayCount macro 2018-12-20 05:16:25 +09:00
shun-iwasawa
93fdd4ee3f matte color (#2418) 2018-12-19 14:29:00 +09:00
shun-iwasawa
5b2332a085 New Fx: Text Fx Iwa (#2393)
* text fx iwa

* fix for osx and linux
2018-12-18 14:55:22 +09:00
otakuto
65499b52e0 use bool instead of macro bool (#2278) 2018-12-17 12:14:31 +09:00
shun-iwasawa
11adda4885 fix playback slowness with style editor (#2367) 2018-11-12 18:58:53 +09:00
shun-iwasawa
fdece91b5e fix antialias to toonz raster levels (#2370) 2018-11-12 18:56:53 +09:00
otakuto
6985407a96 remove duplicate include (#2271) 2018-10-31 12:00:01 +09:00
manongjohn
9b62c53833 Timeline height and keyframe area adjustments (#2268)
* Increase timeline layer height
* Narrow keyframe active area
* Display thumbnail in Timeline
* Move timeline Sound icon to thumbnail area
* Move timeline Sound volume control to config button
* Move timeline Filter color icon to thumbnail

close #2261 
close #2262
2018-10-31 11:56:59 +09:00
shun-iwasawa
f889997cee check folder access on save level (#2334) 2018-10-18 14:44:14 +09:00
shun-iwasawa
816b50f22d fix import files with underscore (#2326) 2018-10-18 13:46:15 +09:00
shun-iwasawa
f8c030bad0 change temporary file name suffix (#2325) 2018-10-18 12:10:13 +09:00
shun-iwasawa
cd46940982 New Feature : Adding Clapperboard (#2314)
* clapperboard

* fixed image item and added aspect ratio prop

* board -> clapperboard
2018-10-16 15:24:43 +09:00
shun-iwasawa
995cf619d4 load palette global name on loading level (#2299) 2018-09-19 18:41:16 +09:00
shun-iwasawa
18a7c631a5 fix updating animated guide (#2264) 2018-09-11 15:41:56 +09:00
shun-iwasawa
045b61c7fa schematic ui modification (#2241) 2018-09-11 14:43:03 +09:00
shun-iwasawa
1d5937a1fe shift and trace improvement (#2240) 2018-09-11 14:35:02 +09:00
otakuto
ed7dcd5873 using std::swap instead of tswap (#2195) 2018-08-30 17:18:43 +09:00
shun-iwasawa
2b24e83965 Enhancement of the Shift and Trace Feature (#2212)
* shift and trace enhancement

* override shortcuts
2018-08-07 16:22:49 +09:00
otakuto
a18e658d3e use bool instead of macro bool (#2165) 2018-08-07 14:41:42 +09:00
manongjohn
c5bc8d2da8 Enable Windows Ink Support (#2152)
* Enable Windows Ink Support

close #2017
close #2149
2018-08-07 14:39:08 +09:00
manongjohn
b66bc4e313 Show actual fonts in font dropdowns (#2080)
* Show actual fonts in font dropwdowns
2018-08-06 15:46:52 +09:00
shun-iwasawa
e87f3bcf1c fix load raster level with palette (#2184) 2018-08-01 14:44:05 +09:00
shun-iwasawa
1fde39813a fix vector brush display bugs (#2133) 2018-07-12 15:18:08 +09:00
shun-iwasawa
e3b1897540 set system path with command line qualifiers (#2143) 2018-07-10 14:42:57 +09:00
shun-iwasawa
85c99518a8 fix load tzp (#2091) 2018-06-21 11:31:23 +09:00
manongjohn
a21b060921 Timeline UI Update (#1990)
* Timeline Display Updates and other fixes
2018-06-20 12:09:22 +09:00
shun-iwasawa
cd7d6a5be1 Fix Brush Artifacts on Viewer (#2071)
* fix more and more viewer update

* fix short stroke drawn with soft brush

* fix crash
2018-06-18 13:01:39 +09:00
shun-iwasawa
75b801e777 fix crash on convert to vector (#2057) 2018-06-11 18:14:43 +09:00
shun-iwasawa
3c83df63eb Fix Viewer Update Problems (#2049)
* fix more viewer update

* simplify
2018-06-11 17:02:35 +09:00
shun-iwasawa
e87e0815f7 Make More UI Texts Translatable (#2026)
* make ui texts translatable

* add more translatable texts

* load translate file for default commands
2018-06-04 12:18:43 +09:00
Konstantin Dmitriev
a9c425317e Fix sound playback on Linux by enabling fix #1302 for Linux platform (#1749)
close #1302 
close #1097 
close #907
2018-05-25 10:28:41 +09:00
shun-iwasawa
cf6df16d8a change default to scenefolder (#1959) 2018-05-21 15:43:37 +09:00
shun-iwasawa
dd780b2779 colormodel image (#1907) 2018-05-21 15:11:35 +09:00
manongjohn
75da26b560 Cursor preferences (#1960)
close #1857
2018-05-17 15:03:05 +09:00
manongjohn
e71b98140e Timeline zoom control update (#1947)
close #1689
2018-05-16 17:23:35 +09:00
artisteacher
9ce0c271a7 Update default OS X UI font (#1943)
* helvetica neue for default mac ui font
2018-05-16 13:45:14 +09:00
shun-iwasawa
a048bcf55e fix motionblur_iwa fx (#1952) 2018-05-09 16:39:39 +09:00
shun-iwasawa
ff99e1a072 Modifications on Studio Palette tree view (#1920)
* studiopalette drag behavior

* fix palette move undo

* prevent palettes being overwritten
2018-04-23 14:13:40 +09:00
shun-iwasawa
0f887805c7 fix drag style undo (#1917)
Do Merge
2018-04-18 17:49:39 +09:00
manongjohn
29ce0b3da6 Disable Auto-Stretch Frame (#1707)
Added option to enable / disable Auto-Stretch Frame
2018-03-27 19:26:37 +09:00
Jeremy Bullock
4ce9539416 Function Editor Display Options (#1649)
* Function Editor Display Options
2018-03-22 16:32:19 +09:00
shun-iwasawa
975eb1fa6f New option for Toonz Raster Brush Tool : Draw Order - Palette Order (#1849)
* style order option for toonz raster brush

* change text to "draw order"
2018-03-14 17:33:59 +09:00
shun-iwasawa
133733bb6c enable to skip version check (#1824) 2018-03-14 16:58:55 +09:00
shun-iwasawa
b08db1990c stop using global context (#1785) 2018-03-05 20:52:40 -07:00
manongjohn
e153c2cb6b Temp save scene file (#1608) 2018-02-20 19:38:37 +09:00
shun-iwasawa
ad7711e42d color calibration with 3d lut (#1793) 2018-02-19 12:06:07 +09:00
shun-iwasawa
27942bc309
fix palette titlebar update (#1780) 2018-02-14 17:22:19 +09:00
shun-iwasawa
7af4c5390d fix template room path (#1766) 2018-01-29 12:51:23 +09:00
Jeremy Bullock
edc4d810b8
Merge pull request #1678 from shun-iwasawa/fix_plastic_on_subsheet
Fix Plastic Mesh on SubXsheet for OSX
2018-01-25 21:12:38 -07:00
Konstantin Dmitriev
d5d1aceea7 Fix Linux build (#1751) 2018-01-23 15:08:50 +09:00
Jeremy Bullock
e23841235b
Merge pull request #1740 from shun-iwasawa/fix_plastic_black_contour
Fix Plastic Tool not to Create the Black Contour
2018-01-22 11:38:05 -07:00
shun_iwasawa
927bc0fbcc fix plastic black contour 2018-01-19 11:18:08 +09:00
shun_iwasawa
7e52a2e788 enlarge plastic texture 2018-01-12 21:12:24 +09:00
shun_iwasawa
6e6ff6b0ed revert source for non-OSX 2017-12-12 22:08:38 +09:00
shun-iwasawa
0da010d9e2 fix plastic on subsheet 2017-12-12 20:27:21 +09:00
manongjohn
dff49a7e39 Timeline bug fixes and tweeks (#1669)
* Timeline tweek
2017-12-11 12:48:31 +09:00
manongjohn
057de69833 Allow Mesh Icon On Demand (#1604) 2017-12-04 22:38:13 +09:00
Jeremy Bullock
3e69f9c60b Allow down arrow to create new frame in level strip. (#1028)
* New Level Strip Drawing with Down Arrow (optional in preferences > drawing)
2017-11-29 19:58:38 +09:00
Jeremy Bullock
e4ec175144
Merge pull request #1598 from manongjohn/filmstrip_renumber_fix
Fix filmstrip renumber issues
2017-11-28 08:11:13 -06:00
manongjohn
2e094efcbe Timeline column display order flip (#1570)
* Timeline column display flip
2017-11-28 20:29:52 +09:00
Jeremy Bullock
ed485b7bef
Merge pull request #1611 from shun-iwasawa/skip_deformed_icon
Prevent Crash on Plastic-deformed Sub-xsheet Icon
2017-11-28 00:26:07 -06:00
shun_iwasawa
b0891094aa hyphen in fx parameter expression 2017-11-28 12:36:26 +09:00
shun_iwasawa
ed1861dc65 skip deformed icon 2017-11-27 14:42:35 +09:00
manongjohn
d019eabd54 Fix filmstrip renumber issues 2017-11-24 12:10:29 -05:00
manongjohn
f643b05c25 Zoom in/out of Timeline (#1573)
* Add timelime zoom control
2017-11-24 18:15:54 +09:00
Jeremy Bullock
4386c6271d Sync Level Strip Renumber Changes with XSheet (#1464)
* Sync Level Strip Changes with XSheet option added in the preferences
 
close #471
2017-11-24 18:08:23 +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
c852102583 Introducing $scenefolder Alias (#1513)
* scene folder alias

* ask if copy levels
2017-11-22 12:57:13 +09:00
shun-iwasawa
f9d3f02167 Fix Fill Behavior on Toonz Raster (#1540)
* fix raster fill

* fix for one pixel width line case

* fix rect fill
2017-11-22 12:38:37 +09:00
shun_iwasawa
53cbe2c696 fix loading note level 2017-11-16 17:36:43 +09:00
Jeremy Bullock
52a220b89a New Note Level (#1322)
* New Note Level
2017-11-16 17:08:01 +09:00
Jeremy Bullock
7ce85485f6
Merge pull request #1569 from shun-iwasawa/fix_plastic_tool_osx
Fix Vector Level Disappearing with Plastic Tool in OSX
2017-11-15 23:49:10 -07:00
Jeremy Bullock
3f573c46a5 Two New Vector Conversion Commands (#1410)
* Vectors to Toonz Raster
* Replace Vectors with Simplified Vectors
2017-11-15 18:57:29 +09:00
Jeremy Bullock
4c62241cb1 Add autosave options to startup popup (#1265)
* add autosave options to startup popup
2017-11-15 10:32:45 +09:00
Jeremy Bullock
f9b89b9c75
Merge pull request #1558 from shun-iwasawa/autopaint_autoapply_undo
Enable Undo for Editing Styles
2017-11-14 08:24:25 -07:00
manongjohn
1be2644c8d Current time timeline indicator (#1522) 2017-11-14 14:24:32 +09:00
Jeremy Bullock
3a06bdc569 Allow Shortcut to Cycle Dropdown Options (#1420) 2017-11-09 23:15:46 +09:00
shun_iwasawa
4ef139dc16 fix plastic tool in osx 2017-11-09 17:36:56 +09:00
shun_iwasawa
9a458198b4 Merge remote-tracking branch 'origin/master' into autopaint_autoapply_undo 2017-11-09 15:27:53 +09:00
Jeremy Bullock
b1e61585a1
Merge pull request #1524 from blackwarthog/feature4_fixes
Add missing include
2017-11-07 09:48:37 -07:00
shun_iwasawa
e553fc7d27 undo for autoapply 2017-11-07 16:24:20 +09:00
shun_iwasawa
b7aa7cd3f3 undo for autopaint 2017-11-07 13:11:02 +09:00
shun-iwasawa
fd55f636ce paste numbers command (#1530) 2017-10-26 17:57:56 +09:00
Ivan Mahonin
d63d61e944 #fix: fix for htimeline 2017-10-16 18:49:08 +07:00
manongjohn
399e7d4a0b Xsheet Column Header Layout Redesign (#1347)
close #1316 
close #490
2017-10-04 16:00:34 +09:00
shun-iwasawa
3f818e3fc6 Camera Capture feature : Save scene in the subfolder checkbox (#1496)
* save scene in subfolder checkbox

* save "save in" folder in the scene
2017-10-03 17:17:58 +09:00
Jeremy Bullock
0ff1b687b0 Customize Command Bar and XSheet Toolbar (#1448)
* Edit In Place added to Toolbars

* Customize Command Bar and XSheet Toolbar
2017-10-03 17:15:33 +09:00
manongjohn
88ffb47e4c Renumber crash fix (#1498)
close #1312
2017-10-02 19:30:28 +09:00
Yu Chen
da5534a8f7 More translatable UI strings (#1486) 2017-09-27 16:03:29 +09:00
shun-iwasawa
aa65b89e92 Reframe with Empty Inbetweens command (#1485)
* reframe with empty inbetweens
2017-09-25 17:15:29 +09:00
Jeremy Bullock
1e17edb69a Guided Drawing Feature (#1297)
* Guided Drawing Feature
2017-09-25 14:29:38 +09:00
Jeremy Bullock
6767bee6b3 Fix for sierra scrub crash (#1302)
* fix for sierra scrub crash
2017-09-22 16:19:10 +09:00
manongjohn
25e6cfef72 Correct Preview and Camera toggle for Sound columns (#1472)
* Correct sound level's preview and camera toggle button behavior
2017-09-22 11:10:54 +09:00
shun-iwasawa
947ad3809f Auto Input Cell Number command (#1479)
* auto input cell number

* from frame - to frame
2017-09-22 08:53:49 +09:00
Jeremy Bullock
807052a00f Pick a Font (#1386) 2017-09-13 19:04:05 +09:00
shun_iwasawa
2c0f507302 color filter available on render and vector levels 2017-09-11 11:03:30 +09:00
shun-iwasawa
d08c7cb5e4 Enable shortcut command while renaming cell (#1451)
* enable command while renaming cell

* open left side of the cell for drag handle

* make OT command shortcuts optional

* escape key for clear focus
2017-09-08 18:55:52 +09:00
shun-iwasawa
5e6203f300 Fix crash on using preference template (#1456)
* fix crash on using preference template
2017-09-08 14:26:03 +09:00
Kite
799aa37718 Theme Update
Updates the themes.
2017-08-28 19:40:43 +01:00
Jeremy Bullock
44af2c9b90 Allow New Levels to Default to Camera Size (#1256)
* allow new levels to inherit camera size and dpi
2017-08-25 15:07:08 +09:00
manongjohn
f2ca02dd16 Merge remote-tracking branch 'origin/master' into XsheetFixes 2017-08-15 10:51:31 -04:00
shun-iwasawa
9031b4b280 strings for style sheet and language in preferences (#1403) 2017-08-15 18:16:08 +09:00
Jeremy Bullock
40bc406d6f Remove Mac qss files (#1400) 2017-08-15 16:26:29 +09:00
Jeremy Bullock
cd00fd74d3 Snapping and Frame Range for Vector Brush (#1319)
* Frame Range for Vector Brush
* Brush Snapping
2017-08-14 19:59:51 +09:00
manongjohn
98ab1afc7b Fix frame blending into Xsheet Toolbar 2017-08-13 14:19:02 -04:00
shun-iwasawa
e0fcf9792b use dpi of the first cleanupped frame (#1391) 2017-08-10 18:35:45 +09:00
Jeremy Bullock
7f20440e9d Show 0 Thick Line During Drawing and Shift Draw on Vector to Make Straight Line (#1307) 2017-08-10 15:31:01 +09:00
Jeremy Bullock
2b0798d78c Merge pull request #1366 from shun-iwasawa/preferences_template
Enable to use template settings for preferences
2017-08-08 20:56:51 -06:00
Ivan Mahonin
bf1d82af08 MyPaint brushes for OpenToonz raster levels (#1124)
close #417
2017-08-04 12:31:50 +09:00
shun_iwasawa
a23dac3099 preferences template 2017-08-02 17:40:00 +09:00
Jeremy Bullock
8c50072df0 Allow Imported Images to Use Camera DPI (#1300) 2017-07-28 20:43:09 +09: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
Jeremy Bullock
15fcba2e23 XSheet Toolbar (#989)
* XSheet Toolbar Added
2017-06-02 16:18:05 +09:00
Jeremy Bullock
55b5dba26f FFmpeg timeout error fix (#1030) 2017-05-31 18:29:20 +09:00
Jeremy Bullock
3101a8a718 premult by default on png (#1217)
close #794
2017-05-26 16:41:44 +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
Jeremy Bullock
99d69ea4cb Merge pull request #1184 from shun-iwasawa/load_psd
Set premultiply option and choose level name type on loading PSD layer levels
2017-05-23 22:00:24 -06:00
shun_iwasawa
0becbefbda use preference for premultiply option 2017-05-23 19:37:37 +09:00
Ivan Mahonin
2fc36cb841 Allow to cross compile for Windows with Linux/Mingw (part 2 of 3, bugfixes) (#1149)
* #mingw #bug: place explicit instantiations on templates before first use

* #mingw #bug: remove API attributes from inline functions

* #mingw #bug: add 'static' attribute for local functions

* #mingw #bug: fix API attributes for splitSpeedInOutSegment

* #mingw #bug: replace strstream to stringstream

* #mingw #bug: remove cross references to plasticskeleton from tnzcore

* #mingw #bug: fix bug with order of initializaition of static variables

* #mingw #bug: fix glutInit
2017-05-19 19:20:33 +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
a4bcc91cc3 set premultiply and added level name type 2017-05-09 15:07:06 +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
03544bf169 Merge pull request #1162 from shun-iwasawa/closest_field
Change closest field value to 999
2017-04-20 23:46:27 -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
shun_iwasawa
f4d6350da0 change closest field to 999 2017-04-18 22:09:09 +09:00
Jeremy Bullock
2b8dd0af3b Extend ffmpeg timeout (#1029) 2017-03-27 15:48:17 +09:00
Jeremy Bullock
75a231bef2 Merge pull request #1064 from shun-iwasawa/fix_import_scene
Fix invalid scene path when import scene from sandbox to another project
2017-03-15 21:31:52 -06:00
shun-iwasawa
57bc09cd02 make filesystemwatcher optional (#1060) 2017-03-08 12:32:25 +09:00
shun_iwasawa
3f8574e522 fix import scene 2017-02-27 16:27:07 +09:00
jabarrera
53e290644c Checks data sound is valid to save. Issue #957 (#971)
close #957
2017-02-27 14:24:11 +09:00
jabarrera
15baedffe1 Fixes crash in History Panel when a level is unlinked. (#975)
close #965
2017-01-31 21:12:59 +09:00
shun_iwasawa
3639da6d5a arrowkey to shift cell selection, input w/o dblclk 2017-01-19 17:46:54 +09:00
shun_iwasawa
a3cdd885f5 added color filter feature and modified composition with colorscale 2017-01-16 20:33:23 +09:00
Jeremy Bullock
8e6dfb6112 Merge pull request #945 from shun-iwasawa/mod_fieldguide
Change the default size of field guide
2016-12-08 00:01:06 -07:00
Jeremy Bullock
1d47b826ed Clear project folder of non-project files (#701)
* clear project folder of non-project files, moving them from projects to config
2016-12-02 13:09:13 +09:00
shun_iwasawa
fe1261a638 modify field guide's default value 2016-12-02 13:01:04 +09:00
masafumi-inoue
297fcfe29e Merge pull request #908 from shun-iwasawa/fix_convert_to_painted_tlv
Fix style removal problem on Convert to Painted TLV from non AA source
2016-11-11 16:52:46 +09:00
shun_iwasawa
22ad9ee8ef fix convert to painted tlv 2016-11-09 16:20:58 +09:00
Jeremy Bullock
3bb5efc4ee Quick Export Feature (#725)
* Added Fast Render to MP4 command which does not need to set anything in output settings.
2016-11-09 11:46:03 +09:00
shun_iwasawa
7d08f6e97e small fixes and change default shortcuts 2016-11-02 15:32:21 +09:00
shun_iwasawa
7292b3f0dc Merge remote-tracking branch 'origin/master' into numpad_for_palette_shortcut 2016-10-31 19:57:30 +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
Jeremy Bullock
128b64d4da Merge pull request #879 from shun-iwasawa/save_fmtprops_to_prj
Fix Save Default Settings command to save format properties to project settings
2016-10-28 10:09:42 -06:00
Jeremy Bullock
7e1154bda4 Fix for FFmpeg renders wrong range if previous exported range was bigger (#814)
* fix render using old render range for changed range
2016-10-28 14:53:33 +09:00
Jeremy Bullock
2c13b22d29 Merge pull request #868 from shun-iwasawa/loadscene
Fix Load Scene popup to initialize correctly
2016-10-27 08:23:21 -06: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
d4ffc77bb9 save format properties 2016-10-21 20:50:52 +09:00
Jeremy Bullock
bfe8613d31 Startup popup when OT starts (#793)
* startup popup which provides quick access to new project, new scene and open recent scenes.
2016-10-18 15:29:19 +09:00
shun_iwasawa
472b705fd5 fix load scene for relative project folder 2016-10-18 12:02:45 +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
Campbell Barton
4cdcb009ef Fix/Workaround bug #591
We could check for the extensions but these OpenGL options are never used,
so no need to disable them.
2016-09-29 07:01:26 +10: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
Jeremy Bullock
e59b1fa741 Additional Project Root Location (#664)
Enabled to select additional project root location via Preferences.
close #736
2016-09-15 18:56:03 +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
Campbell Barton
4121b4ed18 Merge pull request #723 from ckorn/format
Add format string literal
2016-09-01 17:47:40 +10:00
Jeremy Bullock
48c6fc0de2 Typo fixes (#531)
* Typo fixes for the file access warning

close #501
2016-09-01 14:24:19 +09: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
Jeremy Bullock
1bad81ba81 Merge pull request #739 from shun-iwasawa/stageinch2
Introducing Stage::standardDpi instead of updating Stage::inch
2016-08-23 21:17:05 -06:00
shun-iwasawa
5e2a8ff232 Improvement of direct inputting feature in Xsheet (#722)
* improve xsheet direct input

*  small fix
2016-08-19 18:31:00 +09:00
shun_iwasawa
98ad89fbd3 Merge remote-tracking branch 'origin/master' into stageinch2 2016-08-19 12:33:38 +09:00
shun_iwasawa
e897af4ff2 organize palette 3 2016-08-18 20:25:44 +09:00
Jeremy Bullock
17d8f9dfaf Disable onionskin during playback (#708)
* disable onionskin during playback
* added option to show onion skin during playback in preference

close #486
2016-08-18 18:41:31 +09:00
shun_iwasawa
bb0d83547a add dpi compatibility check and remove comment 2016-08-18 17:27:10 +09:00
shun_iwasawa
4b846056c9 Merge remote-tracking branch 'origin/master' into organize_palette 2016-08-16 18:41:23 +09:00
shun_iwasawa
d6df3f9261 introducing stage-standarddpi 2016-08-16 13:52:38 +09:00
Christoph Korn
c17229f066 Add format string literal
Prevents security issues when the string contains
format specifiers.
Fixes: warning: format not a string literal and
no format arguments [-Wformat-security]
2016-08-10 22:30:04 +02:00
shun-iwasawa
27b0cfd38c clang formatting (#703) 2016-08-04 16:23:36 +09:00
shun_iwasawa
ff185f4824 Merge remote-tracking branch 'origin/master' into organize_palette 2016-07-29 17:25:00 +09:00
shun_iwasawa
48c6711cad organize palette 2 2016-07-29 17:23:11 +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
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
fef27f08d4 changed default icon size to 16 by 9 (#662) 2016-07-22 17:20:38 +09:00
Campbell Barton
8c6c57f1b4 Enable missing-declarations warning (#643)
Finish ensuring symbols use headers correctly
2016-07-22 13:38:33 +09:00
Shinya Kitaoka
0f12b3ee16 use new context (#659) 2016-07-21 10:34:09 +09:00
Shinya Kitaoka
2a7129aa92 use std::unique_ptr<> instead of std::auto_ptr<> (#601) 2016-07-20 21:49:32 +09:00
shun_iwasawa
c382b8addd Merge remote-tracking branch 'origin/master' into organize_palette 2016-07-20 12:47:43 +09:00
tomosu
8d9526db1b add doneCurrent in fx and raster code (#636) 2016-07-14 17:42:21 +09:00
shun-iwasawa
535d3f26d8 Merge pull request #400 from turtletooth/pixels
Add pixels - Finished.
2016-07-14 12:40:30 +09:00
Campbell Barton
b3bd842e04 Make functions static, ensure declarations match headers (#610)
This patch used -Wmissing-declarations warning
to show functions and symbols that had no declarations, and either:

- Make static
- Add to header

This helps avoid possability that declarations and functions get out of sync.
And ensures all source files reference headers correctly.

It also makes sure functions defined with extern "C",
have this defined in the header. An error found in calligraph.h while writing this patch.

This has been applied to toonzlib, to avoid making very large global changes.
If accepted, -Wmissing-declarations warning could be added to CMake.
2016-07-13 21:05:06 +09:00
Jeremy Bullock
2e52c6995c reverted default units 2016-07-13 00:38:17 -06:00
Jeremy Bullock
59dbbf498a Clang formatting applied 2016-07-12 21:09:46 -06:00
shun_iwasawa
06bcc2ea0a organize palette 1 2016-07-11 18:55:17 +09:00
Campbell Barton
a9c3dad75a CMake: differentiate system includes (#604) 2016-07-09 00:47:11 +09:00
Shinya Kitaoka
7abdb2380a Merge pull request #547 from ideasman42/warn-undefined-pr
Quiet -Wundef warning
2016-07-06 20:42:14 +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
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
fdd72e63f6 set pixels as default 2016-07-03 13:48:39 -06:00
Jeremy Bullock
f44848c78d reverted stage::inch change, should be its own PR 2016-07-03 00:15:54 -06:00
Jeremy Bullock
93c27a36d0 removed debug code 2016-07-02 23:40:23 -06:00