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