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
Shinya Kitaoka
2b5c357c7b
Merge pull request #516 from janisozaur/streams
...
Fix string streams
2016-06-24 15:43:01 +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
tomosu
1394133449
Merge pull request #502 from skitaoka/fix/translation/spanish
...
Update: Spanish translation
2016-06-23 14:01:41 +09:00
Shinya Kitaoka
003d6d8c25
update qm files
2016-06-23 13:53:13 +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