razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity
4001 commits 2 branches 1 tag 122 MiB
Commit graph

294 commits

Author SHA1 Message Date
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
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
768e206cf8 display cycle in function sheet 2019-07-01 18:22:30 +09: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
manongjohn
4f0f61174e Viewer context menu additions (#2501) 2019-05-29 16:26:30 +09:00
manongjohn
2c447c1ed4 Image viewer gesture controls (#2500) 
* Add gesture control to ImageViewer, PlaneViewer and SwatchViewer
 2019-05-09 15:44:40 +09:00
manongjohn
0b7d7e407d Stop pan while zooming and other fixes 2019-01-17 18:20:19 -05:00
manongjohn
2d59e66990 Merge remote-tracking branch 'origin/master' into schematic_gesture_control 2019-01-09 01:18:26 -05: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
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
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
otakuto
fb35734678 use nullptr instead of Q_NULLPTR (#2246) 2018-10-12 16:05:14 +09:00
shun-iwasawa
045b61c7fa schematic ui modification (#2241) 2018-09-11 14:43:03 +09:00
shun-iwasawa
21e83868df stage schematic multiple connect feature (#2196) 2018-08-01 15:30:42 +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
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
188c309fd1 Travis build error fix 2018-07-20 08:14:54 -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
manongjohn
a21b060921 Timeline UI Update (#1990) 
* Timeline Display Updates and other fixes
 2018-06-20 12:09:22 +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
manongjohn
c43ee65303 Timeline column creation fix and changes (#1958) 2018-05-17 13:28:03 +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
dfea21b893 Fix Warnings on Launch (#1745) 
* fix warnings on launch

* optimize png files
 2018-02-19 15:03:32 +09:00
shun-iwasawa
ad7711e42d color calibration with 3d lut (#1793) 2018-02-19 12:06:07 +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
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
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
fd55f636ce paste numbers command (#1530) 2017-10-26 17:57:56 +09:00
shun_iwasawa
cf18d82356 shortcut template 2017-10-23 16:40:26 +09:00
shun_iwasawa
5e0d4f6900 use global share context 2017-10-11 16:48:14 +09:00
shun_iwasawa
339330f82f prevent windows outside the gui thread 2017-10-11 11:40:34 +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
a0fb331a93 fix fx settings resizing 2017-09-29 18:55:10 +09:00
shun_iwasawa
3cc41fdb9a konero svg icons cont'd 2017-08-22 19:38:27 +09: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
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
shun_iwasawa
1d1a1187fe removed unused codes 2017-07-26 12:28:45 +09: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
Jeremy Bullock
1ef2a2a4d7 start of shaders fix 2017-06-30 22:51:18 -06: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
shun_iwasawa
2732f7220e remove CurrentOpenedBrowser based modality control 2017-05-23 11:54:40 +09:00
Ivan Mahonin
2fc36cb841 Allow to cross compile for Windows with Linux/Mingw (part 2 of 3, bugfixes) (#1149) 
* #mingw #bug: place explicit instantiations on templates before first use

* #mingw #bug: remove API attributes from inline functions

* #mingw #bug: add 'static' attribute for local functions

* #mingw #bug: fix API attributes for splitSpeedInOutSegment

* #mingw #bug: replace strstream to stringstream

* #mingw #bug: remove cross references to plasticskeleton from tnzcore

* #mingw #bug: fix bug with order of initializaition of static variables

* #mingw #bug: fix glutInit
 2017-05-19 19:20:33 +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
96fddba5b4 fix swatches (planeviewer) 2017-05-19 10:18:28 +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
f01305cc15 revert travis to qt5.5 for osx build 2017-04-19 19:59:27 +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
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
shun_iwasawa
1f4a70bdba fix flipconsole connection 2017-02-28 13:56:07 +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
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
16057916f3 easy input for name editor 2016-11-10 22:42:13 +09:00
shun_iwasawa
70b01d1517 Merge remote-tracking branch 'origin/master' into numpad_for_palette_shortcut 2016-11-02 15:46:49 +09:00
Jeremy Bullock
b6833a8759 Sound playback in the viewer (#788) 
* enable sound playback in Viewer with button in the flip console being pressed

close #133
 2016-11-02 11:40:28 +09:00
shun_iwasawa
7292b3f0dc Merge remote-tracking branch 'origin/master' into numpad_for_palette_shortcut 2016-10-31 19:57:30 +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
shun_iwasawa
53bef61327 Merge remote-tracking branch 'origin/master' into numpad_for_palette_shortcut 2016-10-26 20:54:28 +09:00
Jeremy Bullock
cb372ada0e Merge pull request #862 from shun-iwasawa/color_locator 
Locator sub-window for showing close-up image at mouse position
 2016-10-19 19:03:20 -06:00
Jeremy Bullock
bfe8613d31 Startup popup when OT starts (#793) 
* startup popup which provides quick access to new project, new scene and open recent scenes.
 2016-10-18 15:29: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
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
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
Jeremy Bullock
2322767e25 Fixed preset dropdown, dpi lock, labels, decimals 2016-07-23 23:11:49 -06: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
Jeremy Bullock
0b1ad71d3b updated style link and right click menu 2016-07-11 22:36:05 -06: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
733ddbef67 hid gui elements if pixels selected 2016-07-02 23:30:00 -06: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
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
shun_iwasawa
2bdc044b89 revert planeviewer to inherit qglwidget 2016-06-22 20:46:24 +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
Shinya Kitaoka
120a6e041c apply clang-format 2016-06-15 15:43:10 +09:00
Shinya Kitaoka
210a8af034 Use QGLWidget instead of QOpenGLWidget (#337) 
* use QGLWidget instead of QOpenGLWidget for PlaneView

* fix ImageViewer and HexagonalColorWhell
 2016-05-25 18:19:38 +09:00
Keisuke Ogaki
0c8292e173 Revert "Use QOpenGLWidget instead of QGLWidget" (#350) 2016-05-23 16:19:32 +09:00
Shinya Kitaoka
dd27936d94 Use QOpenGLWidget instead of QGLWidget (#315) 
* use QOpenGLWidget instead of QGLWidget for ImageViewer

* use update() instead of updateGL()

* fix doSwapBuffers

* fix HexagonalColorWheel

* fix Viewer

* support AA_ShareOpenGLContexts & AA_EnableHighDpiScaling

* check Qt version
 2016-05-19 19:44:34 +09:00
Shinya Kitaoka
12c444ee0d use std::min and std::max (#318) 2016-05-18 13:03:37 +09:00
shun-iwasawa
c6c5ac3d45 Added menu item 'Toggle Edit in Place' (with small modification) (#306) 
* Added menu item 'Toggle Edit in Place'.

This readds the ability to edit Sub-XSheets in place. The menu item has to be
added to the menu of a room, before it can be used.

* small modification
 2016-05-17 17:46:32 +09:00
Shinya Kitaoka
8105532604 add #pragma once (#303) 2016-05-17 00:04:11 +09:00
Shinya Kitaoka
1660e0d627 Fix conflicts (Remove license and edition defines and code) (#291) 
* Remove license support, and old editions

Previously, old code to support various editions of Toonz, as well as
license activiation code, was cluttering the repository.
Support for LINETEST is retained.

* fix conflicts
 2016-05-16 20:45:31 +09:00
Shinya Kitaoka
7be7e612c4 Fix a version text (Rewrite update check) (#290) 
* Rewrite update check

Before release, the update URL will need to be changed to an official
one.

* remove syntax macros: CASE, __OR, and DEFAULT

* define VC_EXTRALEAN

* modify the URL of opentoonz-version.txt

* fix a type of updateUrl

* remove meanless comments
 2016-05-16 14:16:01 +09:00
Campbell Barton
ea4f7e9dc2 Cleanup: gcc's -Wcomment warnings 2016-04-27 10:54:30 +10:00
Shinya Kitaoka
3bfa549e8b remove "using" 
- using std::string;
- using std::wstring;
- using std::ostream;
- using std::istream;
- using std::iostream;
- using std::ostrstream;
- using std::istrstream;
- using std::fstream;
 2016-04-21 16:23:15 +09:00
Shinya Kitaoka
eabf183e6e fix namespace 2016-04-20 10:24:52 +09:00
Shinya Kitaoka
bb1d046db8 remove using namespace DVGui; from headers 2016-04-20 10:24:49 +09:00
Shinya Kitaoka
9f5a1bd760 use _WIN32 instead of WIN32 2016-04-20 10:24:44 +09:00
shun_iwasawa
0133209a76 Merge remote-tracking branch 'origin/master' into revert_room_feature 2016-04-18 17:09:56 +09:00
shun_iwasawa
dde155b61c enable customizing menubar 2016-04-18 12:17:03 +09:00
Shinya Kitaoka
a85aeb719a Merge remote-tracking branch 'upstream/master' into fix/reduce-boost-dependencies 
# Conflicts:
#	toonz/sources/include/tfarmtask.h
 2016-04-15 14:28:42 +09:00
Shinya Kitaoka
06e491a6f7 Merge pull request #62 from ideasman42/linux-header-case-fix 
Linux: Use correct upper/lower case for includes
 2016-04-15 13:42:35 +09:00
Shinya Kitaoka
262a92f130 use smart pointer for m_imp 2016-04-14 19:15:09 +09:00
Keisuke Ogaki
e76b224937 fix to include cmath 
this fixes commit#6dca1d3a6d64f6b55d5545fd209acc0f81aab9ec
in OSX, need to include cmath to use std::abs
 2016-04-13 19:25:54 +09:00
Shinya Kitaoka
6dca1d3a6d Merge pull request #131 from janisozaur/abs 
Fixes for abs()
 2016-04-13 14:12:56 +09:00
Campbell Barton
d0e335dfee Fix include case 2016-04-12 02:58:51 +10:00
shun_iwasawa
22eaa48951 revert schematic output port 2016-04-04 19:03:52 +09:00
Michał Janiszewski
0585eef453 Fixes for abs() 
abs() only returns integer values, while arguments and results are real
in the cases fixed.

Also fixes some unexpected tokens after `#endif`.
 2016-04-03 02:23:59 +02:00
Toshihiro Shimizu
890dddabbd first commit 2016-03-19 02:57:51 +09:00