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
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
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