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
4be4bb9896
Add next/prev keyframe shortcuts
2019-08-26 23:55:22 -04: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
manongjohn
07a2f0ea21
Merged in opentoonz master to resolve conflicts
2019-08-09 20:59:48 -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
John Dancel
e9fc25509f
Remove stage schematic grouping restriction
2019-03-10 16:37:38 -04: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
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
manongjohn
da00ce3bac
Fix high res panning with button
2019-01-19 19:29:21 -05:00
manongjohn
0b7d7e407d
Stop pan while zooming and other fixes
2019-01-17 18:20:19 -05:00
manongjohn
7a41e5351d
Touchpad zooming adjusment
2019-01-15 18:43:06 -05:00
manongjohn
0458f7d594
Another touchpad zooming adjustment
2019-01-14 00:40:19 -05:00
manongjohn
2c7a66239e
Fix touchpad zooming
2019-01-13 15:51:30 -05:00
manongjohn
2a5e2ec000
Fix non-gesture based panning
2019-01-13 13:47:35 -05:00
manongjohn
931ad27112
Fix zooming offset
2019-01-10 17:44:31 -05:00
manongjohn
7dbf308253
Fix pan scaling, again, hopefully
2019-01-10 00:16:26 -05:00
manongjohn
6e9f12067c
Fix high-dpi zoom offset and pan scaling issues
2019-01-09 20:26:28 -05:00
manongjohn
f5d48a3ebc
Fix quitting-gesture crash
2019-01-09 01:26:17 -05:00
manongjohn
2d59e66990
Merge remote-tracking branch 'origin/master' into schematic_gesture_control
2019-01-09 01:18:26 -05:00
shun-iwasawa
3e933419ee
v1.3.0 ( #2461 )
2019-01-08 11:35:02 +09:00
manongjohn
eca762e5b5
Fix hand tool pan
2019-01-07 02:10:07 -05:00
manongjohn
2c65d91310
Fix schematic zoom for high res
2019-01-06 19:49:04 -05: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
shun-iwasawa
102e065515
fix tapetool crash ( #2352 )
2018-11-04 22:37:12 -07:00
otakuto
6985407a96
remove duplicate include ( #2271 )
2018-10-31 12:00:01 +09:00
manongjohn
c2ff21b8bb
Fix Schematic and Scene viewer pinch zooming (revised)
2018-10-24 22:14:38 -04:00
manongjohn
55bf2e4c29
Fix Schematic and Scene viewer pinch zooming
2018-10-24 19:48:39 -04: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
045b61c7fa
schematic ui modification ( #2241 )
2018-09-11 14:43:03 +09:00
otakuto
ed7dcd5873
using std::swap instead of tswap ( #2195 )
2018-08-30 17:18:43 +09:00
manongjohn
6087a0ff00
Update mousewheel/touchpad zoom logic
2018-08-07 23:40:26 -04:00
otakuto
03ecf4d7bd
ignore Thumbs.db ( #2194 )
2018-08-06 16:56:13 +09:00
manongjohn
bc375e13d4
Fix incorrect gesture zoom point
2018-08-01 08:21:47 -04:00
manongjohn
36f776cd58
Fix touch double-tap to open node properties
2018-08-01 08:06:45 -04:00
manongjohn
fe6ab375d6
Correct touch panning's excessive movement
2018-08-01 07:41:35 -04:00
shun-iwasawa
21e83868df
stage schematic multiple connect feature ( #2196 )
2018-08-01 15:30:42 +09:00
shun-iwasawa
2cd2c564c1
remove unnecessary schematic update ( #2192 )
2018-08-01 15:17:15 +09:00
shun-iwasawa
8e8baa7c60
revert alt-dragging feature to fx schematic ( #2191 )
2018-08-01 15:07:32 +09:00
shun-iwasawa
99ef2eff68
fix crash on paste mesh node in stage schamatic ( #2174 )
2018-08-01 14:10:08 +09:00
manongjohn
6b57d9c910
schematic zoom/pan logic update
2018-07-30 09:43:18 -04:00
manongjohn
3c9f8d8668
Fix cursor icon over schematic viewer buttons
2018-07-25 11:30:51 -04:00
manongjohn
da05a053d1
Change pointer cursor icon per navigation mode
2018-07-25 09:58:49 -04:00
manongjohn
71163fbd73
Merge OT master changes with conflicts resolved
2018-07-24 23:53:23 -04:00
manongjohn
d6e3cc2282
Schematic UI Update ( #2034 )
...
* Schematic UI update
2018-07-24 16:52:45 +09:00
manongjohn
6af3895f01
Fix stylus behavior with touch controls
2018-07-22 02:42:19 -04:00
manongjohn
ebce7c6b3e
Fix mac related zoom/pan touchpad issues
2018-07-22 02:37:49 -04:00
manongjohn
a99cb64467
Schematic navigation enhancement
2018-07-20 06:15:22 -04:00
shun-iwasawa
acfe755bb9
convert old level files to tlv ( #2126 )
2018-07-12 15:04:49 +09:00
shun-iwasawa
3f8e9abbf2
fix link fx ( #2115 )
2018-07-10 17:35:03 +09:00
shun-iwasawa
86dc52b291
more and more translatable texts ( #2045 )
2018-06-08 15:10:34 +09:00
shun-iwasawa
42cc6432f8
fix crash on save curve ( #2044 )
2018-06-08 14:53:28 +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
Jeremy Bullock
0a2e55d2c4
Reduce Footprint of Style Editor ( #1622 )
2018-05-24 15:59:57 +09:00
shun-iwasawa
5b724a61d7
Allow for multilingual FX Help tooltips by jpturcotte (modified) ( #1931 )
...
* Allow for multilingual FX Help tooltips
This PR allows for showing the FX Help tooltips in the user's preferred language, as indicated in" Preferences". If a folder by the name of the language string exists in "$stuff/doc" (e.g. "$stuff/doc/English"), the help files there will be shown first. If the folder or requested file cannot be found, the files in "$stuff/doc" will be shown by default. This is my first code PR, and I am not a programmer, so please be lenient. Thanks to @RodneyBaker for coming up with the idea, to @turtletooth and @shun-iwasawa for helping me resolve my build issues, and finally to @manongjohn for providing encouragement and the logic behind these changes!
* fix tistream checking
2018-05-21 15:30:48 +09:00
shun-iwasawa
dd780b2779
colormodel image ( #1907 )
2018-05-21 15:11:35 +09:00
artisteacher
dcfd7477be
Add audio toggle back to flip book for Mac ( #1890 )
2018-04-26 18:35:44 +09:00
shun-iwasawa
df7bb0e418
EnumProperty: translation and icon by podsvirov (modified) ( #1863 )
...
* EnumProperty: translation and icon
Add support to translate EnumProperty items and
show icon.
2018-04-26 18:24:25 +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
