Commit graph

516 commits

Author SHA1 Message Date
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
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
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
Shinya Kitaoka
c100b07e8b add about translations (#462) 2016-06-17 18:29:38 +09:00
Yu Chen
3129c09282 Add & to "Scan Cleanup" menu item (#440) (#441) 2016-06-17 18:10:13 +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
shun-iwasawa
d8defa759c Merge pull request #456 from skitaoka/fix/translation/chinese
Update Chinese Translation
2016-06-17 12:06:02 +09: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
e4b7c06afd Add a contribution guide (#455)
* add CONTRIBUTING.md

* Update CONTRIBUTING.md
2016-06-16 17:48:05 +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