Commit graph

517 commits

Author SHA1 Message Date
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
Jeremy Bullock
4ce9539416 Function Editor Display Options (#1649)
* Function Editor Display Options
2018-03-22 16:32:19 +09:00
shun-iwasawa
59484bd446 edit all (#1870) 2018-03-21 17:23:25 -06:00
shun-iwasawa
133733bb6c enable to skip version check (#1824) 2018-03-14 16:58:55 +09:00
shun-iwasawa
388550d11d fix 3dlut crash (#1865)
close #1862
2018-03-14 15:32:28 +09:00
shun-iwasawa
192c8e0e4e fix double slider (#1843) 2018-03-14 14:45:08 +09:00
shun-iwasawa
c13c8e4599 fix cell dragging (#1836)
close #1819
2018-03-14 12:04:57 +09:00
shun-iwasawa
dfea21b893 Fix Warnings on Launch (#1745)
* fix warnings on launch

* optimize png files
2018-02-19 15:03:32 +09:00
shun-iwasawa
171458b325 fix #1639 (#1743) 2018-02-19 14:04:48 +09:00
shun-iwasawa
ad7711e42d color calibration with 3d lut (#1793) 2018-02-19 12:06:07 +09:00
shun-iwasawa
22412dc1a8 v1.2.0 (#1631)
* v1.2.0

* more update versions to v1.2.0
2017-12-11 13:23:11 +09:00
Jeremy Bullock
934e8225f1 Clarify some wording (#1627) 2017-12-01 13:54:44 +09:00
shun_iwasawa
d4973a989e fix message center style 2017-11-30 21:26:47 +09:00
shun_iwasawa
b0891094aa hyphen in fx parameter expression 2017-11-28 12:36:26 +09:00
shun_iwasawa
23727d2b13 fix select all on only the first click 2017-11-24 21:13:52 +09:00
manongjohn
f643b05c25 Zoom in/out of Timeline (#1573)
* Add timelime zoom control
2017-11-24 18:15:54 +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
79662fa9d2 fix crash on launch with flipbook (#1588) 2017-11-24 11:54:49 +09:00
Jeremy Bullock
7712907c92 Middle Mouse Drag to Edit Values (#1362)
* Middle mouse drag to edit numeric values
* The function editor spreadsheet values can be ctrl + dragged to change their value. Alt + click on a key will clear it.
2017-11-20 16:28:59 +09:00
Jeremy Bullock
62833782ee Added Commands to Flip Viewer Horizontally and/or Vertically (#1356)
* Added Commands to Flip Viewer Horizontally and/or Vertically
2017-11-20 15:55:27 +09:00
shun-iwasawa
e2505a1885
bokeh ref iwa fx (#1555) 2017-11-17 17:31:32 +09:00
Jeremy Bullock
52a220b89a New Note Level (#1322)
* New Note Level
2017-11-16 17:08:01 +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
Jeremy Bullock
4bf6729ad2 Style Editor Overhaul (#1397)
* added horizontal layout and organized tab
2017-11-13 16:52:30 +09:00
shun_iwasawa
e553fc7d27 undo for autoapply 2017-11-07 16:24:20 +09:00
Jeremy Bullock
4183496bdc Merge pull request #1517 from shun-iwasawa/turtletooth-shaders
Fix for Shaders and Switch to QOpenGL by turtletooth and blackwarthog (modified)
2017-10-27 08:16:43 -06:00
shun_iwasawa
cf18d82356 shortcut template 2017-10-23 16:40:26 +09:00
shun_iwasawa
b2baddc40b fix fullscreen 2017-10-18 20:45:22 +09:00
shun_iwasawa
1c961d09fd fix offset 2017-10-16 22:26:34 +09:00
shun_iwasawa
5e0d4f6900 use global share context 2017-10-11 16:48:14 +09:00
shun_iwasawa
c44e4b4863 Merge branch 'shaders' of https://github.com/turtletooth/opentoonz into turtletooth-shaders 2017-10-10 22:18:13 +09:00
shun_iwasawa
bb97eec5f7 fix numpad label 2017-10-10 13:13:04 +09:00
manongjohn
399e7d4a0b Xsheet Column Header Layout Redesign (#1347)
close #1316 
close #490
2017-10-04 16:00:34 +09:00
shun_iwasawa
a0fb331a93 fix fx settings resizing 2017-09-29 18:55:10 +09:00
Yu Chen
da5534a8f7 More translatable UI strings (#1486) 2017-09-27 16:03:29 +09:00
Kite
b058c5a6eb New Folder Icons / Style File Browser Window
- tweaks style of file browser window
- replaces folder icons with redesign
- cleans various other icons
- moves some things into external qss
2017-09-21 17:23:56 +01:00
Jeremy Bullock
807052a00f Pick a Font (#1386) 2017-09-13 19:04:05 +09:00
Kite
53abfc03ad Unify Palette Lock Icon (#1453)
Uses the lock icon from the theme.
2017-09-07 18:23:10 +09:00
Jeremy Bullock
6f642b3399 Show Renamed Names in MacroFx (#1355) 2017-09-04 14:53:20 +09:00
Jeremy Bullock
7ae920982f Change Matte to Alpha in the UI (#1352)
* Change Matte to Alpha in the UI
2017-08-25 17:55:12 +09:00
shun_iwasawa
3cc41fdb9a konero svg icons cont'd 2017-08-22 19:38:27 +09:00
Jeremy Bullock
59124e4b0a Merge pull request #1335 from shun-iwasawa/fix_scroll_xsheet
Fix Function Editor to be scrolled synchronously with Xsheet
2017-08-08 21:52:43 -06:00
Jeremy Bullock
87079a9312 Merge pull request #1314 from shun-iwasawa/fix_camera_capture
Camera Capture Enhancements
2017-08-08 20:12:45 -06:00
Jeremy Bullock
7513dc5ab9 Merge branch 'master' into shaders 2017-08-08 13:49:34 -06:00
shun_iwasawa
22312d2e9c fix scroll xsheet 2017-08-08 15:14:55 +09:00
Ivan Mahonin
bf1d82af08 MyPaint brushes for OpenToonz raster levels (#1124)
close #417
2017-08-04 12:31:50 +09:00
Jeremy Bullock
6095dd52ec Fix popup locations (#1287) 2017-07-28 16:16:25 +09:00
shun_iwasawa
d77cdf23f3 fixed fps update 2017-07-26 14:05:17 +09:00
Jeremy Bullock
e93b47f8dd Merge pull request #1313 from shun-iwasawa/konero_svg_icons
Konero svg icons (Part 1)
2017-07-24 23:45:17 -06:00
Jeremy Bullock
e8422eb87f Merge branch 'master' into konero_svg_icons 2017-07-23 14:38:57 -06: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
shun_iwasawa
1351732653 fix_camera_capture 2017-07-03 15:46:30 +09:00
shun_iwasawa
4a5f426fc0 konero svg icons part 1 2017-07-03 12:33:11 +09:00
Jeremy Bullock
1ef2a2a4d7 start of shaders fix 2017-06-30 22:51:18 -06:00
shun-iwasawa
5b7b9fb309 V1.1.3 (#1255) 2017-06-06 21:19:00 +09:00
Jeremy Bullock
c82a0a73f1 Move keyframe navigator to qss (#1244)
* Move keyframe navigator to qss
2017-06-05 13:28:00 +09:00
Jeremy Bullock
72c1f103e2 Fix for pairfield drawing with new themes (#1246)
* Clean pairField drawing
2017-06-05 10:54:53 +09:00
Jeremy Bullock
15fcba2e23 XSheet Toolbar (#989)
* XSheet Toolbar Added
2017-06-02 16:18:05 +09:00
Jeremy Bullock
f880392f33 Merge pull request #1206 from shun-iwasawa/fix_high_dpi
Fix GUI glitches with high dpi monitors
2017-06-01 23:48:45 -06: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
shun_iwasawa
2732f7220e remove CurrentOpenedBrowser based modality control 2017-05-23 11:54:40 +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
e33f9a51d2 create zerary fx node at clicked pos (#1191) 2017-05-19 17:42:55 +09:00
shun_iwasawa
96fddba5b4 fix swatches (planeviewer) 2017-05-19 10:18:28 +09:00
Jeremy Bullock
0cb7c2dfec Fix playback stuck bug (#1025) 2017-05-09 13:45:52 +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
039ecc9c2c Merge pull request #1132 from shun-iwasawa/hi_resolution
High dpi monitors support
2017-04-20 23:58:37 -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
岩澤 駿 
34178f6c6e Merge branch 'hi_resolution' of https://github.com/shun-iwasawa/opentoonz into shun-iwasawa-hi_resolution 2017-04-20 11:11:59 +09:00
shun_iwasawa
01e417ce4b font size : replace point with pixel 2017-04-19 20:45:36 +09:00
shun_iwasawa
7c988d9428 fix other panels for high dpi monitors 2017-04-19 19:31:31 +09:00
shun_iwasawa
a35b8f8c48 bokeh fx iwa 2017-03-24 15:14:07 +09:00
Campbell Barton
54b714a0b6 Resolve #1046, profile errors flooding stdout 2017-03-24 09:51:25 +11:00
Jeremy Bullock
9bc9a3315a Merge pull request #1071 from shun-iwasawa/fix_flipconsole_connection
Fix the Flipbook's console to be updated when the "Blank Frame" option is changed in the Preferences
2017-03-15 21:45:09 -06:00
Jeremy Bullock
0f89c59f13 Move level palette lines to qss (#1035) 2017-03-15 20:48:06 +09:00
Jeremy Bullock
2739e0d08c Pair field style #881 (#1034)
* Moved Pair Fields to qss
2017-03-15 20:47:32 +09:00
Jeremy Bullock
3a998ec844 Allow border on docks- use QFrame (#1054) 2017-03-15 13:32:57 +09:00
Jeremy Bullock
915f195e70 Remove hard-coded lines around panels (#1053)
* Remove line around style editor, schematic and flipbook
2017-03-15 13:16:21 +09:00
shun_iwasawa
1f4a70bdba fix flipconsole connection 2017-02-28 13:56:07 +09:00
Campbell Barton
fb6d38d59c CMake: cleanup indentation 2017-02-11 11:13:07 +11:00
Jeremy Bullock
d9eff09619 changed separator spacing to 4 (#772)
close #771
2016-12-09 22:55:45 +09:00
Campbell Barton
6e785fd361 Fix use after free error (#896)
Fixing a crash problem related to the Function Viewer
close #892
2016-11-24 11:10:50 +09:00
Jeremy Bullock
37acd430c0 Merge pull request #911 from shun-iwasawa/nameeditor_stamp
Introducing easy input feature for the Style Name Editor
2016-11-15 20:56:09 -07:00
shun_iwasawa
0854e84066 label on top 2016-11-15 15:36:06 +09:00
shun_iwasawa
6c76ac8b5c resizable buttons 2016-11-15 14:27:15 +09:00
shun_iwasawa
03feedea0f fixes 2016-11-14 20:55:04 +09:00
shun_iwasawa
4ada6a9de4 dialog position fix 2016-11-14 15:56:58 +09:00
Campbell Barton
d6e3ed1575 Comments: translate icon-generator notes 2016-11-14 08:36:58 +11:00
shun_iwasawa
aa32e96af2 medium chip menu 2016-11-11 17:35:22 +09:00
shun_iwasawa
16057916f3 easy input for name editor 2016-11-10 22:42:13 +09:00
shun_iwasawa
22ad9ee8ef fix convert to painted tlv 2016-11-09 16:20:58 +09:00
shun_iwasawa
ffb2f05d63 changed scrollbar width to 16 2016-11-07 16:45:43 +09:00
shun_iwasawa
7292b3f0dc Merge remote-tracking branch 'origin/master' into numpad_for_palette_shortcut 2016-10-31 19:57:30 +09:00
shun_iwasawa
cede7cbd47 enable shortcut in paletteviewer 2016-10-31 19:45:48 +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
shun_iwasawa
754d4551b7 fix not to browse initial description text 2016-10-28 20:05:27 +09:00
Campbell Barton
f2b2c436ef Fix for crash inserting a keyframe (#798)
Make a copy of `TParamChange` in `FunctionTreeModel::onChange()` since the notifier would run later on (via Qt's event loop).
2016-10-28 14:48:26 +09: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
0148381f16 fix studiopalette drag 2016-10-26 16:27:19 +09:00
shun_iwasawa
db5f54040c locator popup 2016-10-14 15:12:24 +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
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
shun_iwasawa
640862e570 revert link style 2016-09-15 20:50:22 +09:00
shun_iwasawa
202d1959be Merge branch 'stylelink' of https://github.com/turtletooth/opentoonz into turtletooth-stylelink 2016-09-15 19:39:31 +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
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
shun_iwasawa
217e7193db resize scene instead of changing dpi 2016-08-19 15:09:48 +09:00
shun_iwasawa
98ad89fbd3 Merge remote-tracking branch 'origin/master' into stageinch2 2016-08-19 12:33:38 +09:00
Jeremy Bullock
f3ea7c244f Allow Enter in Save File Field to Save (#687)
* Allow enter key in save field to trigger save procedure
2016-08-18 18:38:37 +09:00
shun_iwasawa
d6df3f9261 introducing stage-standarddpi 2016-08-16 13:52:38 +09:00
Campbell Barton
88b15e4c55 Cleanup: format warnings 2016-08-11 08:54:20 +10:00
shun_iwasawa
39baf50099 clang format 2016-08-05 15:40:11 +09:00
shun_iwasawa
64e800caf5 Merge branch 'pixels2' of https://github.com/turtletooth/opentoonz into turtletooth-pixels2 2016-08-05 15:28:35 +09:00
shun-iwasawa
27b0cfd38c clang formatting (#703) 2016-08-04 16:23:36 +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
turtletooth
21dab2ca87 updated level export default settings (#621)
close #530
2016-07-25 12:37:48 +09:00
Jeremy Bullock
2322767e25 Fixed preset dropdown, dpi lock, labels, decimals 2016-07-23 23:11:49 -06: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
66af7cc365 Function Curves Window Usability - Option 1 (#657)
* removed ctrl key requirement from function curves editor

* removed commented code
2016-07-21 10:29:28 +09:00
Shinya Kitaoka
2a7129aa92 use std::unique_ptr<> instead of std::auto_ptr<> (#601) 2016-07-20 21:49:32 +09:00
tomosu
8d9526db1b add doneCurrent in fx and raster code (#636) 2016-07-14 17:42:21 +09:00
Campbell Barton
ccd5052709 Cleanup: declare local functions static (#632)
Applies to toonz, toonzfarm, toonzqt.
2016-07-14 15:51:27 +09:00
shun-iwasawa
535d3f26d8 Merge pull request #400 from turtletooth/pixels
Add pixels - Finished.
2016-07-14 12:40:30 +09:00
Jeremy Bullock
59dbbf498a Clang formatting applied 2016-07-12 21:09:46 -06:00
turtletooth
9e7a9d2cd4 Merge pull request #581 from shun-iwasawa/turtletooth-maximize
Maximize Pane where mouse is shortcut by turtletooth (modified)
2016-07-12 14:05:10 -06:00
Jeremy Bullock
0b1ad71d3b updated style link and right click menu 2016-07-11 22:36:05 -06:00
shun_iwasawa
21a6b6ba06 pencil test popup 2016-07-06 20:06:20 +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
01efa14358 add small fix and clang format 2016-07-05 19:28:44 +09:00
shun_iwasawa
617a6d6d2f Merge branch 'maximize' of https://github.com/turtletooth/opentoonz into turtletooth-maximize 2016-07-05 17:21:24 +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
3c545e0522 removed duplicate code 2016-07-02 23:35:53 -06:00
Jeremy Bullock
733ddbef67 hid gui elements if pixels selected 2016-07-02 23:30:00 -06:00
Campbell Barton
f2d492861f CMake: use multi-line defines
Easier to read and avoids merge conflicts
2016-07-02 22:23:18 +10:00
Jeremy Bullock
5e3b5e8cc3 Merge branch 'master' into pixels 2016-06-30 20:57:15 -06:00
Campbell Barton
f493896cc0 Cleanup: typo (sensibility) 2016-06-29 20:49:17 +10:00
Shinya Kitaoka
d1f6c4e95b REFACTORING: Add final specifiers (#537)
* add final specifiers

* apply clang-format

* fix for macOS
2016-06-29 15:17:12 +09:00
Shinya Kitaoka
91695244e8 Merge pull request #532 from shun-iwasawa/fix_infoviewer_text_color
Fix File Info text color
2016-06-29 12:56:16 +09:00
shun-iwasawa
c86c5d6189 Organizing the Tool option bar layout (#443)
* edit tool, selection tool, brush tool

* other tools

* include cmath
2016-06-27 15:22:54 +09:00
shun_iwasawa
b102ca20bb fix infoviewer text color (and some other ui color) 2016-06-27 14:21:30 +09:00
Shinya Kitaoka
0d7879fb9b Merge pull request #495 from shun-iwasawa/revert_planeviewer
(incompletely) Fix crash on using Shader Fx
2016-06-23 17:06:54 +09:00
tomosu
965183e43c Merge pull request #475 from skitaoka/refactoring/add-override
REFACTORING: add override specifiers
2016-06-23 17:03:53 +09:00
shun_iwasawa
24d63588e8 autopaint indicator on palette viewer 2016-06-22 22:27:06 +09:00
shun_iwasawa
2bdc044b89 revert planeviewer to inherit qglwidget 2016-06-22 20:46:24 +09:00
shun-iwasawa
76270a4b64 Merge pull request #395 from turtletooth/palettes
Toonz Palettes folder now working and has 3 starter palettes
2016-06-20 15:55:47 +09:00
Shinya Kitaoka
38fd868138 apply clang-format 2016-06-20 11:34:17 +09:00
Shinya Kitaoka
473e70432a add override specifier 2016-06-20 11:34:15 +09:00