Commit graph

523 commits

Author SHA1 Message Date
Jeremy Bullock
cf6dbfac01 Merge remote-tracking branch 'upstream/master' into stop_motion_improvements 2020-04-30 21:31:20 -06:00
Toondad
9c463830ce No QtAudio device issue solved
Closes issue #2308.
2020-04-30 00:46:17 +02:00
Jeremy Bullock
55f731caa6 Merge remote-tracking branch 'upstream/master' into stop_motion_improvements 2020-04-23 16:16:04 -06:00
Rozhuk Ivan
823a31f62c Fix multiple clang warnings 2020-04-13 22:21:56 +03:00
Jeremy Bullock
8a244e10c8 Merge branch 'master' into stop_motion_improvements 2020-04-08 21:46:15 -06:00
Jeremy Bullock
118ba5bcc9 clang 2020-04-08 21:45:17 -06:00
Jeremy Bullock
7f34a026b6 start of stop motion fixes 2020-04-07 02:40:46 -06:00
Rodney
22d65307c5
Merge pull request #3099 from shun-iwasawa/g/fix_convert_to_tlv
Fix Convert to TLV
2020-04-05 13:40:55 -05:00
Rodney
0f666dcfce
Merge pull request #3122 from martinvanzijl/issue-434-fix-opengl-assert-crash
Fix OpenGL assert failures
2020-03-31 12:22:59 -05:00
Martin van Zijl
5b558720b6 Enable Ink #1 Check for vector levels in the viewer. 2020-03-27 06:36:45 +13:00
Martin van Zijl
a10e2f0af9 Add option to disable use of ctrl+alt for changing brush size.
For #2864.
2020-03-23 07:11:38 +13:00
Rodney
edd9b3068c
Merge pull request #3149 from shun-iwasawa/truncate_file_list_in_popup
Truncate File List in the Popup
2020-03-12 13:05:35 -07:00
shun-iwasawa
4bf161d2ff truncate file list in popup 2020-03-12 11:51:33 +09:00
Martin van Zijl
53ad924329 Preserve gap indicator color when fill check is enabled.
For #514.
2020-03-12 07:32:22 +13:00
Martin van Zijl
708c582210 Fix OpenGL assert failures (e.g. using preview feature).
Based on patch by @Teiji-Matsusaka.

