Commit graph

293 commits

Author SHA1 Message Date
manongjohn
cc6361bbf7 Merged in opentoonz master with conflicts resolved 2019-09-14 15:02:03 -04:00
shun-iwasawa
298c968d24
change step and type in function selection (#2754) 2019-09-10 19:07:56 +09:00
manongjohn
918bc7607c Merge opentoonz master with conflicts resolved. 2019-09-07 00:02:17 -04:00
shun-iwasawa
875c7e58ec multi selection in function sheet column header 2019-09-06 19:05:41 +09:00
shun-iwasawa
a0d489d21e Use std::max and std::min instead of qMax and qMin (#2753) 2019-09-05 12:35:04 -06:00
shun-iwasawa
21c135a2fc fix histogram with 3dlut 2019-08-30 17:17:23 +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
Rodney
c6b31e3ade
Merge pull request #2645 from turtletooth/restore_width
Stop Width Change on Film Strip on Resize
2019-08-26 00:52:08 -05:00
shun-iwasawa
ece48f2d47
fix viewer pan disabled (#2723) 2019-08-26 12:47:54 +09:00
Rodney
bc1c45412d
Merge pull request #2711 from manongjohn/fix_schematic_spline_toggles
Fix schematic spline option icon zooming
2019-08-22 12:00:09 -05:00
shun-iwasawa
199e297326 translation fix and update 2019-08-22 12:42:06 +09:00
shun-iwasawa
260cd75f60 hide inbetween values in finction sheet 2019-08-21 17:33:34 +09:00
shun-iwasawa
c128ae8b9c
revert text align of function sheet (#2717) 2019-08-21 15:48:32 +09:00
shun-iwasawa
e40777885d
Fix OpenGL widgets in floating panels disapper on room switch (#2684)
* fix floating gl window disappers on room switch
2019-08-19 17:18:25 +09:00
manongjohn
4f53786c92 Add schematic spline option tool tips 2019-08-17 10:14:55 -04:00
manongjohn
7b18ae0f39 Fix spline option icon zooming 2019-08-17 09:46:36 -04: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
92d40c810b fix crash with visualization commands 2019-08-05 17:37:40 +09:00
shun-iwasawa
7a6807b001
Modify saving and restoring panels / popups geometries. (#2685)
* restore floating panel state

* save popup geometry in dtor
2019-08-02 19:18:00 +09:00
shun-iwasawa
7e83f5434a
fix placing macro fx (#2622) 2019-08-02 18:15:20 +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
b4eed55ce9 Update camera icons and thumbnails 2019-07-29 08:17:03 -04: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
768e206cf8 display cycle in function sheet 2019-07-01 18:22:30 +09: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
b13816d1b0 Fx setting popup enhancements (#2479)
* Set min fx settings popup size

* Keep popup dimensions when frame changes

* Correct crash issue with keeping size between frames

* Update fx settings with node change

* Fix shrinking swatch size on empty fx

* Convert Fx Settings to dockable window

* Fixing Travis build error

* Replace FxSettingsPanel with DockWidget

* Set initial switch window dimensions

* Open popup in center of screen
2019-06-19 22:27:48 -06:00
Jeremy Bullock
2801fcac9c Stop Width Change on Film Strip on Maximize 2019-06-19 01:29:09 -06:00
manongjohn
4f0f61174e Viewer context menu additions (#2501) 2019-05-29 16:26:30 +09:00
John Dancel
35a3a8bd7e Fix crash when saving read-only palette file 2019-05-15 15:04: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
shun-iwasawa
55ca6bddd5 fix removing ghost connection (#2580) 2019-04-01 17:26:59 +09:00
shun-iwasawa
fcbc0a6582 fix update styleeditor (#2558) 2019-04-01 17:18:10 +09:00
manongjohn
cd6e9e4b6f Fix bad Fx connection crash (#2554) 2019-03-26 01:59:03 +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
6756911932 Remove tcg_deleter_types.h (#2436) 2019-02-21 11:58:39 +09:00
otakuto
dfe1cf8a78 Use range-based for instead of foreach (#2433) 2019-02-20 16:31:03 +09:00
shun-iwasawa
e140c2472e fix missing images with applying 3dlut (#2512) 2019-02-07 18:21:55 +09:00
shun-iwasawa
3e933419ee
v1.3.0 (#2461) 2019-01-08 11:35:02 +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
adae7d2881 Fix schematic group node display issue (#2403)
* Fix schematic group node display issue

* Fix scene infinitely updating
2018-12-27 10:51:57 +09:00
Tact Yoshida
1d7cf9a5bf Remove tArrayCount macro 2018-12-20 05:16:25 +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
shun-iwasawa
7846407b39 remove mysettings (#2366) 2018-11-16 18:28:38 +09:00
shun-iwasawa
11adda4885 fix playback slowness with style editor (#2367) 2018-11-12 18:58:53 +09:00