Commit graph

944 commits

Author SHA1 Message Date
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
Gabriel Gazzán
4544a4f679 Spanish translation - [100%] 2016-06-01 00:46:28 -03:00
Shinya Kitaoka
822411ba0e Support German translation (#363)
German translations

* Added files via upload

First translation draft. Corrections need to be made with actual in hand program

* Added files via upload

* Japanese characters

正方ピクセルを保持 -> Force Squared Pixel translated as "Quadratische Pixel erzwingen"

* Small spelling error

Blur value ->Weichheitsgrad

* add loc/german/*.qm

* modify loc dir names to their local script

* fixup! update loc/*/*.qm

* fix "Sensitivity"
2016-05-27 14:27:54 +09:00
Banbury
62cd4e872c Fix: level strip width is wrong when you start open toonz (#334) (#357)
On the creation the docking panel of the level strip was assigned a minimum
width. This has no effect, but making the docking panel too big, because the
size of the underlying controls hasn't been calculated at this point.
Removing the line fixes the issue with the level strip size, without affecting
the docking window otherwise.
2016-05-26 13:58:23 +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
turtletooth
9781a83614 Translation Correction (#347) 2016-05-25 18:03:16 +09:00
JosefMeixner
8990b29cb4 Do not attempt to clone a palette when it is NULL. (#354)
When a scanned strip was cleaned up and then without storing the scene cleaned up again and the query to overwrite the old files was answered with overwrite all, the program crashed.
2016-05-25 18:01:58 +09:00
Banbury
d26accb4e8 Added checkbox 'Global Key' to edit tool. (#300) (#308)
* Added checkbox 'Global Key' to edit tool. (#300)

The code for the global key option was still in place. The only thing missing
was the checkbox in the tool options.
2016-05-24 20:29:28 +09:00
Keisuke Ogaki
5ff9a72ca5 get layer name encoding from preference 2016-05-24 16:26:30 +09:00
Keisuke Ogaki
8b06ffc4e3 💄 force encoding in SJIS for psd layer name 2016-05-24 15:11:55 +09:00
Shinya Kitaoka
3fa3e1e9b8 Use "range-based for" instead of iterators (#339)
* use "range-based for" instead of iterators

* fix assertions
2016-05-23 17:40:49 +09:00
Shinya Kitaoka
ba547e17d0 Reduce crashes on start-up (#340)
* reduce startup-crush problems

* fix error codes

* fixup! fix error codes
2016-05-23 16:46:06 +09:00
turtletooth
bc1f437e8a Added a desktop icon to the file browser (#348)
* Added Desktop to file browser dialog

* fixed desktop icon not appearing
2016-05-23 16:44:39 +09:00
Keisuke Ogaki
0c8292e173 Revert "Use QOpenGLWidget instead of QGLWidget" (#350) 2016-05-23 16:19:32 +09:00
shun-iwasawa
0a9e80ffa1 Fix crash on exploding sub-xsheet (#305)
* fix crash on exploding sub xsheet

* call onselectionchanged in mousepressevent
2016-05-20 18:20:30 +09:00
Campbell Barton
5ea53c8c6b Quiet GCC -Wparentheses warning with assignment (#310) 2016-05-20 17:37:59 +09:00
Keisuke Ogaki
cd46cc8362 Fix to stop creating zero-size image (#333)
* 🐛 systemvar path should not contain revision number

* 🐛 Don't forget break after case

* 🐛 avoid creating zero size image

* 🔥 remove duplicated assertion
2016-05-20 16:42:36 +09:00
tomosu
953a4a705d Use std::unique_ptr instead of UniquePtr in plasticdeformer.cpp (#332)
* replace UniquePtr with std::unique_ptr
2016-05-20 16:18:26 +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
shun-iwasawa
5ddd75cc52 fix magnet tool crash (#324) 2016-05-18 20:45:12 +09:00
shun-iwasawa
fc0e222c4a fix minimize raster memory fragmentation option (#322) 2016-05-18 14:37:27 +09:00
Shinya Kitaoka
12c444ee0d use std::min and std::max (#318) 2016-05-18 13:03:37 +09:00
Keisuke Ogaki
b592dbfa79 Fix creating empty level fails (#317)
* 🐛 Don't forget break after case
2016-05-18 00:51:00 +09:00
Keisuke Ogaki
71a0aa4bb0 🐛 systemvar path should not contain revision number (#316) 2016-05-17 21:38:09 +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
Campbell Barton
14c02ece7f Fix incorrect assignments in if statements (#311) 2016-05-17 14:28:51 +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
Shinya Kitaoka
d4642c34e8 Remove macros: CASE, __OR, and DEFAULT (#286)
* remove syntax macros: CASE, __OR, and DEFAULT

* define VC_EXTRALEAN

* remove meaningless comments
2016-05-13 19:49:17 +09:00
Keisuke Ogaki
3c21d0ab9c Cmake should be able to be run in other directories (#233)
* enable to run cmake from every directory

* enable to run cmake from every directory
2016-05-13 18:22:50 +09:00
tomosu
b5810ffd5e delete assert(is3DView()) (#289) 2016-05-12 14:45:33 +09:00
shun-iwasawa
0c0a0a798f revert onionskin on xsheet (#280) 2016-05-11 17:43:59 +09:00
tomosu
302138d7c6 add fake mouseReleaseEvent in contextMenuEvent (#285) 2016-05-11 16:45:27 +09:00
Shinya Kitaoka
42c736d27d Merge pull request #260 from ideasman42/cleanup-cmake
CMake: cleanup indentation, remove redundant endif args
2016-05-11 15:25:35 +09:00
Shinya Kitaoka
74a1b285db Merge pull request #278 from jcome/chinese
Chinese (Simplified) UI translation
2016-05-11 15:24:49 +09:00
Yu Chen
1f519fed0b Rename translation folder to chinese 2016-05-10 22:25:10 +08:00
Yu Chen
953f29211b Add chinese to build targets 2016-05-10 22:23:42 +08:00
shun_iwasawa
a81a8b2bce fix level settings crash 2016-05-10 19:24:33 +09:00
Yu Chen
bd86876c50 Use the same chinese strings for "Ease" 2016-05-08 16:14:11 +08:00
Yu Chen
81ab179074 Chinese (Simplified) UI translation 2016-05-08 12:06:49 +08:00
Campbell Barton
f08982dd33 CMake: cleanup indentation, remove redundant endif args 2016-04-27 21:48:12 +10:00
tomosu
8095ea442c Merge pull request #258 from shun-iwasawa/fix_angle_unit_expression
Fix saving/loading an angle unit (degree sign) used in expression
2016-04-27 19:10:03 +09:00
shun_iwasawa
db3444ca99 fix angle unit (degree sign) expression 2016-04-27 18:37:49 +09:00
Shinya Kitaoka
a1c5b0a22d remove hasOpenGLFramebufferObjects 2016-04-27 18:37:16 +09:00
Shinya Kitaoka
85e0644e93 Merge pull request #245 from ideasman42/cleanup-gcc-Wcomment
Cleanup: gcc's -Wcomment warnings
2016-04-27 17:32:04 +09:00
Shinya Kitaoka
911b7e916a Merge pull request #247 from ideasman42/cleanup-gcc-Wwrite-strings
Cleanup: gcc's -Wwrite-strings warning
2016-04-27 17:24:52 +09:00
tomosu
b3369f897d Merge pull request #256 from skitaoka/fix/issue/253-254
Fix issue 253-254
2016-04-27 17:19:32 +09:00
tomosu
de525f2146 pen/touch device support (#206)
* change XsheetViewer::wheelEvent

* change horizontal mouse wheel move distance

* align 'Natural' direction with OSX policy

* change wheelEvent in SpreadSheetViewer (but function editor scroll still not working sufficiently)

* fix unintended zoom with pen-tablet
2016-04-27 15:11:23 +09:00
Shinya Kitaoka
6526c73583 Fix t32bitsrv build conflicts (#211)
add #include <memory>, fix QT_PATH

* add #include <memory>

* fix QT_PATH
2016-04-27 15:04:18 +09:00
Shinya Kitaoka
b6a3408983 Merge pull request #244 from shun-iwasawa/fix_pinchtool_crash
Fix pinch tool crash
2016-04-27 14:56:24 +09:00
Shinya Kitaoka
1ab7cf5db2 Merge pull request #246 from shun-iwasawa/fix_function_editor_crash
Fix crash when typing an expression without selecting curve in function editor
2016-04-27 14:55:02 +09:00
Shinya Kitaoka
fec1c80188 Merge pull request #239 from janisozaur/master
Janitorial: minor fixes
2016-04-27 14:43:00 +09:00
Shinya Kitaoka
108c32fcab create a context 2016-04-27 14:25:50 +09:00
tomosu
732b19e9a3 Merge pull request #250 from skitaoka/feature/add-build-time
Show build time on the about-dialog
2016-04-27 14:14:30 +09:00
Shinya Kitaoka
82ce0b9627 Merge pull request #236 from shun-iwasawa/fix_keyboard_shortcut_feature
Adding default keyboard shortcuts + Enable to delete default shortcuts
2016-04-27 13:51:47 +09:00
Shinya Kitaoka
dc288075e4 Merge pull request #232 from shun-iwasawa/fix_library_and_fxs_folder_locations
Fix "library" and "fxs" folder locations
2016-04-27 13:50:45 +09:00
Shinya Kitaoka
43167d966f Merge pull request #230 from shun-iwasawa/add_save_all_command
"Save All" menu which saves current scene and all the levels. (modified from pr#153)
2016-04-27 13:50:24 +09:00
Shinya Kitaoka
3f27e3f731 Merge pull request #219 from shun-iwasawa/fix_crash_on_new_style
Fix crash with New Style command on empty palette
2016-04-27 13:46:14 +09:00
Campbell Barton
4aa85c3899 Cleanup: -Wwrite-strings warning 2016-04-27 10:55:26 +10:00
Campbell Barton
ea4f7e9dc2 Cleanup: gcc's -Wcomment warnings 2016-04-27 10:54:30 +10:00
Shinya Kitaoka
70f81d091c fix ImageRasterizer::build 2016-04-27 00:20:01 +09:00
Shinya Kitaoka
6f097405b3 Revert "Merge pull request #248 from skitaoka/fix/issue/134"
This reverts commit ebfd3b7b4d, reversing
changes made to 467e9d19ae.
2016-04-27 00:11:57 +09:00
Shinya Kitaoka
c7321c0d77 Revert "Merge pull request #251 from skitaoka/fix/remove-glext-h"
This reverts commit 86c457716a, reversing
changes made to ebfd3b7b4d.
2016-04-27 00:11:29 +09:00
Shinya Kitaoka
6bcca29276 remove glext.h 2016-04-26 22:12:56 +09:00
Shinya Kitaoka
b3706349e9 show build time to about-dialog 2016-04-26 20:30:42 +09:00
Shinya Kitaoka
7bc9064955 fix convert vector image to raster image issue
- remove NEW_REGION_FILL macro
- use glBlendFuncSeparate
- some refactoring
2016-04-26 18:40:16 +09:00
shun_iwasawa
9f8808c937 fix function editor crash 2016-04-26 17:13:12 +09:00
shun_iwasawa
091edd3f55 fix pinch tool crash 2016-04-26 15:45:22 +09:00
Shinya Kitaoka
467e9d19ae Merge pull request #229 from ideasman42/cleanup-long-lines
Cleanup: very long lines
2016-04-26 13:05:35 +09:00
Michał Janiszewski
28790b32b9 Plug memory leak in common 2016-04-25 22:24:05 +02:00
Michał Janiszewski
e69068915f Remove assignment from assert condition 2016-04-25 22:23:31 +02:00
Michał Janiszewski
5e553c07ee Drop unnecessary dereference 2016-04-25 22:04:42 +02:00
Michał Janiszewski
50e38f736b Plug some memory leaks 2016-04-25 21:54:56 +02:00
Michał Janiszewski
b82824518a Make sure all the sqrt coeffs have space for storage 2016-04-25 21:54:52 +02:00
Michał Janiszewski
f91771fdbe Plug memory leak in psd.cpp 2016-04-25 21:54:48 +02:00
Michał Janiszewski
bb8dc0a880 Fix loop counter 2016-04-25 21:54:42 +02:00
shun_iwasawa
b0d7ffd3c0 Merge remote-tracking branch 'origin/master' into fix_keyboard_shortcut_feature 2016-04-25 22:56:01 +09:00
shun_iwasawa
84d31eab96 fix shortcut key feature and revert default keys 2016-04-25 22:46:24 +09:00
Keisuke Ogaki
788747cc4a Merge pull request #215 from skitaoka/test/pr/179
Allow Qt 5.6
2016-04-25 21:31:13 +09:00
shun_iwasawa
36e06f3235 fix "library" and "fxs" folder locations 2016-04-25 18:45:04 +09:00
Shinya Kitaoka
cd2d2022b0 Merge pull request #225 from ideasman42/linux-preproc-tweaks
Minor changes to preproc checks needed for building on Linux
2016-04-25 17:25:42 +09:00
Shinya Kitaoka
7e54c42979 Merge pull request #224 from ideasman42/linux-config-path
Use ~/.config on Linux/Unix
2016-04-25 17:12:02 +09:00
shun_iwasawa
38d9ba86f6 remove permission check 2016-04-25 17:02:52 +09:00
shun_iwasawa
723f49bcab Merge remote-tracking branch 'origin/master' into add_save_all_command 2016-04-25 16:41:00 +09:00
shun_iwasawa
0b5f3366ed add Save All command 2016-04-25 16:39:15 +09:00
tomosu
678e76b782 Merge pull request #217 from shun-iwasawa/revert_key_on_xsheet
Revert keyframes on xsheet cell area
2016-04-25 16:13:13 +09:00
Campbell Barton
9472c8d664 Cleanup: very long lines
While this isn't an error, this causes search tools (grep for eg), to give warnings.
2016-04-25 14:15:01 +10:00
Campbell Barton
e6d9f6df9d Use ~/.config on Linux/Unix 2016-04-25 14:04:00 +10:00
shun_iwasawa
93f4764414 Merge branch 'master' of https://github.com/walkerka/opentoonz into add_save_all_command 2016-04-25 12:15:05 +09:00
Campbell Barton
07f3e872bd Minor changes to preproc checks needed for building on Linux 2016-04-24 16:33:04 +10:00
Campbell Barton
3191db5857 Correct class use with TTimer on Linux 2016-04-24 16:28:19 +10:00
shun_iwasawa
01874c2b40 fix crash on new style 2016-04-22 22:20:32 +09:00
shun_iwasawa
9fb611aa7a Merge remote-tracking branch 'origin/master' into revert_key_on_xsheet 2016-04-22 20:33:35 +09:00
shun_iwasawa
9f6fb4f937 revert showing keys on xsheet 2016-04-22 20:31:38 +09:00
Shinya Kitaoka
7db469349f fix CMakeLists.txt 2016-04-22 17:51:35 +09:00
Shinya Kitaoka
2a1f2beb19 support a QT_PATH var for MacOS 2016-04-22 17:34:36 +09:00
Shinya Kitaoka
aa590765e0 keep codes for QTBUG-48288 2016-04-22 16:19:06 +09:00
Shinya Kitaoka
d75b42a25e Merge branch 'qt56' of https://github.com/ss23/opentoonz into test/pr/179 2016-04-22 15:52:56 +09:00
Shinya Kitaoka
8016de0b54 add std:: 2016-04-21 17:52:56 +09:00
Shinya Kitaoka
11d3d7de92 Merge branch 'boost_upgrade' of https://github.com/ss23/opentoonz into ss23-boost_upgrade 2016-04-21 17:52:04 +09:00
Keisuke Ogaki
322ff72902 Merge pull request #193 from shun-iwasawa/fix_brush_tool_crash
Fix brush tool crash
2016-04-21 16:50:56 +09:00
Shinya Kitaoka
cc48383f8a Merge pull request #146 from shun-iwasawa/fix_loading_reslist
Fix loading camera preset (reslist.txt)
2016-04-21 16:25:54 +09:00
Keisuke Ogaki
b147ff3ff1 Merge pull request #204 from skitaoka/fix/step-by-step-improvement/remove-using
Remove `using std::foo` from headers
2016-04-21 16:24:27 +09: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
shun_iwasawa
ed249948c7 modify xsheet lock button not to use key icon 2016-04-20 20:50:41 +09:00
shun_iwasawa
2ca36a7344 small change 2016-04-20 17:30:15 +09:00
shun_iwasawa
2b222ee2c3 Merge remote-tracking branch 'origin/master' into fix_save_mesh 2016-04-20 16:38:27 +09:00
shun_iwasawa
4060ca35fe fix save mesh 2016-04-20 16:15:01 +09:00
tomosu
b8c01c142e Merge pull request #190 from skitaoka/fix/delete-deletes
Remove `delete`s with some refactoring
2016-04-20 14:25:50 +09:00
tomosu
426cbb88a7 Merge pull request #202 from shun-iwasawa/fix_palette_crash
Fix crash when clicking on/off button in palette viewer
2016-04-20 12:16:51 +09:00
Shinya Kitaoka
577b68d441 add DVGui:: prefix 2016-04-20 10:24:53 +09:00
Shinya Kitaoka
eabf183e6e fix namespace 2016-04-20 10:24:52 +09:00
Shinya Kitaoka
cba6a2c733 fix pointer operation 2016-04-20 10:24:52 +09:00
Shinya Kitaoka
ec43d4d5e6 add #include <cmath> 2016-04-20 10:24:51 +09:00
Shinya Kitaoka
61dd762587 add #include <cmath> 2016-04-20 10:24:50 +09:00
Shinya Kitaoka
c12eacf2f3 remove #define NOMINMAX 2016-04-20 10:24:50 +09:00
Shinya Kitaoka
bb1d046db8 remove using namespace DVGui; from headers 2016-04-20 10:24:49 +09:00
Shinya Kitaoka
2148c874dd remove using namespace std; from headers 2016-04-20 10:24:48 +09:00
Shinya Kitaoka
42bfb61883 remove delete[] 2016-04-20 10:24:47 +09:00
Shinya Kitaoka
6a4e01532c remove 2016-04-20 10:24:46 +09:00
Shinya Kitaoka
79e39bd35a remove 2016-04-20 10:24:46 +09:00
Shinya Kitaoka
4c5bd5e681 remove register 2016-04-20 10:24:45 +09:00
Shinya Kitaoka
9f5a1bd760 use _WIN32 instead of WIN32 2016-04-20 10:24:44 +09:00
Shinya Kitaoka
e78c895e35 remove s 2016-04-20 10:23:26 +09:00
Gabriel Gazzán
7336f8d129 Spanish update - toonz.ts [55%] 2016-04-19 14:14:23 -03:00
Keisuke Ogaki
1a50d4d9ff fix bug: lzodriver should be bundled 2016-04-19 22:51:34 +09:00
Keisuke Ogaki
6c9449add3 Merge pull request #171 from skitaoka/translation/spanish
Fix Spanish UI translation
2016-04-19 19:08:46 +09:00
Keisuke Ogaki
3c27c43f43 Merge pull request #191 from tomosu/fix_vector_thumbnail_and_crash_in_preview
fix vector preview problems
2016-04-19 18:51:28 +09:00
shun_iwasawa
b5d548dbf0 fix showing preset name 2016-04-19 18:14:52 +09:00
Shinya Kitaoka
5f2af016ab add move constructors 2016-04-19 16:54:53 +09:00
shun_iwasawa
94146e1345 fix palette crash 2016-04-19 16:37:29 +09:00
tomosu
04cb6c4a49 deleted unused code 2016-04-19 13:14:11 +09:00
kogaki
4edae4f691 Merge pull request #197 from shun-iwasawa/fix_convert_image_bug
Fix convert image bug
2016-04-18 23:24:30 +09:00
shun_iwasawa
fe7dd3b14f fix convert image bug 2016-04-18 23:23:21 +09:00
shun_iwasawa
a7bd5d9da2 Merge remote-tracking branch 'origin/master' into fix_brush_tool_crash 2016-04-18 22:35:45 +09:00
shun_iwasawa
74e2cb1469 Merge remote-tracking branch 'origin/master' into revert_room_feature 2016-04-18 22:33:55 +09:00
kogaki
5bbc3c26fa Revert "Remove strstream" 2016-04-18 22:16:18 +09:00
shun_iwasawa
20ce445824 Merge remote-tracking branch 'origin/master' into fix_brush_tool_crash 2016-04-18 20:26:02 +09:00
shun_iwasawa
a508475413 fix brush tool crash 2016-04-18 20:24:03 +09:00
kogaki
417c1d6f96 Merge pull request #169 from skitaoka/fix/remove-strstream
Remove strstream
2016-04-18 19:14:23 +09:00
kogaki
8f50ce17db Merge pull request #168 from skitaoka/fix/motionblurfx
Fix memory allocation at doDirectionalBlur
2016-04-18 19:13:50 +09:00
shun_iwasawa
99cef5a25e fix osx build error 2016-04-18 19:02:48 +09:00
Shinya Kitaoka
69d9a8c3bb add spanish to build targets 2016-04-18 18:34:30 +09:00
Gabriel Gazzán
ff77c461d3 Spanish UI - toonzlib.ts [100%] 2016-04-18 18:34:30 +09:00
Gabriel Gazzán
927d93029f Spanish toonzqt.ts - minor fix 2016-04-18 18:34:29 +09:00
Gabriel Gazzán
3eab7e71ed Spanish UI toonzqt.ts - [100%] 2016-04-18 18:34:28 +09:00
Gabriel Gazzán
633772f14c Spanish UI colorfx.ts - [100%] 2016-04-18 18:34:28 +09:00
Gabriel Gazzán
57053b8e92 Spanish translation - tnztools.ts [100%] 2016-04-18 18:34:27 +09:00
Gabriel Gazzán
95ab663d8a Spanish translation - tnzcore.ts [100%] 2016-04-18 18:34:26 +09:00
Gabriel Gazzán
77a84c4106 Spanish UI translation - [0%]
Initial commit, copied from the Italian folder.
All strings in files reverted to suggested translations.
2016-04-18 18:34:26 +09:00
tomosu
794bf5dc65 fix vector preview problems 2016-04-18 17:22:43 +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
2d840616e6 add template layout settings 2016-04-18 17:06:30 +09:00
Shinya Kitaoka
0066b8a986 Merge pull request #187 from ideasman42/patch-1
Replace deprecated LOCATION with target properties
2016-04-18 14:46:46 +09:00
Shinya Kitaoka
4ff9cf9c92 Merge pull request #188 from ideasman42/cmake-typo-fix
CMake: typo fix
2016-04-18 14:45:31 +09:00
Shinya Kitaoka
9f9952eaff Merge pull request #189 from ideasman42/fix-const-enum-error
Fix const enum which is an error with GCC5.3
2016-04-18 14:45:18 +09:00
Shinya Kitaoka
07d4ebbb34 Merge pull request #186 from ideasman42/linux-include-auto_ptr-fix
Include memory, needed for auto_ptr references
2016-04-18 13:29:40 +09:00
shun_iwasawa
dde155b61c enable customizing menubar 2016-04-18 12:17:03 +09:00
Campbell Barton
0b592fac5f Fix const enum which is an error with GCC5.3 2016-04-18 04:48:38 +10:00
Campbell Barton
bf80fb1686 CMake: typo fix 2016-04-18 04:43:41 +10:00
Campbell Barton
84ab18ab5c CMake: remove deprecated get_target_property 2016-04-17 16:48:15 +10:00
Campbell Barton
40cabe2c56 Include memory, needed for auto_ptr references 2016-04-17 15:56:16 +10:00
Shinya Kitaoka
94f329e8fb fix tsound_mac.cpp 2016-04-15 18:03:25 +09:00
Shinya Kitaoka
387b337fba fix TOStream 2016-04-15 17:38:33 +09:00
Shinya Kitaoka
c3fda32ba4 fix TOfflineGL::Imp 2016-04-15 14:42:51 +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
a09dc1b458 Merge pull request #61 from ideasman42/linux-frameserver-sysconf-fix
Linux: Frameserver system memory access
2016-04-15 13:42:46 +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
e938cfcdc7 Merge pull request #63 from ideasman42/linux-basic-portability
Linux: Basic portability edits
2016-04-15 13:42:07 +09:00
Stephen Shkardoon
3d9be09db0 Upgrade to Qt5.6
Fix #109 #138 #165 #178.
Fixes multiple issues on Windows 10.
2016-04-15 10:35:49 +12:00
Stephen Shkardoon
e239ec6928 Allow building with a newer version of Boost (up to 1.60.0).
The instructions for both OSX and Windows still say to use 1.55.0,
but cmake will allow up to 1.60.0.
Using a later version will also mean the additional patch for VS2013
is not required.
2016-04-15 05:42:58 +12:00
Shinya Kitaoka
fa76aefa90 cosmetic change 2016-04-14 19:36:34 +09:00
Shinya Kitaoka
262a92f130 use smart pointer for m_imp 2016-04-14 19:15:09 +09:00
Shinya Kitaoka
d57726081c remove BOOST_NO_RVALUE_REFERENCES 2016-04-14 16:55:33 +09:00
Shinya Kitaoka
e5734ac437 replace smart pointers 2016-04-14 16:51:50 +09:00
kusano
d652c1303c Workaround for crash in multiple monitors
See QTBUG-48288.
Qt may crash in handling WM_SIZE of m_sceneViewer in splash.finish(&w) in main.cpp.
To suppress sending WM_SIZE, set window position before splash.finish(&w).
WM_SIZE will not be sent if window poistion is not changed.
2016-04-14 05:01:56 +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
791cd10a98 Merge pull request #147 from ideasman42/tstroke-remove-redundant-array
Remove redundant array allocation
2016-04-13 14:58:08 +09:00
Shinya Kitaoka
56e1f6df66 remove freeze() 2016-04-13 14:28:07 +09:00
kogaki
9fbffc4177 Merge pull request #163 from xenogenesi/fix-sceneviewer-rightbtn
non-windows: fake mouse right release event on contextMenuEvent
2016-04-13 14:19:52 +09:00
Shinya Kitaoka
16a82fca96 Merge branch 'stringstream' of https://github.com/janisozaur/opentoonz into janisozaur-stringstream 2016-04-13 14:18:53 +09:00
Shinya Kitaoka
8c5f687a8c Merge pull request #117 from jpumc/patch-oos-build-1
Fix CMAKE_MODULE_PATH for out-of-source build
2016-04-13 14:14:56 +09:00
Shinya Kitaoka
9c6c0f1688 Merge pull request #132 from janisozaur/parentheses
Encapsulate expressions in parentheses
2016-04-13 14:14:19 +09:00
Shinya Kitaoka
6dca1d3a6d Merge pull request #131 from janisozaur/abs
Fixes for abs()
2016-04-13 14:12:56 +09:00
Shinya Kitaoka
bbf7b2dac8 Merge pull request #120 from ideasman42/linux-preproc-error-fix
Use #error directive instead of explicit syntax error
2016-04-13 14:12:16 +09:00
Shinya Kitaoka
7ac5ba3eff Merge pull request #111 from OriginalAdric/fix_unrefd_locals
Fix unreferenced locals/labels warnings
2016-04-13 14:11:27 +09:00
Shinya Kitaoka
5f610203fc Merge pull request #70 from ideasman42/cmake-whitespace-cleanup
CMake: use spaces for indentation & whitespace edits
2016-04-13 14:10:04 +09:00
Shinya Kitaoka
6aada0ab29 use unique_ptr<> 2016-04-13 13:30:02 +09:00
shun_iwasawa
7a9c88552b create custom menubar from xml file 2016-04-13 11:45:28 +09:00
xenogenesi
456038b5ce non-windows: fake mouse right release event 2016-04-12 18:11:03 +02:00
John Davidson
9980bf84e0 Use 'delete' on a 'new' object in motionblurfx.cpp. 2016-04-11 23:10:16 -07:00
Campbell Barton
d0e335dfee Fix include case 2016-04-12 02:58:51 +10:00
Campbell Barton
0648b484bf Use if defined(...) style 2016-04-12 02:56:45 +10:00
Campbell Barton
acc5e60836 Remove ifdef's for cstring includes
These are needed on Linux for memcpy, memmove etc... but not unique to Linux of course.
2016-04-12 02:56:45 +10:00
Campbell Barton
b66df2a0d6 Use strtok_r for Linux
Makes sense to use same logic for OSX and Linux
2016-04-12 02:56:45 +10:00
Campbell Barton
107701249b Basic edits for Linux portability 2016-04-12 02:56:45 +10:00
walkerka
0786d1117e added a "Save All" menu which saves current scene and all the levels. 2016-04-08 21:32:25 +08:00
tomosu
5545c5bfbd Merge pull request #151 from kogaki/fix/cmake_png_include
Fix cmake to be able to search custom libpng include path
2016-04-08 20:25:58 +09:00
tomosu
cb0b4d066f change clean-up location and add comment 2016-04-08 19:51:23 +09:00
tomo-suzuki
e6f45b6a60 add clean-up at the end of SceneViewer::contextMenuEvent 2016-04-08 11:56:21 +09:00
Keisuke Ogaki
b22d0cfb59 Add libpng include path search 2016-04-08 00:17:03 +09:00
shun_iwasawa
b05ca51266 revert room edit feature 2016-04-07 16:09:59 +09:00
Campbell Barton
5db682049d Remove redundant array allocation 2016-04-07 14:38:39 +10:00
shun_iwasawa
0732762e90 Merge remote-tracking branch 'origin/master' into fix_loading_reslist 2016-04-06 13:58:55 +09:00
shun_iwasawa
2e13bcc2f6 fix loading reslist 2016-04-06 13:53:42 +09:00
Yuri Odagiri
6cd606de62 Merge pull request #47 from camjc/master
Fix: User facing typos throughout application
2016-04-06 12:19:10 +09:00
shun_iwasawa
49ff76e3d3 Merge remote-tracking branch 'origin/master' into revert_schematic_output_port 2016-04-04 19:05:17 +09:00
shun_iwasawa
22eaa48951 revert schematic output port 2016-04-04 19:03:52 +09:00
Michał Janiszewski
b1cc3ceeac Encapsulate expressions in parentheses
Some expressions appear to be confusing, adding parentheses removes
doubt in those cases.
2016-04-03 02:24:43 +02: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
Michał Janiszewski
df394d6939 Move to stringstream
std::strstream is deprecated, stringstream is the suggested replacement.
2016-04-03 02:22:18 +02:00
Campbell Barton
42d601e918 Use #error preprocessor
We had a report (that I can't confirm), that this caused errors.
Best to use `error` here.
2016-04-01 05:19:41 +11:00
jpumc
a8cd98dd0c Fix CMAKE_MODULE_PATH for out-of-source build 2016-03-31 17:09:25 +03:00
brly
fed8a75dde Fix compile error on clang
Avoid 'chosen constructor is explicit in copy-initialization' error.
2016-03-31 01:24:00 +09:00
Adric Worley
fe9b8bc573 Fixes unused label warning.
Commented out instead of deleted, as label is referenced by FIXME comment and associated goto on lines 82-84.
2016-03-30 09:28:32 -04:00
Adric Worley
f63c1a0076 Fixes unreferenced local variable warnings.
Deleted variables in most cases. Commented out or moved to IFDEF where referenced by existing but disabled code.
2016-03-30 09:25:34 -04:00
roentgen
46416c1cad Merge pull request #64 from ideasman42/linux-resource-case-fix
Linux: Use lowercase for all resources (failed to build)
2016-03-30 02:09:49 +09:00
Gabriel Gazzán
d9d05a72fe Spanish UI - toonzlib.ts [100%] 2016-03-29 13:10:29 -03:00
Gabriel Gazzán
27e293b565 Spanish toonzqt.ts - minor fix 2016-03-29 03:50:52 -03:00
Gabriel Gazzán
720ea50bec Spanish UI toonzqt.ts - [100%] 2016-03-29 03:07:31 -03:00
Campbell Barton
b696885d9a Fix error with ifdef blocks
noted by @linkmauve
2016-03-29 15:49:16 +11:00
Gabriel Gazzán
3d229965a5 Spanish UI colorfx.ts - [100%] 2016-03-28 13:40:18 -03:00
Michael Cullen
b49802832b Fix build when libtiff exists on system
On OSX at least, if you have libtiff in your system include path,
it will use that instead of the bundled modified version even if
FindTIFF.cmake locates the correct version. This commit fixes that
by making sure the libtiff include directory is before the system
include paths.
2016-03-28 14:50:54 +01:00
Gabriel Gazzán
5b89978306 Spanish translation - tnztools.ts [100%] 2016-03-27 22:05:15 -03:00
Gabriel Gazzán
99a642865e Spanish translation - tnzcore.ts [100%] 2016-03-27 22:04:34 -03:00
Gabriel Gazzán
a31c6d5bd6 Spanish UI translation - [0%]
Initial commit, copied from the Italian folder.
All strings in files reverted to suggested translations.
2016-03-27 19:25:18 -03:00
Campbell Barton
3dcf6bfa09 CMake: use tab indentation & whitespace edits 2016-03-27 14:44:29 +11:00
Campbell Barton
cc5860ee72 Use lowercase for all resources (failed to build on Linux) 2016-03-27 11:50:14 +11:00
Campbell Barton
1db1c004b9 Linux: frameserver memory fix 2016-03-27 11:17:15 +11:00
roentgen
25e5605c50 Merge pull request #36 from ArseniyShestakov/fix-cmake-lettercase
Fix letter case in CMakeLists.txt
2016-03-27 02:11:52 +09:00
kusano
ffc911474d Fix crash in initializing
In some enviroment, access violations occures in ICOpen.
Althogh this code seems to intended to handle SEH, structured exceptions are not catched in current configulation.
2016-03-27 01:02:54 +09:00
Cameron Chamberlain
bfee0019b7 Fix: User facing typos throughout application
- inbeteween -> inbetween
- abount -> about
- seleted -> selected
- successfull -> successful
- undefinied -> undefined
- colonnesdoivent (fr) -> colonnes doivent
- seleted (fr) -> sélectionnés
- cleeanup -> removed from translations,
  wasn't translated anyway and
  was removed from english codebase
2016-03-26 22:30:38 +11:00
Arseniy Shestakov
5e9e969bb2 Fix letter case in CMakeLists.txt 2016-03-26 06:16:40 +03:00
roentgen
7e185111a8 Merge pull request #33 from opentoonz/export-pluginsdk
added package_sdk.sh to export the sdk. and toonz_plugin_helper*.h ar…
2016-03-25 20:28:53 +09:00
roentgen
edd579074d added package_sdk.sh to export the sdk. and toonz_plugin_helper*.h are moved to utils dir to plublic developers 2016-03-25 20:25:20 +09:00
Toshihiro Shimizu
5dddbf3dad Merge pull request #24 from opentoonz/suppress-warning-C4819
Suppress warning C4819 in Visual Studio 2013
2016-03-25 19:40:52 +09:00
roentgen
f09e094840 Merge pull request #30 from opentoonz/fix-lzodriver
we always have thirdparty/lzo/driver. osx build never uses thirdpary/…
2016-03-25 18:55:07 +09:00
roentgen
3047bb2598 we always have thirdparty/lzo/driver. osx build never uses thirdpary/lzo/lzo-2.09 (was removed) 2016-03-25 18:42:18 +09:00
kusano
52db9569b3 Force Qt to use desktop OpenGL
since currently OpenToonz does not work with OpenGL of software or angle.
2016-03-25 02:37:28 +09:00
brly
591f925dea Replace dialog title 2016-03-25 00:33:35 +09:00
roentgen
1deca7fc99 Merge pull request #23 from opentoonz/remove-zlib-1.2.7
Remove zlib 1.2.7
2016-03-25 00:13:35 +09:00
roentgen
ce9322ff3c Merge pull request #22 from opentoonz/fix_save_palette_dialog
パレット上書きの確認ダイアログに関する修正
2016-03-25 00:13:19 +09:00
roentgen
ab18c9f671 fixed create full menubar for OSX 2016-03-25 00:07:43 +09:00
kusano
543ae709dc Suppress warning C4819 in Visual Studio 2013
"The file contains a character that cannot be represented in the current code page"
2016-03-24 20:30:47 +09:00
kusano
8977366225 Remove zlib 1.2.7 2016-03-24 19:57:01 +09:00
shun_iwasawa
b64fce383e comment added 2016-03-24 17:55:39 +09:00
shun_iwasawa
01d49686ac Merge remote-tracking branch 'origin/master' into fix_save_palette_dialog 2016-03-24 17:54:26 +09:00
shun_iwasawa
9ff2b3eb00 fix overwrite palette confirmation dialog 2016-03-24 17:47:57 +09:00
roentgen
b94d31fa75 Merge pull request #20 from opentoonz/fix-param-fx2
エフェクトファイルを含むシーンファイルを 2 回連続で開くと落ちるバグを修正
2016-03-24 17:28:33 +09:00
shun_iwasawa
f81af248fc fix save raster level problem 2016-03-24 16:51:41 +09:00
Shinya Kitaoka
f91c5a5f05 remove cloning flag 2016-03-24 16:28:15 +09:00
Shinya Kitaoka
0b19cb0c6a move params_ from PluginInformation to RasterFxPluginHost 2016-03-24 16:08:18 +09:00
kusano
45254b4069 Fix libpng version in CMakeLists.txt 2016-03-24 05:01:24 +09:00
roentgen
87fce823c5 OSX: use presented libpng 2016-03-24 04:33:12 +09:00
roentgen
42a3d520c4 Merge pull request #15 from opentoonz/fix-thirdparty
Fix thirdparty
2016-03-24 04:15:01 +09:00
roentgen
237d095463 Merge pull request #14 from opentoonz/fix-thirdparty-win
Visual Studioと更新されたthirdparty/でビルドができるように各種修正
2016-03-24 04:12:05 +09:00
kusano
6139acbd31 Make tiio_tif.cpp use io.h instead of unistd.h in Visual Studio 2016-03-24 04:04:53 +09:00
kusano
3f512259eb Update CMakeLists.txt for Visual Studio
- add libpng
- change libtiff path
2016-03-24 04:03:50 +09:00
fukasawa
13abb65b48 fixed aborting on png-level loading 2016-03-24 03:07:46 +09:00
fukasawa
9c02f65f6e added custom module for cmake 2016-03-24 02:27:13 +09:00
roentgen
bbd970be69 Merge pull request #11 from opentoonz/fix-boost
Fix for Boost 1.60
2016-03-24 01:03:27 +09:00
fukasawa
39e85d1a80 Merge remote-tracking branch 'origin' into fix-thirdparty 2016-03-24 00:56:29 +09:00
fukasawa
e60969f67f moved to libpng and libtiff to thirdparty 2016-03-24 00:50:22 +09:00
kusano
92d713df09 Remove unused members in TFlash 2016-03-24 00:49:38 +09:00
kusano
a0ab5dec40 Fix the compile error in tflash.h
Member functions with argument of vector<TSegment> or vector<TQuadratic> cannot be inline defined.
2016-03-24 00:43:29 +09:00
kusano
66e8e342f4 Fix for Boost 1.60 2016-03-23 23:58:33 +09:00
roentgen
e40e2eea0a Merge pull request #10 from opentoonz/fix-check_framebuffer_status
glCheckFramebufferStatusEXTが無い環境で起動直後に落ちる問題を修正
2016-03-23 23:54:23 +09:00
roentgen
58d3d79de2 Merge pull request #9 from opentoonz/feature-remove-unused-codes
Remove unused codes
2016-03-23 23:53:44 +09:00
roentgen
f5fdb6e866 Merge pull request #8 from opentoonz/add-tfarm-plugin
tfarmをプラグインのフィルタに対応させた
2016-03-23 23:53:17 +09:00
roentgen
ca2f385a36 Merge pull request #7 from opentoonz/feature-osx-icon
Add Icon and Modify toonz/CMakeLists.txt for OSX Bundle
2016-03-23 23:52:56 +09:00
roentgen
b91a1bcd5d Merge pull request #3 from opentoonz/fix-param-dup
PluginInformation に Param が重複して登録されるバグを修正
2016-03-23 23:52:41 +09:00
roentgen
a52ebf554f Merge pull request #6 from opentoonz/add-large-icon
Add 256x256 to toonz.ico
2016-03-23 23:51:31 +09:00
roentgen
d0ec773d4e Merge pull request #4 from opentoonz/loc_jp
Japanese Localization
2016-03-23 23:51:15 +09:00
roentgen
22e1399821 Merge pull request #2 from opentoonz/mod_qss_problem
modification of style sheet problem
2016-03-23 23:49:05 +09:00
kusano
297d92b914 Fix a issue of hang in case of no glCheckFramebufferStatusEXT 2016-03-23 23:47:45 +09:00
brly
9e73b85832 Remove TFlash::Imp class and sources/common files 2016-03-23 23:32:56 +09:00
kusano
898953fe78 Add an empty directory stuff/toonzfarm, which is necessary for tfarmserver 2016-03-23 20:45:27 +09:00
kusano
46ab69e306 Enable tcomposer to render scenes with plugin filters 2016-03-23 20:37:22 +09:00
brly
8064cbf365 Add Icon and Modify toonz/CMakeLists.txt for OSX Bundle 2016-03-23 19:11:31 +09:00
kusano
c8190fa92d Add 256x256 to toonz.ico 2016-03-23 17:26:12 +09:00
brly
f20acf84e8 Remove glext.h from codebase 2016-03-23 16:09:00 +09:00
roentgen
71f5e9deb4 moved RGBA64 support to libtiff from toonz/sources/image/tif 2016-03-23 04:32:55 +09:00
roentgen
b75cab9b67 added tiff-4.0.4 2016-03-23 04:20:01 +09:00
roentgen
19af1bad04 use cmake modules for superlu and lzo.
use pkg-config for usb, glew and lz4(not static).
(WIP) fixed getting kinda hack for tiff out to libtiff
2016-03-23 03:48:01 +09:00
shun_iwasawa
9f007d60e9 japanese localization 2016-03-22 16:03:41 +09:00
Shinya Kitaoka
f8aefde0c9 fix param dup bug 2016-03-22 16:01:50 +09:00
shun_iwasawa
6c7e74ae4c modify qss problem 2016-03-22 15:04:28 +09:00
shun_iwasawa
28dc08231d modify problem in new project 2016-03-22 12:59:10 +09:00
roentgen
3969d9617b added local macros for thirdpary libraries.
(WIP) fixed tiio_tif does not be compilable with libtiff4-package (it needs libtiff4's source code).
2016-03-22 04:26:56 +09:00
Toshihiro Shimizu
890dddabbd first commit 2016-03-19 02:57:51 +09:00