Fixes #434. Possibly addresses #2704, too.
2020-03-02 09:06:10 +13:00
shun-iwasawa
1750cb0e87 fix convert to tlv 2020-02-13 16:13:38 +09:00
Rodney
2d54639676
Merge pull request #3067 from shun-iwasawa/reset_undo_on_saving_levels_option
Reset Undo when Saving Levels Preference Option
2020-02-05 07:38:31 -07:00
Tact Yoshida
490db717f5 Use std::vector 2020-02-04 05:13:28 +09:00
Tact Yoshida
fb27cf0e42 Use std::minmax_element 2020-02-04 05:13:08 +09:00
shun-iwasawa
4848836242 fix duration items in clapperboard 2020-01-30 15:08:22 +09:00
shun-iwasawa
d2bb273bc1 reset undo when saving levels preference option 2020-01-27 20:17:43 +09:00
shun-iwasawa
b373379e6e delete unused styles 2020-01-23 12:17:43 +09:00
shun-iwasawa
20109ab4b6 run script w/o opening GUI 2020-01-12 03:21:27 +09:00
shun-iwasawa
3f8df862dc Merge branch 'feature14_script_cli' of https://github.com/blackwarthog/opentoonz into blackwarthog-feature14_script_cli 2020-01-12 02:21:09 +09:00
shun-iwasawa
794fda12ad fix toggle link to studio palette to prevent edit 2020-01-09 18:28:19 +09:00
shun-iwasawa
0489386369 fix phantom fill check 2020-01-08 16:41:55 +09:00
otakuto
91a93e2575 Remove tcg_function_types.h (#2772) 2020-01-08 10:49:48 +09:00
Tact Yoshida
b8554a09aa Use std::sort instead of obsoleted qSort 2020-01-06 06:12:43 +09:00
Jeremy Bullock
552fd4f667 fix playback 2019-12-29 17:51:31 -07:00
Jeremy Bullock
22de1e1190 Merge branch 'master' into shortplay 2019-12-29 16:54:28 -07:00
Rodney
1b1332a30c
Merge pull request #2955 from shun-iwasawa/g/fix_pasted_macro_fx_node_position
Fix Pasted Macro Fx Node Placement
2019-12-26 10:04:25 -06:00
shun-iwasawa
5360253c32
Modify Autocreation Feature (#2943)
* modify autocreation mode
2019-12-26 12:14:50 +09:00
manongjohn
40a40ea47c Add Vector Guided Drawing Auto-Inbetween option (#2931)
* Add Vector Guided Drawing Auto-Inbetween option

* Enable Guided Drawing for Front Onion Skins

* Allow forward Guided Inbetweening

* Add Select Guide Stroke commands

* Add Tween Guide Strokes commands

* Add additional guide stroke selection optins

* Fix break setting issues with guided tweening

* Enable Guided Tweening for Geometric Tool

* Remove unnecessary tool switching for tweening

* Fix closest tweening using wrong strokes

* Disable Guided Tweening when onionskin is disabled
2019-12-25 13:04:57 +09:00
shun-iwasawa
5230690abe fix pasted macro fx node position 2019-12-24 16:03:30 +09:00
Jeremy Bullock
f159071bf7 Canon DSLR and Stop Motion Support (#2635)
* Stop Motion Features

Please note that this feature won't appear in the nightly build until some related changes are completed.
2019-12-23 20:24:44 +09:00
Jeremy Bullock
7c4d5e22f9 Fix 2019-12-07 19:11:51 -07:00
Jeremy Bullock
a956afb488 Merge branch 'master' into shortplay 2019-12-07 18:55:47 -07:00
shun-iwasawa
5f4218e5c8
quick fix setting undo memory size (#2918) 2019-12-05 10:50:17 +09:00
shun-iwasawa
8fb2916598
Overhaul the Preferences (#2894)
* overhaul preferences
2019-12-04 20:44:58 +09:00
manongjohn
e0b43c5ae6 Block name generation of reserved names 2019-12-02 23:59:20 -05:00
Rodney
5176e51379
Merge pull request #2888 from manongjohn/fix_file_loss_issues
Fix file loss issues
2019-11-27 10:58:52 -06:00
manongjohn
fef8cbcc99 Mark PSD and ffmpeg loaded files as readonly in Level Strip 2019-11-25 16:15:21 -05:00
shun-iwasawa
ca556f8550 fix lineargradientfx handles (#2891) 2019-11-21 08:15:47 -07:00
Rodney
1d386c0025
Merge pull request #2890 from manongjohn/warn_failed_save_all_levels
Warn on failing level save during Save All
2019-11-20 15:38:38 -07:00
manongjohn
3f471d64df Notify failed level save at end of Save All 2019-11-20 10:17:23 -05:00
manongjohn
69182e4246 Warn on failing level save all 2019-11-19 21:24:26 -05:00
Rodney
29cf1142d8
Merge pull request #2884 from shun-iwasawa/g/fix_fold_column_slipping
Fix folded columns slipping
2019-11-19 16:47:07 -07:00
manongjohn
c2d5af1b56 Fail save if temp file not found 2019-11-18 16:19:11 -05:00
manongjohn
c77f33ca31 Scene/Level Editor changes (#2882)
* Add Level Editor Box Color Preference

* Scene/Level indicator to viewer titlebar

* Remove Project from viewer titlebars

* Show Zoom % in scene ComboViewer titlebar
2019-11-18 12:37:00 +09:00
shun-iwasawa
98258e6f6c fix folded columns slipping 2019-11-17 03:36:07 +09:00
Jeremy Bullock
40ef9074b3 Merge branch 'master' into shortplay 2019-11-13 23:50:23 -07:00
manongjohn
f2da01b0ab Fix ffmpeg loaded levels (#2876)
* Fix reading ffmpeg frame count and rate

* Make ffmpeg loaded levels uneditable

* Ffmpeg extract frames only when loading

* Fix ffmpeg gif input frame rate
2019-11-13 22:07:58 -07:00
shun-iwasawa
62d519fb72 enable to create folder in startup popup (#2875) 2019-11-13 15:41:12 -07:00
Rodney
efe739cbe4
Merge pull request #2638 from manongjohn/fix_missing_project
Add project outside project root to drop-downs
2019-11-09 19:26:00 -07:00
Rodney
38f43a17b7
Merge pull request #2087 from manongjohn/hide_tools
Disable or Hide unusable tools
2019-11-07 07:12:43 -07:00
caryoscelus
fd5ef6493d Fix bounding box computation in TXshSimpleLevel 2019-10-22 16:18:38 +00:00
luz.paz
ff76b7b4b4 Fix source comment typos
Found via `codespell -q 3 -S *.ts,./thirdparty -L ang,dum,inbetween,sinc,uint ./toonz/sources/toonzlib`
2019-10-11 16:33:55 -04:00
Rodney
4aee5c0dd7
Merge pull request #2763 from manongjohn/support_mypaintbrush_v2
Support for MyPaint brush format version 2
2019-10-05 23:45:05 -05:00
shun-iwasawa
dae7a4321a config button for classic modes & modify rmb menu 2019-09-30 16:09:18 +09:00
shun-iwasawa
52004d2d08 narrow camera column 2019-09-27 17:03:42 +09:00
manongjohn
12d839e903 Fix deleted Camera1 returning due to Camera Column refresh (#2808) 2019-09-26 14:44:13 -06:00
shun-iwasawa
1b50d3cb2b
save fids of color model in palette (#2792) 2019-09-24 12:28:42 +09:00
manongjohn
d274884f4f Fix conflicts with opentoonz master 2019-09-21 22:52:32 -04:00
manongjohn
55a5931ad4
Merge pull request #2776 from shun-iwasawa/g/cache_folder_replacement
Cache folder replacement & Clear cache command
2019-09-20 08:50:42 -04:00
Rodney
83fe31d0e0
Merge pull request #2600 from manongjohn/xcode_builds
Xcode IDE support for macOS builds
2019-09-19 09:15:18 -05:00
Rodney
9dac589b4e
Merge pull request #2574 from manongjohn/add_camera_column
Add Camera Column to Xsheet
2019-09-18 23:54:03 -05:00
manongjohn
334c951644 Change Preference defaults (#2543)
* Change default Preferences

* Update default room layouts

* Re-enable Auto Stretch by default

* Scale down Inbetween icon as need/Add Auto inbetween tooltip
2019-09-17 12:22:18 -06:00
shun-iwasawa
7f4819b70b cache folder replacement 2019-09-17 16:26:56 +09:00
manongjohn
df7b097208 Merged in opentoonz master with conflicts resolved 2019-09-14 16:58:07 -04:00
manongjohn
cc6361bbf7 Merged in opentoonz master with conflicts resolved 2019-09-14 15:02:03 -04:00
shun-iwasawa
a63c2de57f
fix crash on loading blackmagic codecs (#2764) 2019-09-10 19:09:32 +09:00
shun-iwasawa
55a8816333
Merge pull request #2514 from manongjohn/backup_scene_with_levels
Backup scene file

N.B. The backup feature is turned ON for all users by default.
2019-09-10 15:20:50 +09:00
manongjohn
2932f505fe Support for MyPaint brush version 2 format 2019-09-09 19:18:12 -04:00
Ivan Mahonin
2e1c781c66 #scriptcli: allow to run script from command line 2019-09-09 12:04:21 +07:00
manongjohn
312940346a Include projects in older versions in drop downs 2019-09-08 11:58:50 -04:00
manongjohn
0b37bd9c63 Fix backup ext. and sequenced files. 2019-09-07 19:29:05 -04:00
manongjohn
918bc7607c Merge opentoonz master with conflicts resolved. 2019-09-07 00:02:17 -04:00
manongjohn
b41f36e4fa Save camera column data with camera pegbar 2019-09-06 23:26:24 -04:00
manongjohn
3fe913a942 Make Show Camera a sub option of Show Keyframes 2019-09-06 22:30:41 -04:00
manongjohn
4334db09bc Enable lock on camera column 2019-09-06 21:59:43 -04:00
shun-iwasawa
a0d489d21e Use std::max and std::min instead of qMax and qMin (#2753) 2019-09-05 12:35:04 -06:00
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