Commit graph

836 commits

Author SHA1 Message Date
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
794b2df7a2 Merge pull request #845 from shun-iwasawa/camera_control
Add button video capture filter control to Camera Capture (only for Windows)
2016-09-28 22:39:39 -06:00
Campbell Barton
be12a8c1a8 Merge pull request #844 from ideasman42/fix-gl-591
Fix/Workaround bug #591
2016-09-29 09:39:36 +10:00
Campbell Barton
4cdcb009ef Fix/Workaround bug #591
We could check for the extensions but these OpenGL options are never used,
so no need to disable them.
2016-09-29 07:01:26 +10:00
shun_iwasawa
96a3e3c54e remove find_library and small fix 2016-09-28 16:06:01 +09:00
Jeremy Bullock
779cdf5542 fix gif reader not getting all frames (#770)
changed frame counting method for GIF format in order to get frame duration properly
2016-09-28 15:52:57 +09:00
shun_iwasawa
b7d07aabce add video capture filter settings 2016-09-28 13:59:13 +09: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
Gabriel Gazzán
7e3dfc61ed Spanish UI - some fixes 2016-09-20 17:37:38 -03:00
Gabriel Gazzán
52da33dd6e Merge branch 'master' of https://github.com/opentoonz/opentoonz 2016-09-20 17:24:00 -03:00
shun_iwasawa
9f19cf15da small fixes 2016-09-20 17:32:21 +09:00
Jeremy Bullock
792dc2b6b4 Merge pull request #805 from shun-iwasawa/fix_version_number
Update version numbers for tcleanupper, tcomposer and tconverter
2016-09-15 21:47:02 -06:00
Jeremy Bullock
72d52f5dfc Merge pull request #782 from shun-iwasawa/camcap_modification
Camera Capture fixes
2016-09-15 08:16:38 -06: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
Jeremy Bullock
e59b1fa741 Additional Project Root Location (#664)
Enabled to select additional project root location via Preferences.
close #736
2016-09-15 18:56:03 +09:00
shun_iwasawa
bd6b1b6e90 status -> state 2016-09-14 16:37:24 +09:00
shun_iwasawa
beb3057607 enable shift + tab 2016-09-13 19:10:05 +09:00
Jeremy Bullock
7e84f400f1 Fix save all issue setting wrong path on cancel save scene (#775)
* Fix save all issue setting wrong path on cancel save scene
close #774
2016-09-13 18:08:55 +09:00
shun_iwasawa
94ecc2fcc6 revert autocenter in cleanup settings 2016-09-13 16:53:46 +09:00
shun_iwasawa
4dbfbc4b03 fix version numbers 2016-09-13 13:52:34 +09:00
shun_iwasawa
4635d82930 numpad for palette shortcut 2016-09-12 19:51:52 +09:00
boombatower
0dbe175381 Replace else() with elseif(APPLE) to ensure quicktime not built on unix. 2016-09-09 22:28:19 -05:00
shun-iwasawa
7cd1ff71f5 clang format (#797) 2016-09-08 16:54:16 +09:00
Jeremy Bullock
3f5067c8c2 Mp3 Import (#749)
MP3 import  ( ffmpeg required )
2016-09-08 15:19:01 +09:00
Campbell Barton
a6cacc8cf1 Translate comments to English 2016-09-08 15:07:21 +10:00
Campbell Barton
17ede676eb Merge pull request #790 from mcccs/master
Typos
2016-09-08 14:09:12 +10:00
MCCCS
a0ce326e1b 🐛 Fix spelling mistakes 2016-09-07 16:28:50 +03:00
shun_iwasawa
74d63437e8 add style sheet for sound column 2016-09-05 21:33:28 +09:00
Jeremy Bullock
9cb1845f21 Merge pull request #785 from shun-iwasawa/fix_black_mesh_preview
Fix mesh preview blackout on opening Create Mesh popup
2016-09-04 12:28:25 -06:00
shun_iwasawa
3e8c6cf9de fix mesh preview blackout on opening popup 2016-09-02 20:43:08 +09:00
shun_iwasawa
13d3ac7822 remove onion cursor on mouse leave 2016-09-02 20:25:54 +09:00
shun_iwasawa
339a9c28e1 camera capture fixes 2016-09-02 17:04:44 +09:00
Jeremy Bullock
e7667a0e6d sceneviewer fix for updating markers (#778)
close #692
2016-09-02 11:47:04 +09:00
Campbell Barton
4121b4ed18 Merge pull request #723 from ckorn/format
Add format string literal
2016-09-01 17:47:40 +10:00
Jeremy Bullock
48c6fc0de2 Typo fixes (#531)
* Typo fixes for the file access warning

close #501
2016-09-01 14:24:19 +09: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
Jeremy Bullock
8bb0936364 New Geometry Icon (#716)
* introduced new geometry icon (designed by Rayek)
2016-08-24 17:21:27 +09:00
Jeremy Bullock
8db15824a6 Add Hidden Commands to Menus (#677)
* added hidden commands to menu bar
* added playback commands to the customize menu bar popup
close #393
2016-08-24 17:02:24 +09:00
Jeremy Bullock
1bad81ba81 Merge pull request #739 from shun-iwasawa/stageinch2
Introducing Stage::standardDpi instead of updating Stage::inch
2016-08-23 21:17:05 -06:00
Jeremy Bullock
0558c9aa17 Merge pull request #719 from shun-iwasawa/panel_titlebar
Style sheet for the panel title bar
2016-08-19 08:17:22 -06:00
shun-iwasawa
5e2a8ff232 Improvement of direct inputting feature in Xsheet (#722)
* improve xsheet direct input

*  small fix
2016-08-19 18:31:00 +09:00
shun-iwasawa
6cf0fab004 fix beautification script (#745) 2016-08-19 16:24:27 +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
Shinya Kitaoka
9c70ac1a01 Fix for clang-format (#743) 2016-08-19 12:11:52 +09:00
Shinya Kitaoka
6fa9acbd5f Add source formatting check (#689)
* add source formatting check
* fix beautification scripts
2016-08-18 21:10:57 +09:00
Jeremy Bullock
2a416897a2 Level Settings Popup: removed name unchanged warning and set focus on other errors (#686)
* Level Settings Popup : removed name unchanged warning and set focus on other errors
2016-08-18 21:02:09 +09:00
shun_iwasawa
e897af4ff2 organize palette 3 2016-08-18 20:25:44 +09:00
Jeremy Bullock
17d8f9dfaf Disable onionskin during playback (#708)
* disable onionskin during playback
* added option to show onion skin during playback in preference

close #486
2016-08-18 18:41:31 +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
bb0d83547a add dpi compatibility check and remove comment 2016-08-18 17:27:10 +09:00
Jeremy Bullock
4134b2d0d8 Fixed assert failing on project popup (#646)
* Fixed assert failing on project popup on choosing sandbox project

close #645
2016-08-17 12:04:33 +09:00
shun_iwasawa
4b846056c9 Merge remote-tracking branch 'origin/master' into organize_palette 2016-08-16 18:41:23 +09:00
shun_iwasawa
d6df3f9261 introducing stage-standarddpi 2016-08-16 13:52:38 +09:00
Gabriel Gazzán
47f9765e0f Spanish - quick fix 2016-08-11 21:10:43 -03:00
Gabriel Gazzán
885780c487 Merge branch 'master' of https://github.com/opentoonz/opentoonz 2016-08-11 21:04:46 -03:00
Campbell Barton
88b15e4c55 Cleanup: format warnings 2016-08-11 08:54:20 +10:00
Christoph Korn
c17229f066 Add format string literal
Prevents security issues when the string contains
format specifiers.
Fixes: warning: format not a string literal and
no format arguments [-Wformat-security]
2016-08-10 22:30:04 +02:00
Jeremy Bullock
2969b4c245 support for jpeg import (#656)
This allows jpeg images to be imported.
close #576
2016-08-10 21:46:04 +09:00
shun_iwasawa
064d70388e bring panel title bar to the style sheet 2016-08-08 16:20:27 +09:00
shun-iwasawa
a8d73fbd70 v1.1.1 (#718) 2016-08-08 15:44:05 +09:00
Gabriel Gazzán
850cb6c992 Spanish UI - quick fix 2016-08-05 17:53:42 -03:00
Gabriel Gazzán
5438386eab Spanish UI - update [100%] 2016-08-05 17:45:48 -03: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
b91cf10aa4 v1.1.0 (#704) 2016-08-04 18:01:19 +09:00
shun-iwasawa
27b0cfd38c clang formatting (#703) 2016-08-04 16:23:36 +09:00
tomosu
ac08090374 change to move thread before destructor called (#702) 2016-08-04 14:40:59 +09:00
Jeremy Bullock
bc0379c413 Updated rooms for consistency (#584)
* updated basics room

* updated rooms for consistency

* fixed camera capture not showing up on first load

 close #583
2016-08-04 14:25:27 +09:00
shun_iwasawa
ff185f4824 Merge remote-tracking branch 'origin/master' into organize_palette 2016-07-29 17:25:00 +09:00
shun_iwasawa
48c6711cad organize palette 2 2016-07-29 17:23:11 +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
shun_iwasawa
84461e8bed camera capture - frame modifier option 2016-07-25 18:09:24 +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
9c30a09048 Correct function name
Function name didn't match header (though it remains unused).
2016-07-23 11:24:31 +10:00
Campbell Barton
5cfa877449 Quiet warnings
- duplicate headers in C source & header
- use const char arg
- invalid typedef
2016-07-23 05:23:17 +10: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
fef27f08d4 changed default icon size to 16 by 9 (#662) 2016-07-22 17:20:38 +09:00
Campbell Barton
8c6c57f1b4 Enable missing-declarations warning (#643)
Finish ensuring symbols use headers correctly
2016-07-22 13:38:33 +09:00
Shinya Kitaoka
0f12b3ee16 use new context (#659) 2016-07-21 10:34:09 +09: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
shun_iwasawa
c382b8addd Merge remote-tracking branch 'origin/master' into organize_palette 2016-07-20 12:47:43 +09:00
turtletooth
e0f89bc768 Merge pull request #652 from shun-iwasawa/pencil_test_improvement
Camera Capture (former Pencil Test) improvement
2016-07-19 19:47:40 -06:00
shun_iwasawa
7b62b4505b pencil test improvement 2016-07-19 21:45:02 +09:00
Jeremy Bullock
cd848c35e6 Changed connection to reference 2016-07-15 21:42:28 -06:00
Campbell Barton
4e9ecfd38b Fix crash reading level (TLZ) file (#637)
- double fclose call
  (readVersion closed the file, however this is already closed when the class is freed)

- buffer overrun reading a char pointer which isn't NULL terminated.
  use memcmp instead.
2016-07-14 20:52:12 +09:00
tomosu
9cb984e84d workaround for missing left button on osx (#561)
* workaround for missing left button on osx

* change Qt path

* change CMake

* transfer filter's pointer to application directly

* rebase

* add final, delete virtual, and beautificate
2016-07-14 19:09:44 +09:00
tomosu
8d9526db1b add doneCurrent in fx and raster code (#636) 2016-07-14 17:42:21 +09:00
Xelloss
6a7ff2ca42 Fix some can't translate strings on UI (#515)
* Add & to "Scan & Cleanup" menu item

Missing a ‘&’ punctuation on this menu item.

* fix can't translation strings on Cleanup Setting

* fix can't translation strings on Combo Viewer

* fix can't translation strings on Main Windows

* fix can't translation strings on Preference

* fix can't translation strings on Context Menu

* fix can't translation strings on Style Picker tool

* fix can't translation strings on Watercolor FX

* fix can't translation strings on Tape Tool

* fix can't translation strings on Rotate Tool

* fix can't translation strings on FileBroswer

* fix can't translation strings on FileBroswer

* fix can't translation strings on FileBroswer

* Add new source strings and translate in Chinese

* Add new source strings and translate in Chinese

* Add new source strings and translate in Chinese

* Add new source strings for french

* Add new source strings for german

* Add new source strings for italian

* Add new source strings for japanese

* Add new source strings for spanish

* Add new source strings for spanish

* Add new source strings for japanese

* Add new source strings for italian

* Add new source strings for german

* Add new source strings for french

* Add new source strings for spanish

* Add new source strings for japanese

* Add new source strings for italian

* Add new source strings for german

* Add new source strings for french

* include Qt translation support

* include Qt translation support

* Update stylepickertool.cpp

* Update viewtools.cpp

* remove modifications

Check failed

* remove modifications

Check failed

* Update stylepickertool.cpp

* Fix more can't translate strings on UI

* translation support for Pick Style Tool and Rotate Tool

* Add more source strings in all language TS files

* update qm files of chinese

* Remove modifications of Style Picker tool & Rotate Tool again...
2016-07-14 17:00:28 +09:00
Campbell Barton
87094dbf7a Correct delete[] use (#629) 2016-07-14 15:56:52 +09:00
Campbell Barton
ccd5052709 Cleanup: declare local functions static (#632)
Applies to toonz, toonzfarm, toonzqt.
2016-07-14 15:51:27 +09:00
Campbell Barton
a3a77b1204 CMake: initialize build type (#609)
Avoid using an empty build type.

While supported, it means some settings aren't well defined.
better to default to Release.
2016-07-14 13:44:36 +09:00
shun-iwasawa
535d3f26d8 Merge pull request #400 from turtletooth/pixels
Add pixels - Finished.
2016-07-14 12:40:30 +09:00
Michał Janiszewski
d5a8e51d74 Fix TNZ_MACHINE_CHANNEL_ORDER_MRGB check (#602) 2016-07-14 12:04:33 +09:00
Campbell Barton
b3bd842e04 Make functions static, ensure declarations match headers (#610)
This patch used -Wmissing-declarations warning
to show functions and symbols that had no declarations, and either:

- Make static
- Add to header

This helps avoid possability that declarations and functions get out of sync.
And ensures all source files reference headers correctly.

It also makes sure functions defined with extern "C",
have this defined in the header. An error found in calligraph.h while writing this patch.

This has been applied to toonzlib, to avoid making very large global changes.
If accepted, -Wmissing-declarations warning could be added to CMake.
2016-07-13 21:05:06 +09:00
Campbell Barton
ac2647b212 Avoid unnecessary vector resizing (tstring.toLower) (#614)
Directory listing compares full paths case insensitive,
this causes toLower to run a lot.

While this could be avoided entirely, at least avoid resizing the vector while lower casing strings.
2016-07-13 20:52:24 +09:00
Campbell Barton
f278fa10f0 Avoid making a copy of filepaths just to compare them (#616)
Instead compare them in-place.
2016-07-13 19:07:41 +09:00
Campbell Barton
0279c27280 Fix crash loading levels (#615)
Effects Linux, but may apply to other systems too.
2016-07-13 19:07:11 +09:00
Campbell Barton
1970953c90 Fix use-after free on render (#612) 2016-07-13 18:55:14 +09:00
Jeremy Bullock
027819831e hide fields for exportlevelpopup if pixelsonly 2016-07-13 02:28:26 -06:00
Jeremy Bullock
ae0f0a65a8 Fixed new scene having correct dpi even if default settings are set other than 53.33333 2016-07-13 01:51:33 -06:00
Jeremy Bullock
2e52c6995c reverted default units 2016-07-13 00:38:17 -06:00
Jeremy Bullock
3eeb02f307 Set cleanup camera settings 2016-07-13 00:28:41 -06:00
Jeremy Bullock
59dbbf498a Clang formatting applied 2016-07-12 21:09:46 -06:00
Jeremy Bullock
b6ada42502 Fixed TUnit error 2016-07-12 14:52:07 -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
b2a562cb68 Merge pull request #620 from turtletooth/shortcutwindow
Fixed remove shortcut not updating, added focus when item selected
2016-07-11 20:43:17 +09:00
shun_iwasawa
06bcc2ea0a organize palette 1 2016-07-11 18:55:17 +09:00
Campbell Barton
9b2bfdae51 Fix uninitialized variable use (#613) 2016-07-11 15:22:56 +09:00
Jeremy Bullock
eddd8a3654 removed unnecesary code 2016-07-10 18:45:34 -06:00
Jeremy Bullock
7f493cca08 updated remove shortcut works, added focus when item selected 2016-07-10 13:49:14 -06:00
turtletooth
534c9edc88 Merge pull request #587 from shun-iwasawa/fix_crash_on_savelevelas
Fix crash on Save Level As when the current level is not selected
2016-07-09 14:10:02 -06:00
Campbell Barton
5f15dd3724 Correct define check 2016-07-09 13:56:47 +10:00
Campbell Barton
326eaa5b78 CMake: use STATUS for messages, spaces indentation 2016-07-09 10:44:05 +10:00
Campbell Barton
a9c3dad75a CMake: differentiate system includes (#604) 2016-07-09 00:47:11 +09:00
turtletooth
f8ebe3b803 Merge pull request #575 from shun-iwasawa/pencil_test_viewer
Pencil test feature
2016-07-08 09:00:24 -06:00
Campbell Barton
a0c6e1562d CMake: Test for endian instead of guessing based on the platform (#600) 2016-07-08 20:22:25 +09:00
Campbell Barton
8d53343985 CMake: Conditionally add warnings when supported (#598)
This adds utility functions to conditionally add compiler flags,

allowing warnings from newer compiler versions to be used without
causing a lot of noise for users of older compilers.
2016-07-08 16:23:32 +09:00
Campbell Barton
a9208f5aad Correct delete array usage (#599) 2016-07-08 13:43:56 +09:00
Campbell Barton
83caeb2eb5 Fix #593 inverted colors in raster level Linux 2016-07-08 11:46:31 +10:00
shun-iwasawa
e821d8a035 Merge pull request #430 from turtletooth/zerosizetoggle
Zerosizetoggle
2016-07-07 15:38:03 +09:00
Jeremy Bullock
aeafbe7ef8 moved implementation to sceneviewercontextmenu 2016-07-06 20:41:38 -06:00
Campbell Barton
a9cb664195 CMake: correct quote escaping 2016-07-07 02:03:50 +10:00
Shinya Kitaoka
7abdb2380a Merge pull request #547 from ideasman42/warn-undefined-pr
Quiet -Wundef warning
2016-07-06 20:42:14 +09:00
shun_iwasawa
21a6b6ba06 pencil test popup 2016-07-06 20:06:20 +09:00
Shinya Kitaoka
47895a0d7b Merge pull request #578 from opentoonz/warning-cleanup-pr
Quiet warnings
2016-07-06 19:24:49 +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
Shinya Kitaoka
7a5f69a55c Merge pull request #563 from janisozaur/travis
Travis Linux job
2016-07-06 13:36:24 +09:00
Shinya Kitaoka
8240663cb9 Merge pull request #554 from janisozaur/libpng
Add support for libpng<1.5
2016-07-06 13:26:51 +09:00
shun_iwasawa
a30667c815 fix crash on save level as command 2016-07-06 12:50:25 +09:00
Shinya Kitaoka
2346da3b69 Merge pull request #557 from janisozaur/taskid
Fix argument assignment in TaskId
2016-07-06 12:01:25 +09:00
Shinya Kitaoka
af8faa4452 Merge pull request #558 from janisozaur/use-after-free
Prevent containerH being used after it was freed
2016-07-06 12:01:08 +09:00
turtletooth
c6b129f461 Merge pull request #580 from shun-iwasawa/revert_style_dblclk_behavior
Revert behavior when double clicking on styles to open the style editor (and some fixes)
2016-07-05 13:51:25 -06: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
7c216ea4e6 Merge pull request #566 from opentoonz/fix-delete-pr
Correct missing [] from delete
2016-07-05 17:13:31 +09:00
shun_iwasawa
fd6c3c05ac revert behavior on dblclking style, and more 2016-07-05 16:15:29 +09:00
shun_iwasawa
c7aa6fbfb0 fix brush undo crash 2016-07-05 14:24:07 +09:00
Campbell Barton
e05b0bbe1c Quiet warnings 2016-07-05 14:54:52 +10: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
Campbell Barton
18f19a087d CMake/Linux: install other binaries into bin 2016-07-04 17:22:17 +10:00
Jeremy Bullock
fdd72e63f6 set pixels as default 2016-07-03 13:48:39 -06:00
Campbell Barton
ca4a5d4003 Linux: Support Release builds 2016-07-03 19:24:25 +10:00
Campbell Barton
3158be2a42 CMake/Linux: add an install target
This allows for running opentoonz without having to manually write ini files or copy the 'stuff' directory.

By default it installs to `/opt/opentoonz`.
2016-07-03 18:34:50 +10:00
Jeremy Bullock
f44848c78d reverted stage::inch change, should be its own PR 2016-07-03 00:15:54 -06:00
Jeremy Bullock
93c27a36d0 removed debug code 2016-07-02 23:40:23 -06: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
Campbell Barton
c39a8a4b75 Correct incorrect delete 2016-07-02 22:22:01 +10:00
Campbell Barton
268e1b4036 CMake: quiet warnings
- OBJCSOURCES was being used but undefined (set to empty)
- RC_FILE was being used on Linux/OSX, this is only for WIN32.
2016-07-02 09:21:15 +10:00
Shinya Kitaoka
fb022e94eb Merge pull request #555 from janisozaur/filebrowser
Fix wrong field access in filebrowser.cpp
2016-07-01 23:56:56 +09:00
Shinya Kitaoka
c89cd4d785 Merge pull request #559 from ideasman42/tcenter-line-pr
Fix checking the left-node before operating on the right
2016-07-01 23:56:34 +09:00
Shinya Kitaoka
b9016690ed Merge pull request #553 from janisozaur/isnan
isnan fixes
2016-07-01 20:53:04 +09:00
Michał Janiszewski
6dc4b98871 Transparently use lzma, if available in system
It will get picked up by libtiff, so make sure we provide it when
linking libimage
2016-07-01 12:11:51 +02:00
Michał Janiszewski
9258754773 Merge remote-tracking branch 'my_github/isnan' into travis-base 2016-07-01 12:11:21 +02:00
Jeremy Bullock
0049ac939d removed image dpi modification 2016-06-30 23:49:53 -06:00
Jeremy Bullock
20a966a908 set stage::inch to 120 2016-06-30 23:46:29 -06:00
Jeremy Bullock
b99ed3bab6 added shun-iwasawa's suggestions 2016-06-30 21:41:31 -06:00
Jeremy Bullock
5e3b5e8cc3 Merge branch 'master' into pixels 2016-06-30 20:57:15 -06:00
Campbell Barton
d89022ce19 Fix checking the left-node before operating on the right 2016-07-01 09:38:27 +10:00
Michał Janiszewski
1d0596c8d8 Prevent containerH being used after it was freed 2016-06-30 17:25:47 +02:00
Michał Janiszewski
38816b00c9 Fix argument assignment in TaskId 2016-06-30 17:20:50 +02:00
Michał Janiszewski
dfbb44814b Mark TTileSet destructor as virtual
This class gets inherited, yet the destructor is not marked as virtual.
2016-06-30 17:17:40 +02:00
Michał Janiszewski
d73986b938 Fix wrong field access in filebrowser.cpp 2016-06-30 17:13:26 +02:00
Michał Janiszewski
01e73f88e4 Add support for libpng<1.5 2016-06-30 15:21:57 +02:00
Michał Janiszewski
b86749e216 isnan fixes
isnan was used without specifying namespace
2016-06-30 13:42:20 +02:00
Michał Janiszewski
c8607f3d7a Fix SDL includes in tnzbase
SDL headers are installed to /usr/include/SDL2 which was in conflict
with explicit way they were included previously.
2016-06-30 10:55:55 +02:00
Campbell Barton
2e1cb68b4e CMake: wrap lines for easier reading 2016-06-30 14:37:43 +10:00
Campbell Barton
620578b1a0 Fix missing array specifier from delete 2016-06-30 14:37:43 +10:00
turtletooth
3db6439c7a Merge pull request #510 from shun-iwasawa/add_search_to_shortcutpopup
Configure Shortcuts popup optimized
2016-06-29 21:56:39 -06:00
Campbell Barton
d869b5f8e6 Quiet -Wundef warning
Exposes accidental typos when checking exact values of a define.
2016-06-30 12:28:26 +10:00
Campbell Barton
b130eca2da Workaround using C's abs on Linux
math.h is indirectly included, making abs return double on Linux.
2016-06-30 10:41:38 +10:00
Campbell Barton
b45a54792d CMake: write Linux output into bin/
Resolves naming collisions between directories and binaries.
2016-06-30 10:13:38 +10:00
Campbell Barton
1c6681c983 Merge pull request #525 from ideasman42/linux-opengl-pr
Changes needed to build OpenGL files with Linux
2016-06-30 08:25:57 +10:00
Campbell Barton
f493896cc0 Cleanup: typo (sensibility) 2016-06-29 20:49:17 +10:00
shun-iwasawa
55327d15ae Merge pull request #467 from ideasman42/linux-tsound-pr
Linux support for tsound (SDL2), from pr #51
2016-06-29 18:55:41 +09:00
Shinya Kitaoka
00c547d5c1 Merge pull request #521 from janisozaur/aligner-type
Rename aligner_type redefinitions
2016-06-29 18:55:30 +09: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
Michał Janiszewski
5387bee4bd Rename aligner_type redefinitions 2016-06-27 08:33:20 +02: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
959a52be05 Merge pull request #524 from ideasman42/linux-misc-pr
Misc minor changes needed for building on Linux
2016-06-27 11:56:58 +09:00
Shinya Kitaoka
59f6a53bb9 Merge pull request #522 from shun-iwasawa/fix_brush_shortcut_bug
Fix shortcut feature for increasing/decreasing the brush tool size
2016-06-24 23:37:47 +09:00
Shinya Kitaoka
3f703d25c8 Merge pull request #507 from janisozaur/fixes
Fixes
2016-06-24 23:18:02 +09:00
Campbell Barton
89a491484a Misc minor changes needed for building on Linux 2016-06-24 22:01:09 +10:00
Campbell Barton
301bdb149a Changes needed to build OpenGL files with Linu 2016-06-24 21:38:08 +10:00
Shinya Kitaoka
bc8b18dbfd Merge pull request #518 from ideasman42/linux-isnan-pr
Use cmath instead of defining isnan (Linux build-fix)
2016-06-24 19:47:47 +09:00
shun_iwasawa
d2802fdfc2 fix brush size shortcut 2016-06-24 18:38:47 +09:00
Michał Janiszewski
a6309b14b7 Use std::max_element 2016-06-24 10:35:50 +02:00
Michał Janiszewski
a92a71476f isnan fix
isnan is already defined on Linux in math.h, as included in:

    toonz/sources/include/tutil.h:7,
    toonz/sources/include/traster.h:6,
    toonz/sources/include/tcolorutils.h:9,
    toonz/sources/common/tapptools/tcolorutils.cpp:4:

with type:

    constexpr bool std::isnan(double)
2016-06-24 10:35:50 +02:00
Shinya Kitaoka
e57a4dcea3 Merge pull request #508 from shun-iwasawa/fix_levelstrip_ui
Fix Level Strip UI not to hide scroll bar
2016-06-24 17:11:04 +09:00
tomosu
f0ee5d1373 Merge pull request #506 from skitaoka/fix/use-atomic
Use std::atomic instead of native implementations
2016-06-24 16:25:55 +09:00
Shinya Kitaoka
dd88e058e0 Merge pull request #509 from janisozaur/overrides
Add missing `override` specifiers
2016-06-24 16:09:27 +09:00
Campbell Barton
3b073728d4 Use cmath instead of defining isnan
Needed for building on Linux
2016-06-24 06:41:58 +10:00
Michał Janiszewski
7a49c6c7d4 Fix string streams 2016-06-23 20:33:47 +02:00
shun_iwasawa
4343e7db4e add search item feature to shortcut popup 2016-06-23 22:39:38 +09:00
Michał Janiszewski
d37dbb57f2 Add missing override specifier 2016-06-23 13:41:27 +02:00
shun_iwasawa
da763a6105 fix level strip ui 2016-06-23 20:04:08 +09:00
Campbell Barton
747d5c5395 Linux support for tfont (Qt), from pr #51 (#466)
Credit goes to François Revol for this work.
2016-06-23 19:40:37 +09:00
tomosu
00e4b3908e Merge pull request #465 from janisozaur/close-file
Pass file to be closed
2016-06-23 18:30:41 +09:00
tomosu
642f3714a4 Merge pull request #505 from skitaoka/fix/translation/chinese
Update: Chinese translations
2016-06-23 17:56: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
Shinya Kitaoka
5cdb310089 Merge pull request #479 from shun-iwasawa/fix_rgbpicker
Fix RGB picker tool
2016-06-23 17:03:43 +09:00
Shinya Kitaoka
1a69bdd87e fix ino_line_blur 2016-06-23 16:34:05 +09:00
tomosu
ada3dde47f Merge pull request #496 from shun-iwasawa/add_autopaint_indicator
Add "Autopaint for Lines" indicator on Palette
2016-06-23 16:09:32 +09:00
Shinya Kitaoka
652c93c8f8 fix build for windows 2016-06-23 15:19:53 +09:00
Shinya Kitaoka
be710c1781 Merge branch 'master' of https://github.com/janisozaur/opentoonz into fix/use-atomic 2016-06-23 14:54:45 +09:00
Xelloss
cd192d1d8e Update shortcutpopup.cpp 2016-06-23 12:29:02 +08:00
Shinya Kitaoka
907d3be8fc update ts and qm files 2016-06-23 13:09:14 +09:00
Shinya Kitaoka
0da0137f19 Merge branch 'master' of https://github.com/gab3d/opentoonz into fix/transition/spanish 2016-06-23 13:01:35 +09:00
Xelloss
22b155adc0 Update toonzqt.ts 2016-06-23 11:15:36 +08:00
Xelloss
e91bc9fe03 Update shortcutpopup.cpp
Missing a ‘&’ punctuation.
2016-06-23 10:46:33 +08:00
Xelloss
3135c99715 Update toonzqt.ts 2016-06-23 10:43:28 +08:00
Xelloss
9949679be7 Update toonzlib.ts 2016-06-23 10:42:54 +08:00
Xelloss
14be0ae1c8 Update toonz.ts 2016-06-23 10:42:52 +08:00
Xelloss
b7119a772f Update tnztools.ts 2016-06-23 10:41:13 +08:00
Xelloss
a5398b8555 Update colorfx.ts 2016-06-23 10:38:25 +08:00
Gabriel Gazzán
8264171dea Spanish translation - update [100%]
(Hopefully this time it will not make conflicts. :-/ )
2016-06-22 22:59:54 -03:00
Gabriel Gazzán
72b5b10529 Merge branch 'master' of https://github.com/opentoonz/opentoonz
# Conflicts:
#	toonz/sources/translations/spanish/colorfx.ts
#	toonz/sources/translations/spanish/tnzcore.ts
#	toonz/sources/translations/spanish/tnztools.ts
#	toonz/sources/translations/spanish/toonz.ts
#	toonz/sources/translations/spanish/toonzlib.ts
#	toonz/sources/translations/spanish/toonzqt.ts
2016-06-22 22:26:15 -03: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
e6d98dae08 Merge pull request #432 from walkerka/master
[Done] Brush stroke stabilizer.
2016-06-22 12:28:23 +09:00
walkerka
2cdd35cd18 update Japanese translation for brush smooth. 2016-06-21 20:48:29 +08:00
walkerka
e1e7c459ab removed stressful assertion. 2016-06-21 19:15:55 +08:00
shun_iwasawa
ca787917e0 fix rgb picker tool 2016-06-20 20:17:05 +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
Jeremy Bullock
7c096e2b82 starter interface options 2016-06-18 21:47:11 -06:00
Campbell Barton
36d03a96ea Linux support for tsound (SDL2), from pr #51
Credit goes to François Revol for this work.
2016-06-17 21:51:29 +10:00
Michał Janiszewski
9eefd20810 Pass file to be closed 2016-06-17 12:52:05 +02:00
Michał Janiszewski
d8b454fc1b Change atomic_t to be of std::atomic<long> type 2016-06-17 12:42:25 +02:00
Michał Janiszewski
163bdb9319 Simplify atomic code to rely on C++11-provided std::atomic 2016-06-17 12:20:41 +02:00
Shinya Kitaoka
1b5492dc46 Update Chinese translation again (#461)
* Update toonzqt.ts

* locate `toonzqt.qm` in `stuff/config/loc/中文/`
2016-06-17 18:45:49 +09:00
Shinya Kitaoka
02d78d2112 fix CMakeLists.txt (#457) 2016-06-17 18:33:04 +09:00
turtletooth
0bae6721d5 Level Create Popup now sets default name and updates paths correctly (#437)
* Starter level name working.  Double check folder paths.

* New Level Dialog now works as expected added focus on save dialog also
2016-06-17 17:58:06 +09:00
Campbell Barton
deffae3359 Linux ifdef and defines (#454) 2016-06-17 17:48:03 +09:00
shun-iwasawa
eec8419456 Fix text color in the Script console and the Rename popup (#458)
* set object names

* add style sheet

* close #442 and #449
2016-06-17 17:35:41 +09:00
shun-iwasawa
8f3ba348eb Update: Store the toolbar state (expanded / shrinked) in user's env file by jcome (#460)
* Store toolbar state (expanded / shrinked) in env file

* small change
2016-06-17 16:54:20 +09:00
turtletooth
48def29a14 Drawing Substitution - Works Now (#410)
* it works now

* Added default menu position

* Undo Fixed and Now Works with Whole Selections

* Now works with ctrl to affect all sequential cells of the same drawing

* Fixed undo

* fixed mainwindow.cpp
2016-06-17 15:49:58 +09:00
turtletooth
b0c6a6c68f Black Background on JPG and AVI export fix. (#438)
* avi, jpg and bmp exports do not have transparent backgrounds
* Reverts the Bg Color back to original after exporting
* Close #423
2016-06-17 15:22:59 +09:00
Jeremy Bullock
29a430ce11 Updated for 1.0.3 2016-06-16 21:41:54 -06:00
Jeremy Bullock
d6ad84a4db clangier 2016-06-16 20:27:06 -06:00
walkerka
22f456eed6 apply clang-format. 2016-06-16 20:29:56 +08:00
Shinya Kitaoka
b8b0c4d80e update chinese translation 2016-06-16 18:27:35 +09:00
Shinya Kitaoka
c770273ff1 Merge branch 'patch-2' of https://github.com/SaierMe/opentoonz into fix/translation/chinese 2016-06-16 16:55:22 +09:00
Shinya Kitaoka
9c2a5c24ba Merge branch 'patch-1' of https://github.com/SaierMe/opentoonz into fix/translation/chinese 2016-06-16 16:55:11 +09:00
turtletooth
2382549b47 Onion Skin default color changed (#396) 2016-06-16 16:04:38 +09:00
Jeremy Bullock
4f05fcb810 Updated to 1.0.3 2016-06-16 00:21:21 -06:00
Jeremy Bullock
ca9ce50047 Updated to 1.0.3 2016-06-15 23:36:00 -06:00
Jeremy Bullock
946edbcf47 Fixed for 1.0.3 2016-06-15 23:15:05 -06:00
Campbell Barton
22fd3b0447 CMake: changes needed to build on Linux (#452)
Note that these are the main changes from the linux port.
Not a fully working linux port.
2016-06-16 13:52:02 +09:00
walkerka
bb91cdfce5 Merge branch 'master' of https://github.com/opentoonz/opentoonz
# Conflicts:
#	toonz/sources/tnztools/brushtool.cpp
#	toonz/sources/tnztools/brushtool.h
2016-06-15 23:27:23 +08:00
shun-iwasawa
e1150a4a62 v1.0.3 2016-06-15 17:53:29 +09:00
Shinya Kitaoka
120a6e041c apply clang-format 2016-06-15 15:43:10 +09:00
Shinya Kitaoka
11118d4de8 add .clang-format 2016-06-15 15:42:19 +09:00
shun-iwasawa
04a71f109d fix menubar popup (#409) 2016-06-15 15:13:57 +09:00
shun-iwasawa
760cdf1a85 fix crash on clicking xsheet (#445) 2016-06-15 15:09:56 +09:00
shun-iwasawa
144f54c241 show pinned center keys on xsheet (#369) 2016-06-14 17:15:54 +09:00
JosefMeixner
e932c2e9b3 Handle more then 3 peg holes (#314)
* 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.

* Changed the type of a variable, missed that when I changed the usage of the variable.
2016-06-14 16:18:10 +09:00
tomosu
eea0acf6fa Use stringstream instead of strstream (#431)
* replace strstream with string stream

* all change

Signed-off-by: tomosu <tomosu@users.noreply.github.com>

* small changes
2016-06-13 21:50:05 +09:00
Shinya Kitaoka
ee259ffaf7 remove duplicated constants (#296) 2016-06-13 21:37:09 +09:00
walkerka
bb2a4209f5 change max smooth value to 50 for better control. 2016-06-11 21:26:50 +08:00
walkerka
48c885e1f1 update translation of Chinese & Japanese. 2016-06-11 20:12:39 +08:00
walkerka
611fd32a6f added stroke stabilizer for toonz raster level. 2016-06-11 18:16:00 +08:00
walkerka
2e244a2acf added UI for stroke smooth value. 2016-06-11 10:33:39 +08:00
Jeremy Bullock
c3ae24862e Right Click menu action 2016-06-09 22:04:22 -06:00
Jeremy Bullock
eccbe0c583 Toggle Shortcut 2016-06-09 22:02:48 -06:00
walkerka
54ae3222f2 Merge branch 'master' of https://github.com/opentoonz/opentoonz 2016-06-09 23:49:43 +08:00
walkerka
57fb3c27b9 WIP semi-realtime vector stroke smoothing. 2016-06-09 23:43:25 +08:00
tomosu
5162807399 use stringstream instead og strstream (#398) 2016-06-09 12:45:20 +09:00
turtletooth
52e40735cb Fixed project chooser not working and added default folders (#394) 2016-06-08 23:19:52 +09:00
shun-iwasawa
99b9e225b0 enable debug build (#421) 2016-06-08 17:51:40 +09:00
shun-iwasawa
6b7c9c5724 New option to retain original styles when loading color model's palette (#407)
* make "append default palette" to be optional

* new option for loading raster img to color model

* remove unused sources

* add japanese translations
2016-06-07 18:43:49 +09:00
turtletooth
1526ec939f Changed default resolution to 1920 x 1080 (#385)
* Changed default resolution

* Resizes view to fit the window on the first time it is shown only.  Otherwise new resolution may seem too big.
2016-06-07 17:46:11 +09:00
Banbury
09a48e32a3 Fix: Allow negative frame id in scene.setCell (scripting). (#345)
This fix is necessary for creating animations in Javascript from raster images
with only one frame. For this Opentoonz expects a frame id of -2.
A frame id of -1 is an empty frame.
The original implementation onyl allows positive numbers.
2016-06-07 17:19:18 +09:00
Shinya Kitaoka
9eb50de5fe Use std functions (#297)
* use std functions

* replace toInt        to std::stoi
* replace toDouble     to std::stod
* replace toString     to std::to_string
* replace toWideString to std::to_wstring

* fix for MacOS

* cosmetic change
2016-06-07 16:06:00 +09:00
Jeremy Bullock
9230b7edb9 Fixed bug where unmaximizing sometimes made other panels appear blank 2016-06-06 00:16:21 -06:00
Jeremy Bullock
9a725975de Maximize an entire room works now too. 2016-06-05 15:11:18 -06:00
Jeremy Bullock
d07b20fdf6 Maximize Pane where mouse is with ` 2016-06-05 00:31:00 -06:00
Jeremy Bullock
d0657441de Level settings now support pixels 2016-06-04 14:19:27 -06:00
Xelloss
e8f2ba66f1 Update toonzqt.ts 2016-06-05 00:16:34 +08:00
Xelloss
6b544330b9 Update colorfx.ts 2016-06-04 23:41:16 +08:00
Jeremy Bullock
99ca93cb90 Ruler tool now working too 2016-06-04 01:01:44 -06:00
Jeremy Bullock
96eb784d28 Adds pixels as an option to the preferences. 2016-06-03 23:06:56 -06:00
Jeremy Bullock
b37830bb62 Toonz Palettes folder now working and has 3 starter palettes 2016-06-02 20:51:51 -06:00
shun-iwasawa
5b3c7c4325 Refresh the current folder items of the File Browser automatically (#376)
* refresh file browser items automatically

* monitor directory tree

* remove refresh button

* add a new folder to monitored paths
2016-06-02 20:55:00 +09:00
tomosu
e5f7d89527 Keep the consistency of mesh image addr, after save operation (#380)
* change MESH_XSHLEVEL to be isImageCompatible true

* add comment and split comparison operator return into true and false
2016-06-02 20:37:45 +09:00
turtletooth
8d9ba3307e Rooms Selection (#378)
* Start of room choice in preferences

* Menu almost working

* Rooms Selection Working

* Removed unneeded preferences file

* Default Name for Rooms

* Rename Default room folder

* Fixed Reset to Default Rooms to reset current Roomset
2016-06-02 20:36:29 +09:00
Keisuke Ogaki
e6172ddf26 x64 or LP64 2016-06-02 19:28:29 +09:00
Keisuke Ogaki
876ca8276d fit to enable to compile 32bit modules 2016-06-02 16:13:45 +09:00
Keisuke Ogaki
8324720308 bugfix: less 32bit dependencies 2016-06-02 15:20:56 +09:00