Commit graph

349 commits

Author SHA1 Message Date
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
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
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
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
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